diff options
| author | kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-02-06 11:48:48 +0000 |
|---|---|---|
| committer | kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-02-06 11:48:48 +0000 |
| commit | 29adfc733127d4ee151eeaef2f6ce51285f7e65b (patch) | |
| tree | 0efa7d24e3b6550d8fa305fd514f21dbf46b4488 | |
| parent | e86805285423fefb7016201de9971592da3a22a1 (diff) | |
ensure that all remaining multi-object modules are built using their proper CFLAGS and include directory paths
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.4@102627 f38db490-d61c-443f-a65b-d21fe96a405b
| -rw-r--r-- | pbx/Makefile | 4 | ||||
| -rw-r--r-- | res/Makefile | 2 |
2 files changed, 6 insertions, 0 deletions
diff --git a/pbx/Makefile b/pbx/Makefile index 8d29bfbbf..f3a97b55e 100644 --- a/pbx/Makefile +++ b/pbx/Makefile @@ -40,6 +40,8 @@ ael/ael_lex.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. +ael/ael.tab.o ael/ael_lex.o: ASTCFLAGS+=$(MENUSELECT_OPTS_pbx_ael:%=-D%) $(foreach dep,$(MENUSELECT_DEPENDS_pbx_ael),$(value $(dep)_INCLUDE)) + $(if $(filter pbx_ael,$(EMBEDDED_MODS)),modules.link,pbx_ael.so): ael/ael.tab.o ael/ael_lex.o ael/ael_lex.c: @@ -52,4 +54,6 @@ ael/ael.tab.c ael/ael.tab.h: dundi-parser.o: dundi-parser.h dundi-parser.o: ASTCFLAGS+=-I. +dundi-parser.o: ASTCFLAGS+=$(MENUSELECT_OPTS_pbx_dundi:%=-D%) $(foreach dep,$(MENUSELECT_DEPENDS_pbx_dundi),$(value $(dep)_INCLUDE)) + $(if $(filter pbx_dundi,$(EMBEDDED_MODS)),modules.link,pbx_dundi.so): dundi-parser.o diff --git a/res/Makefile b/res/Makefile index 11fdfa096..aad078f23 100644 --- a/res/Makefile +++ b/res/Makefile @@ -31,6 +31,8 @@ all: _all include $(ASTTOPDIR)/Makefile.moddir_rules +snmp/agent.o: ASTCFLAGS+=$(MENUSELECT_OPTS_res_snmp:%=-D%) $(foreach dep,$(MENUSELECT_DEPENDS_res_snmp),$(value $(dep)_INCLUDE)) + $(if $(filter res_snmp,$(EMBEDDED_MODS)),modules.link,res_snmp.so): snmp/agent.o clean:: |