ensure that all remaining multi-object modules are built using their proper CFLAGS...

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@102627 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/pbx/Makefile b/pbx/Makefile
index 8d29bfbbfb6c88ee3f304101825a5d6ee4ff46ef..f3a97b55e9b920fdae4bb6c9cfbecb9a8565e962 100644 (file)
--- 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 11fdfa096eaaa770bf856633694e17d1ed32451a..aad078f23d3bf0d0f2b877c22c071f67d5534b7d 100644 (file)
--- 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::