diff options
| author | Kevin P. Fleming <kpfleming@digium.com> | 2006-04-30 11:40:06 +0000 |
|---|---|---|
| committer | Kevin P. Fleming <kpfleming@digium.com> | 2006-04-30 11:40:06 +0000 |
| commit | 7343d311f1309725be5eab9266fa202e150e493a (patch) | |
| tree | ad8abf53472f7c738c723076412b05adff88cc79 /utils | |
| parent | 6ec91a102c70958bafeb480e180513b9ba543cee (diff) | |
simplify CFLAGS handling for subdirectories
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
Diffstat (limited to 'utils')
| -rw-r--r-- | utils/Makefile | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/utils/Makefile b/utils/Makefile index 4d5990695..661d2c85a 100644 --- a/utils/Makefile +++ b/utils/Makefile @@ -49,10 +49,10 @@ clean: clean-depend rm -f ast_expr2.o ast_expr2f.o astman.o: astman.c - $(CC) $(CFLAGS) -include ../include/autoconfig.h -c -o $@ $< + $(CC) $(CFLAGS) -c -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 $(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 ast_expr2.o: ../ast_expr2.c - gcc $(CFLAGS) -include ../include/autoconfig.h -c -o $@ $< + gcc $(CFLAGS) -c -o $@ $< 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 $(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 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 $(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 smsq.o: smsq.c - $(CC) $(CFLAGS) -include ../include/autoconfig.h -c -o $@ $< + $(CC) $(CFLAGS) -c -o $@ $< smsq: smsq.o $(CC) $(CFLAGS) -o smsq ${SOL} smsq.o -lpopt |