diff options
| author | kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-07-15 19:59:35 +0000 |
|---|---|---|
| committer | kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-07-15 19:59:35 +0000 |
| commit | 51482ed964b007aedfa8303fa4fc5483d62279aa (patch) | |
| tree | a1180a16189aab888f84a1b9b87536d5bcf2dfa1 /pbx/Makefile | |
| parent | 661a4f572c9bb0b935848a4a906795c18483bfe2 (diff) | |
more Makefile cleanup and consistency stuff
don't reuse LIBS variable from top-level Makefile (oops)
build Asterisk binary after subdirs (preparing for embedded modules)
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@37661 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'pbx/Makefile')
| -rw-r--r-- | pbx/Makefile | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/pbx/Makefile b/pbx/Makefile index 747843ff4..395702090 100644 --- a/pbx/Makefile +++ b/pbx/Makefile @@ -14,11 +14,10 @@ ifneq ($(wildcard ../menuselect.makeopts),) include ../menuselect.makedeps endif -SELECTED_MODS:=$(filter-out $(MENUSELECT_PBX),$(patsubst %.c,%,$(wildcard pbx_*.c)) $(patsubst %.cc,%,$(wildcard pbx_*.cc))) +C_MODS:=$(filter-out $(MENUSELECT_PBX),$(patsubst %.c,%,$(wildcard pbx_*.c))) +CC_MODS:=$(filter-out $(MENUSELECT_PBX),$(patsubst %.cc,%,$(wildcard pbx_*.cc))) -MODS:=$(patsubst %,%.so,$(SELECTED_MODS)) - -CC_MODS:=pbx_kdeconsole +SELECTED_MODS:=$(C_MODS) $(CC_MODS) all: _all @@ -33,7 +32,7 @@ ael/aelflex.o: CFLAGS+=-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: CFLAGS+=-I. -pbx_ael.so: pbx_ael.o ael/aelbison.o ael/aelflex.o +pbx_ael.so: ael/aelbison.o ael/aelflex.o ael/ael_lex.c: (cd ael; flex ael.flex; sed -i -e "/begin standard C headers/i#include \"asterisk.h\"" ael_lex.c) @@ -44,4 +43,4 @@ ael/ael.tab.c ael/ael.tab.h: $(eval $(call ast_make_o_c,dundi-parser.o,dundi-parser.c dundi-parser.h)) dundi-parser.o: CFLAGS+=-I. -pbx_dundi.so: pbx_dundi.o dundi-parser.o +pbx_dundi.so: dundi-parser.o |