generate the modules list vars from modules.conf into a file instead of on the fly...

diff --git a/Makefile.am b/Makefile.am
index a6ff8162591ea3093b0d4d387465f908a728c755..629ba3e8c806164ff998ea7b09a28323847d4320 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -32,7 +32,7 @@ AM_LDFLAGS  = $(SWITCH_AM_LDFLAGS) $(AM_LIBAPR_LDFLAGS) $(AM_LIBAPU_LDFLAGS)
 
 DEFAULT_SOUNDS=en-us-callie-8000
 
-.DEFAULT: $(switch_builddir)/modules.conf
+.DEFAULT: $(switch_builddir)/modules.conf src/mod/modules.inc
        @target=`echo $@ | sed -e 's|^.*-||'`; \
         target_prefix=`echo $@ | sed -e 's|-.*$$||'`; \
         sound_perfix=`echo $@ | sed -e 's|-.*||'`; \
@@ -131,7 +131,7 @@ endif
 
 MOD_LINK      = $(switch_srcdir)/libfreeswitch.la
 CLEANFILES    = src/include/switch_version.h src/include/switch_swigable_cpp.h
-BUILT_SOURCES = src/include/switch_version.h src/include/switch_swigable_cpp.h
+BUILT_SOURCES = src/mod/modules.inc src/include/switch_version.h src/include/switch_swigable_cpp.h 
 
 if HAVE_ODBC
 CORE_CFLAGS += -DSWITCH_HAVE_ODBC $(ODBC_INC_FLAGS)
@@ -411,7 +411,17 @@ pkgconfig_DATA = build/freeswitch.pc
 $(switch_builddir)/modules.conf:
        if test -f $@; then touch $@; else cp $(switch_srcdir)/build/modules.conf.in $@ ;fi
 
-$(OUR_MODULES): $(switch_builddir)/modules.conf libfreeswitch.la
+src/mod/modules.inc: $(switch_builddir)/modules.conf
+       @echo "OUR_MODULES=$(OUR_MODS)" > $(switch_builddir)/src/mod/modules.inc
+       @echo "OUR_CLEAN_MODULES=$(OUR_CLEAN_MODS)" >> $(switch_builddir)/src/mod/modules.inc
+       @echo "OUR_INSTALL_MODULES=$(OUR_INSTALL_MODS)" >> $(switch_builddir)/src/mod/modules.inc
+       @echo "OUR_UNINSTALL_MODULES=$(OUR_UNINSTALL_MODS)" >> $(switch_builddir)/src/mod/modules.inc
+       @echo "OUR_DISABLED_MODULES=$(OUR_DISABLED_MODS)" >> $(switch_builddir)/src/mod/modules.inc
+       @echo "OUR_DISABLED_CLEAN_MODULES=$(OUR_DISABLED_CLEAN_MODS)" >> $(switch_builddir)/src/mod/modules.inc
+       @echo "OUR_DISABLED_INSTALL_MODULES=$(OUR_DISABLED_INSTALL_MODS)" >> $(switch_builddir)/src/mod/modules.inc
+       @echo "OUR_DISABLED_UNINSTALL_MODULES=$(OUR_DISABLED_UNINSTALL_MODS)" >> $(switch_builddir)/src/mod/modules.inc
+
+$(OUR_MODULES): $(switch_builddir)/modules.conf libfreeswitch.la src/mod/modules.inc
        @set fnord $$MAKEFLAGS; amf=$$2; \
        (cd src/mod && $(MAKE) $(AM_MAKEFLAGS) $@) \
           || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
@@ -684,20 +694,20 @@ speedy-current: update-clean is-scm
 
 wayclean: clean
 
-modules: libfreeswitch.la $(switch_builddir)/modules.conf 
+modules: libfreeswitch.la $(switch_builddir)/modules.conf src/mod/modules.inc
        @cd src/mod && $(MAKE) $(AM_MAKEFLAGS)
 
-install_mod: libfreeswitch.la $(switch_builddir)/modules.conf
+install_mod: libfreeswitch.la $(switch_builddir)/modules.conf src/mod/modules.inc
        @cd src/mod && $(MAKE) $(AM_MAKEFLAGS) install
 
 mod_install: install_mod
 
-uninstall_mod: $(switch_builddir)/modules.conf
+uninstall_mod: $(switch_builddir)/modules.conf src/mod/modules.inc
        @cd src/mod && $(MAKE) $(AM_MAKEFLAGS) uninstall
 
 mod_uninstall: uninstall_mod
 
-modclean: $(switch_builddir)/modules.conf
+modclean: $(switch_builddir)/modules.conf src/mod/modules.inc
        @cd src/mod && $(MAKE) $(AM_MAKEFLAGS) clean
 
 modwipe:

diff --git a/configure.ac b/configure.ac
index 57cb1dbfb7eef32ebd621a75c15927176d8a5d9f..4c99182aa3cc8b67e466718808bbb9db967ec53b 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1589,7 +1589,7 @@ OUR_DISABLED_CLEAN_MODS='$$(tmp_mods="$(CONF_DISABLED_MODULES)";  mods="$$(for i
 OUR_DISABLED_INSTALL_MODS='$$(tmp_mods="$(CONF_DISABLED_MODULES)"; mods="$$(for i in $$tmp_mods ; do echo $$i-install ; done)"; echo $$mods )'
 OUR_DISABLED_UNINSTALL_MODS='$$(tmp_mods="$(CONF_DISABLED_MODULES)"; mods="$$(for i in $$tmp_mods ; do echo $$i-uninstall ; done)"; echo $$mods )'
 
-AM_MAKEFLAGS='"OUR_MODULES=$(OUR_MODS)" "OUR_CLEAN_MODULES=$(OUR_CLEAN_MODS)" "OUR_INSTALL_MODULES=$(OUR_INSTALL_MODS)" "OUR_UNINSTALL_MODULES=$(OUR_UNINSTALL_MODS)" "OUR_DISABLED_MODULES=$(OUR_DISABLED_MODS)" "OUR_DISABLED_CLEAN_MODULES=$(OUR_DISABLED_CLEAN_MODS)" "OUR_DISABLED_INSTALL_MODULES=$(OUR_DISABLED_INSTALL_MODS)" "OUR_DISABLED_UNINSTALL_MODULES=$(OUR_DISABLED_UNINSTALL_MODS)" `test -n "$(VERBOSE)" || echo -s`'
+#AM_MAKEFLAGS='"OUR_MODULES=$(OUR_MODS)" "OUR_CLEAN_MODULES=$(OUR_CLEAN_MODS)" "OUR_INSTALL_MODULES=$(OUR_INSTALL_MODS)" "OUR_UNINSTALL_MODULES=$(OUR_UNINSTALL_MODS)" "OUR_DISABLED_MODULES=$(OUR_DISABLED_MODS)" "OUR_DISABLED_CLEAN_MODULES=$(OUR_DISABLED_CLEAN_MODS)" "OUR_DISABLED_INSTALL_MODULES=$(OUR_DISABLED_INSTALL_MODS)" "OUR_DISABLED_UNINSTALL_MODULES=$(OUR_DISABLED_UNINSTALL_MODS)" `test -n "$(VERBOSE)" || echo -s`'
 #AM_MAKEFLAGS='`test -n "$(VERBOSE)" || echo -s`'
 AC_SUBST(LIBTOOL)
 AC_SUBST(TOUCH_TARGET)

diff --git a/src/mod/Makefile.am b/src/mod/Makefile.am
index 3ced66b48eade4c8f68da4d70de4f06cfa1ca5ad..f2c8dbeee5d4ec27243ecd644ed2a4b7430e84c7 100644 (file)
--- a/src/mod/Makefile.am
+++ b/src/mod/Makefile.am
@@ -1,3 +1,5 @@
+-include modules.inc
+
 all: $(OUR_MODULES)
 clean: $(OUR_CLEAN_MODULES) $(OUR_DISABLED_CLEAN_MODULES)
 install: $(OUR_INSTALL_MODULES)