diff options
author | kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-08-21 02:11:39 +0000 |
---|---|---|
committer | kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-08-21 02:11:39 +0000 |
commit | 8b0c007ad990aa27d9868da49215fd1076ac77cc (patch) | |
tree | 270b9c46c1e644483d6d2a35b509f43218ba3252 /pbx/Makefile | |
parent | a42edc84034f91932a3e12d503e07f76a6eb498a (diff) |
merge new_loader_completion branch, including (at least):
- restructured build tree and makefiles to eliminate recursion problems
- support for embedded modules
- support for static builds
- simpler cross-compilation support
- simpler module/loader interface (no exported symbols)
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@40722 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'pbx/Makefile')
-rw-r--r-- | pbx/Makefile | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/pbx/Makefile b/pbx/Makefile index 395702090..ee50fc72a 100644 --- a/pbx/Makefile +++ b/pbx/Makefile @@ -9,7 +9,7 @@ # the GNU General Public License # -ifneq ($(wildcard ../menuselect.makeopts),) +ifneq ($(wildcard $(ASTTOPDIR)/menuselect.makeopts),) include ../menuselect.makeopts include ../menuselect.makedeps endif @@ -17,7 +17,12 @@ endif C_MODS:=$(filter-out $(MENUSELECT_PBX),$(patsubst %.c,%,$(wildcard pbx_*.c))) CC_MODS:=$(filter-out $(MENUSELECT_PBX),$(patsubst %.cc,%,$(wildcard pbx_*.cc))) -SELECTED_MODS:=$(C_MODS) $(CC_MODS) +LOADABLE_MODS:=$(C_MODS) $(CC_MODS) + +ifneq ($(findstring pbx,$(MENUSELECT_EMBED)),) + EMBEDDED_MODS:=$(LOADABLE_MODS) + LOADABLE_MODS:= +endif all: _all @@ -32,7 +37,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: ael/aelbison.o ael/aelflex.o +$(pbx_ael): 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) @@ -40,7 +45,7 @@ ael/ael_lex.c: ael/ael.tab.c ael/ael.tab.h: (cd ael; bison -v -d ael.y) -$(eval $(call ast_make_o_c,dundi-parser.o,dundi-parser.c dundi-parser.h)) +dundi-parser.o: dundi-parser.h dundi-parser.o: CFLAGS+=-I. -pbx_dundi.so: dundi-parser.o +$(pbx_dundi): dundi-parser.o |