diff options
| author | kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-09-29 22:48:43 +0000 |
|---|---|---|
| committer | kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-09-29 22:48:43 +0000 |
| commit | a8442c9b22767096823aa7a169bc1496a8dd2c42 (patch) | |
| tree | 88f2aec2951b6ce52b91c03ed0bd4a697b1642c9 /pbx | |
| parent | fcfda97ed2478ac34b65ba502ad183583c446476 (diff) | |
Merged revisions 44055 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r44055 | kpfleming | 2006-09-29 17:47:40 -0500 (Fri, 29 Sep 2006) | 2 lines
fix a few build system bugs, and convert Makefiles to be compatible with GNU make 3.80
........
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@44056 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'pbx')
| -rw-r--r-- | pbx/Makefile | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/pbx/Makefile b/pbx/Makefile index 43812f1dc..0f9c9d165 100644 --- a/pbx/Makefile +++ b/pbx/Makefile @@ -28,13 +28,13 @@ include $(ASTTOPDIR)/Makefile.moddir_rules clean:: rm -f ael/*.o -$(eval $(call ast_make_o_c,ael/aelflex.o,ael/ael_lex.c ../include/asterisk/ael_structs.h ael/ael.tab.h)) -ael/aelflex.o: ASTCFLAGS+=-I. +ael/ael_lex.o: ael/ael_lex.c ../include/asterisk/ael_structs.h ael/ael.tab.h +ael/ael_lex.o: ASTCFLAGS+=-I. -$(eval $(call ast_make_o_c,ael/aelbison.o,ael/ael.tab.c ael/ael.tab.h ../include/asterisk/ael_structs.h)) -ael/aelbison.o: ASTCFLAGS+=-I. +ael/ael.tab.o: ael/ael.tab.c ael/ael.tab.h ../include/asterisk/ael_structs.h +ael/ael.tab.o: ASTCFLAGS+=-I. -$(pbx_ael): ael/aelbison.o ael/aelflex.o +$(if $(filter pbx_ael,$(EMBEDDED_MODS)),modules.link,pbx_ael.so): ael/ael.tab.o ael/ael_lex.o ael/ael_lex.c: (cd ael; flex ael.flex; sed -i -e "/begin standard C headers/i#include \"asterisk.h\"" ael_lex.c) @@ -45,4 +45,4 @@ ael/ael.tab.c ael/ael.tab.h: dundi-parser.o: dundi-parser.h dundi-parser.o: ASTCFLAGS+=-I. -$(pbx_dundi): dundi-parser.o +$(if $(filter pbx_dundi,$(EMBEDDED_MODS)),modules.link,pbx_dundi.so): dundi-parser.o |