[asterisk-commits] kpfleming: branch 1.4 r102627 - in /branches/1.4: pbx/Makefile res/Makefile

[SVN commits to the Asterisk project]

Author: kpfleming
Date: Wed Feb  6 05:48:48 2008
New Revision: 102627

URL: http://svn.digium.com/view/asterisk?view=rev&rev=102627
Log:
ensure that all remaining multi-object modules are built using their proper CFLAGS and include directory paths

Modified:
    branches/1.4/pbx/Makefile
    branches/1.4/res/Makefile

Modified: branches/1.4/pbx/Makefile
URL: http://svn.digium.com/view/asterisk/branches/1.4/pbx/Makefile?view=diff&rev=102627&r1=102626&r2=102627
==============================================================================
--- branches/1.4/pbx/Makefile (original)
+++ branches/1.4/pbx/Makefile Wed Feb  6 05:48:48 2008
@@ -40,6 +40,8 @@
 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 @@
 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

Modified: branches/1.4/res/Makefile
URL: http://svn.digium.com/view/asterisk/branches/1.4/res/Makefile?view=diff&rev=102627&r1=102626&r2=102627
==============================================================================
--- branches/1.4/res/Makefile (original)
+++ branches/1.4/res/Makefile Wed Feb  6 05:48:48 2008
@@ -31,6 +31,8 @@
 
 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::