kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-05 20:20:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

simplify CFLAGS handling for subdirectories

Browse Source 
don't put paths into the include search path when they are not needed
don't auto-rebuild the AEL bison/flex output based on make dependencies (the generated files are already checked in, and the timestamps generated by a checkout will usually cause them to be overwritten)


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@23582 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Kevin P. Fleming
2006-04-30 11:40:06 +00:00
parent 6ec91a102c
commit 7343d311f1
3 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Makefile
View File

@@ -196,8 +196,9 @@ ifneq ($(wildcard makeopts),)
endif endif
ASTCFLAGS+=$(MENUSELECT_CFLAGS) ASTCFLAGS+=$(MENUSELECT_CFLAGS)
TOPDIR_CFLAGS=-include include/autoconfig.h TOPDIR_CFLAGS=-include include/autoconfig.h -Iinclude
MOD_SUBDIR_CFLAGS=-include ../include/autoconfig.h MOD_SUBDIR_CFLAGS=-include ../include/autoconfig.h -I../include -I..
OTHER_SUBDIR_CFLAGS=-include ../include/autoconfig.h -I../include -I..
# *CLI> show memory allocations [filename] # *CLI> show memory allocations [filename]
# *CLI> show memory summary [filename] # *CLI> show memory summary [filename]
@@ -252,7 +253,6 @@ ifeq ($(OSARCH),SunOS)
ID=/usr/xpg4/bin/id ID=/usr/xpg4/bin/id
endif endif
INCLUDE+=-Iinclude -I../include -I..
ASTCFLAGS+=-pipe -Wall -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations $(DEBUG) $(INCLUDE) #-DMAKE_VALGRIND_HAPPY ASTCFLAGS+=-pipe -Wall -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations $(DEBUG) $(INCLUDE) #-DMAKE_VALGRIND_HAPPY
ASTCFLAGS+=$(OPTIMIZE) ASTCFLAGS+=$(OPTIMIZE)
@@ -545,8 +545,8 @@ muted: muted.o
subdirs: subdirs:
for x in $(MOD_SUBDIRS); do CFLAGS="$(ASTCFLAGS) $(MOD_SUBDIR_CFLAGS)" $(MAKE) -C $$x || exit 1 ; done for x in $(MOD_SUBDIRS); do CFLAGS="$(ASTCFLAGS) $(MOD_SUBDIR_CFLAGS)" $(MAKE) -C $$x || exit 1 ; done
CFLAGS="$(ASTCFLAGS)" $(MAKE) -C utils CFLAGS="$(ASTCFLAGS) $(OTHER_SUBDIR_CFLAGS)" $(MAKE) -C utils
CFLAGS="$(ASTCFLAGS) -include ../include/autoconfig.h" $(MAKE) -C agi CFLAGS="$(ASTCFLAGS) $(OTHER_SUBDIR_CFLAGS)" $(MAKE) -C agi
clean-depend: clean-depend:
for x in $(SUBDIRS); do $(MAKE) -C $$x clean-depend || exit 1 ; done for x in $(SUBDIRS); do $(MAKE) -C $$x clean-depend || exit 1 ; done

4
pbx/Makefile
View File

@@ -59,10 +59,10 @@ ael/aelflex.o: ael/ael_lex.c ../include/asterisk/ael_structs.h ael/ael.tab.h
ael/aelbison.o: ael/ael.tab.c ael/ael.tab.h ../include/asterisk/ael_structs.h ael/aelbison.o: ael/ael.tab.c ael/ael.tab.h ../include/asterisk/ael_structs.h
$(CC) $(CFLAGS) -I. -c -o ael/aelbison.o ael/ael.tab.c $(CC) $(CFLAGS) -I. -c -o ael/aelbison.o ael/ael.tab.c
ael/ael_lex.c: ael/ael.flex ael/ael_lex.c:
(cd ael; flex ael.flex) (cd ael; flex ael.flex)
ael/ael.tab.c ael/ael.tab.h: ael/ael.y ael/ael.tab.c ael/ael.tab.h:
(cd ael; bison -v -d ael.y) (cd ael; bison -v -d ael.y)
%.moc : %.h %.moc : %.h

12
utils/Makefile
View File

@@ -49,10 +49,10 @@ clean: clean-depend
rm -f ast_expr2.o ast_expr2f.o rm -f ast_expr2.o ast_expr2f.o
astman.o: astman.c astman.o: astman.c
$(CC) $(CFLAGS) -include ../include/autoconfig.h -c -o $@ $< $(CC) $(CFLAGS) -c -o $@ $<
astman: astman.o ../md5.o astman: astman.o ../md5.o
$(CC) -D_GNU_SOURCE -o $@ $< ../md5.o -lnewt $(CC) $(CFLAGS) -o $@ $< ../md5.o -lnewt
stereorize: stereorize.o frame.o stereorize: stereorize.o frame.o
$(CC) $(CFLAGS) -o stereorize stereorize.o frame.o -lm $(CC) $(CFLAGS) -o stereorize stereorize.o frame.o -lm
@@ -60,10 +60,10 @@ stereorize: stereorize.o frame.o
.PHONY: ../ast_expr2.c ../ast_expr2f.c ../pbx/ael/aelflex.o ../pbx/ael/aelbison.o ../pbx/pbx_ael.o .PHONY: ../ast_expr2.c ../ast_expr2f.c ../pbx/ael/aelflex.o ../pbx/ael/aelbison.o ../pbx/pbx_ael.o
ast_expr2.o: ../ast_expr2.c ast_expr2.o: ../ast_expr2.c
gcc $(CFLAGS) -include ../include/autoconfig.h -c -o $@ $< gcc $(CFLAGS) -c -o $@ $<
ast_expr2f.o: ../ast_expr2f.c ast_expr2f.o: ../ast_expr2f.c
gcc $(CFLAGS) -include ../include/autoconfig.h -c -DSTANDALONE -o $@ $< gcc $(CFLAGS) -c -DSTANDALONE -o $@ $<
check_expr: check_expr.c ast_expr2.o ast_expr2f.o check_expr: check_expr.c ast_expr2.o ast_expr2f.o
$(CC) $(CFLAGS) -o $@ $^ $(CC) $(CFLAGS) -o $@ $^
@@ -72,7 +72,7 @@ aelparse : ../pbx/ael/aelflex.o ../pbx/ael/aelbison.o ../pbx/pbx_ael.o ael_main.
$(CC) $(CFLAGS) -g -o aelparse ../pbx/ael/aelflex.o ../pbx/ael/aelbison.o ael_main.o ../pbx/pbx_ael.o ../ast_expr2f.o ../ast_expr2.o $(CC) $(CFLAGS) -g -o aelparse ../pbx/ael/aelflex.o ../pbx/ael/aelbison.o ael_main.o ../pbx/pbx_ael.o ../ast_expr2f.o ../ast_expr2.o
ael_main.o : ael_main.c ../include/asterisk/ael_structs.h ael_main.o : ael_main.c ../include/asterisk/ael_structs.h
$(CC) $(CFLAGS) -include ../include/autoconfig.h -c -g -o ael_main.o ael_main.c $(CC) $(CFLAGS) -c -g -o ael_main.o ael_main.c
ael_main1.o : ael_main.c ../include/asterisk/ael_structs.h ael_main1.o : ael_main.c ../include/asterisk/ael_structs.h
$(CC) $(CFLAGS) -c -g -o ael_main1.o ael_main.c $(CC) $(CFLAGS) -c -g -o ael_main1.o ael_main.c
@@ -85,7 +85,7 @@ testexpr2s: ../ast_expr2f.c ../ast_expr2.c ../ast_expr2.h
./testexpr2s expr2.testinput ./testexpr2s expr2.testinput
smsq.o: smsq.c smsq.o: smsq.c
$(CC) $(CFLAGS) -include ../include/autoconfig.h -c -o $@ $< $(CC) $(CFLAGS) -c -o $@ $<
smsq: smsq.o smsq: smsq.o
$(CC) $(CFLAGS) -o smsq ${SOL} smsq.o -lpopt $(CC) $(CFLAGS) -o smsq ${SOL} smsq.o -lpopt