Fix bootstrap with automake 1.7

fix generation of modules.conf from modules.conf.in on first build
some more steps towards removing gmake specific stuff from our makefiles.



git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@4617 d0543943-73ff-0310-b7d9-9358b9ac24b2

Makefile.am

 EXTRA_DIST =
-SUBDIRS = . src/mod
+SUBDIRS = . src
 AUTOMAKE_OPTS = foreign
 NAME=freeswitch
 PREFIX=$(prefix)
@@ -8,7 +8,7 @@ AM_CFLAGS   = $(SWITCH_AM_CFLAGS)
 AM_CPPFLAGS = $(SWITCH_AM_CXXFLAGS)
 AM_LDFLAGS  = $(SWITCH_AM_LDFLAGS)
 BASE        = $(switch_srcdir)
-OSARCH=$(shell uname -s)
+OSARCH=`uname -s`
 
 LIBTOOL=$(switch_builddir)/libtool
 LTINSTALL = $(LIBTOOL) --mode=install $(INSTALL)
@@ -65,8 +65,8 @@ src/include/switch_stun.h\
 src/include/switch_log.h\
 src/include/switch_xml.h
 
-CORE_CFLAGS     = $(shell $(switch_srcdir)/libs/apr/apr-1-config --cflags --cppflags --includes)
-CORE_CFLAGS    += $(shell $(switch_srcdir)/libs/apr-util/apu-1-config --includes)
+CORE_CFLAGS     = `$(switch_srcdir)/libs/apr/apr-1-config --cflags --cppflags --includes`
+CORE_CFLAGS    += `$(switch_srcdir)/libs/apr-util/apu-1-config --includes`
 CORE_CFLAGS    += -I$(switch_srcdir)/libs/sqlite
 CORE_CFLAGS    += -I$(switch_srcdir)/libs/pcre
 CORE_CFLAGS    += -I$(switch_srcdir)/libs/srtp/include
@@ -85,7 +85,7 @@ libfreeswitch_la_LDFLAGS  = -version-info 1:0:0 $(AM_LDFLAGS)
 libfreeswitch_la_LIBADD  = $(CORE_LIBS)
 nodist_libfreeswitch_la_SOURCES = src/include/switch_version.h
 
-$(libfreeswitch_la_SOURCES): $(CORE_LIBS)
+$(libfreeswitch_la_SOURCES): $(CORE_LIBS) $(library_include_HEADERS)
 
 MOD_LINK       = $(BASE)/libfreeswitch.la
 
@@ -153,7 +153,7 @@ $(CORE_LIBS):
 	cd libs/libresample && $(MAKE)
 	cd libs/libteletone && $(MAKE)
 
-core: deps libfreeswitch.la  
+core: $(CORE_LIBS) libfreeswitch.la  
 
 install_core: install-libLTLIBRARIES
 

Makefile.in

@@ -289,7 +289,7 @@ target_alias = @target_alias@
 uint64_t_fmt = @uint64_t_fmt@
 voidp_size = @voidp_size@
 EXTRA_DIST = 
-SUBDIRS = . src/mod
+SUBDIRS = . src
 AUTOMAKE_OPTS = foreign
 NAME = freeswitch
 PREFIX = $(prefix)
@@ -297,7 +297,7 @@ AM_CFLAGS = $(SWITCH_AM_CFLAGS) $(am__append_1)
 AM_CPPFLAGS = $(SWITCH_AM_CXXFLAGS)
 AM_LDFLAGS = $(SWITCH_AM_LDFLAGS)
 BASE = $(switch_srcdir)
-OSARCH = $(shell uname -s)
+OSARCH = `uname -s`
 LTINSTALL = $(LIBTOOL) --mode=install $(INSTALL)
 libfreeswitch_la_SOURCES = \
 src/switch_apr.c \
@@ -346,9 +346,9 @@ src/include/switch_stun.h\
 src/include/switch_log.h\
 src/include/switch_xml.h
 
-CORE_CFLAGS = $(shell $(switch_srcdir)/libs/apr/apr-1-config --cflags \
-	--cppflags --includes) $(shell \
-	$(switch_srcdir)/libs/apr-util/apu-1-config --includes) \
+CORE_CFLAGS = `$(switch_srcdir)/libs/apr/apr-1-config --cflags \
+	--cppflags --includes` \
+	`$(switch_srcdir)/libs/apr-util/apu-1-config --includes` \
 	-I$(switch_srcdir)/libs/sqlite -I$(switch_srcdir)/libs/pcre \
 	-I$(switch_srcdir)/libs/srtp/include \
 	-I$(switch_srcdir)/libs/srtp/crypto/include \
@@ -1085,7 +1085,7 @@ uninstall-info: uninstall-info-recursive
 	uninstall-libLTLIBRARIES uninstall-library_includeHEADERS
 
 
-$(libfreeswitch_la_SOURCES): $(CORE_LIBS)
+$(libfreeswitch_la_SOURCES): $(CORE_LIBS) $(library_include_HEADERS)
 
 install-data-local:
 	@echo Installing $(NAME)
@@ -1142,7 +1142,7 @@ $(CORE_LIBS):
 	cd libs/libresample && $(MAKE)
 	cd libs/libteletone && $(MAKE)
 
-core: deps libfreeswitch.la  
+core: $(CORE_LIBS) libfreeswitch.la  
 
 install_core: install-libLTLIBRARIES
 

configure

@@ -25769,7 +25769,7 @@ else
 fi
 
 
-                                                  ac_config_files="$ac_config_files Makefile src/mod/Makefile src/include/switch_am_config.h build/getlib.sh build/modmake.rules"
+                                                            ac_config_files="$ac_config_files Makefile src/Makefile src/mod/Makefile src/include/switch_am_config.h build/getlib.sh build/modmake.rules"
 
 
 
@@ -26493,6 +26493,7 @@ do
   case "$ac_config_target" in
   # Handling of arguments.
   "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;;
+  "src/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/Makefile" ;;
   "src/mod/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/mod/Makefile" ;;
   "src/include/switch_am_config.h" ) CONFIG_FILES="$CONFIG_FILES src/include/switch_am_config.h" ;;
   "build/getlib.sh" ) CONFIG_FILES="$CONFIG_FILES build/getlib.sh" ;;

configure.in

@@ -291,6 +291,7 @@ AC_ARG_ENABLE(crash-protection,
 AM_CONDITIONAL([CRASHPROT],[test "x$enable_crash_prot" != "xno"])
 
 AC_CONFIG_FILES([Makefile
+                src/Makefile
                 src/mod/Makefile
                 src/include/switch_am_config.h
                 build/getlib.sh

src/Makefile.am

+SUBDIRS = mod
+
+

src/mod/Makefile.am

-CONF_MODULES=$(shell grep -v "\#" $(switch_builddir)/modules.conf)
-FOUND_MODULES=$(shell find . -type d -name mod_\*)
-OUR_MODULES=`if test -z "$(MODULES)" ; then echo $(CONF_MODULES) ; else echo $(MODULES) ; fi ;`
-OUR_CLEAN_MODULES=`if test -z "$(MODULES)" ; then echo $(CONF_MODULES) $(FOUND_MODULES) ; else echo $(MODULES) ; fi ;`
+CONF_MODULES=if test ! -f $(switch_builddir)/modules.conf ; then cp $(switch_builddir)/modules.conf.in $(switch_builddir)/modules.conf ; fi ; conf_modules=`grep -v "\#" $(switch_builddir)/modules.conf` ;
+FOUND_MODULES=found_modules=`find . -type d -name mod_\*` ;
+OUR_MODULES=if test -z "$(MODULES)" ; then our_modules=$$conf_modules ; else our_modules=$(MODULES) ; fi ;
+OUR_CLEAN_MODULES=if test -z "$(MODULES)" ; then our_clean_modules=`echo $$conf_modules $$found_modules` ; else our_clean_modules=$(MODULES) ; fi ;
 MOD_NAME=`echo $$i | sed -e 's|^.*/||'`
 MOD_DIR=`if test -d $(switch_srcdir)/src/mod/$$i ; then echo $(switch_srcdir)/src/mod/$$i ; else echo $$i ; fi;`
 
 
 all: 
-	@if [ ! -f $(switch_builddir)/modules.conf ] ; then cp $(switch_builddir)/modules.conf.in $(switch_builddir)/modules.conf ; fi
-	@echo making modules
-	@for i in $(OUR_MODULES) ; do  \
+	@$(CONF_MODULES) \
+	$(OUR_MODULES) \
+	echo making modules ; \
+	for i in $$our_modules ; do  \
 	   echo making $$i ; \
 	   moddir=$(MOD_DIR); \
 	   if test -f $$moddir/Makefile ; then \
@@ -19,7 +20,11 @@ all:
 	 done
 
 clean:
-	@for i in $(OUR_CLEAN_MODULES) ; do \
+	@$(CONF_MODULES) \
+	$(FOUND_MODULES) \
+	$(OUR_CLEAN_MODULES) \
+	echo making clean modules ; \
+	for i in $$our_clean_modules ; do \
 	   echo making clean $$i ; \
 	   moddir=$(MOD_DIR); \
 	   if test -f $$moddir/Makefile ; then \
@@ -29,8 +34,10 @@ clean:
 	 done
 
 install:
-	@echo Installing Modules
-	@for i in $(OUR_MODULES) ; do \
+	@$(CONF_MODULES) \
+	$(OUR_MODULES) \
+	echo Installing Modules ; \
+	for i in $$our_modules ; do  \
 	   echo making install $$i ; \
 	   moddir=$(MOD_DIR); \
 	   if test -f $$moddir/Makefile ; then \
@@ -41,8 +48,10 @@ install:
 	@echo done
 
 uninstall:
-	@echo Uninstalling Modules
-	@for i in $(OUR_MODULES) ; do \
+	@$(CONF_MODULES) \
+	$(OUR_MODULES) \
+	echo Uninstalling Modules ; \
+	for i in $$our_modules ; do  \
 	   echo making uninstall $$i ; \
 	   moddir=$(MOD_DIR); \
 	   if test -f $$moddir/Makefile ; then \

src/mod/Makefile.in

@@ -165,10 +165,10 @@ sysconfdir = @sysconfdir@
 target_alias = @target_alias@
 uint64_t_fmt = @uint64_t_fmt@
 voidp_size = @voidp_size@
-CONF_MODULES = $(shell grep -v "\#" $(switch_builddir)/modules.conf)
-FOUND_MODULES = $(shell find . -type d -name mod_\*)
-OUR_MODULES = `if test -z "$(MODULES)" ; then echo $(CONF_MODULES) ; else echo $(MODULES) ; fi ;`
-OUR_CLEAN_MODULES = `if test -z "$(MODULES)" ; then echo $(CONF_MODULES) $(FOUND_MODULES) ; else echo $(MODULES) ; fi ;`
+CONF_MODULES = if test ! -f $(switch_builddir)/modules.conf ; then cp $(switch_builddir)/modules.conf.in $(switch_builddir)/modules.conf ; fi ; conf_modules=`grep -v "\#" $(switch_builddir)/modules.conf` ;
+FOUND_MODULES = found_modules=`find . -type d -name mod_\*` ;
+OUR_MODULES = if test -z "$(MODULES)" ; then our_modules=$$conf_modules ; else our_modules=$(MODULES) ; fi ;
+OUR_CLEAN_MODULES = if test -z "$(MODULES)" ; then our_clean_modules=`echo $$conf_modules $$found_modules` ; else our_clean_modules=$(MODULES) ; fi ;
 MOD_NAME = `echo $$i | sed -e 's|^.*/||'`
 MOD_DIR = `if test -d $(switch_srcdir)/src/mod/$$i ; then echo $(switch_srcdir)/src/mod/$$i ; else echo $$i ; fi;`
 all: all-am
@@ -319,9 +319,10 @@ uninstall-am: uninstall-info-am
 
 
 all: 
-	@if [ ! -f $(switch_builddir)/modules.conf ] ; then cp $(switch_builddir)/modules.conf.in $(switch_builddir)/modules.conf ; fi
-	@echo making modules
-	@for i in $(OUR_MODULES) ; do  \
+	@$(CONF_MODULES) \
+	$(OUR_MODULES) \
+	echo making modules ; \
+	for i in $$our_modules ; do  \
 	   echo making $$i ; \
 	   moddir=$(MOD_DIR); \
 	   if test -f $$moddir/Makefile ; then \
@@ -331,7 +332,11 @@ all:
 	 done
 
 clean:
-	@for i in $(OUR_CLEAN_MODULES) ; do \
+	@$(CONF_MODULES) \
+	$(FOUND_MODULES) \
+	$(OUR_CLEAN_MODULES) \
+	echo making clean modules ; \
+	for i in $$our_clean_modules ; do \
 	   echo making clean $$i ; \
 	   moddir=$(MOD_DIR); \
 	   if test -f $$moddir/Makefile ; then \
@@ -341,8 +346,10 @@ clean:
 	 done
 
 install:
-	@echo Installing Modules
-	@for i in $(OUR_MODULES) ; do \
+	@$(CONF_MODULES) \
+	$(OUR_MODULES) \
+	echo Installing Modules ; \
+	for i in $$our_modules ; do  \
 	   echo making install $$i ; \
 	   moddir=$(MOD_DIR); \
 	   if test -f $$moddir/Makefile ; then \
@@ -353,8 +360,10 @@ install:
 	@echo done
 
 uninstall:
-	@echo Uninstalling Modules
-	@for i in $(OUR_MODULES) ; do \
+	@$(CONF_MODULES) \
+	$(OUR_MODULES) \
+	echo Uninstalling Modules ; \
+	for i in $$our_modules ; do  \
 	   echo making uninstall $$i ; \
 	   moddir=$(MOD_DIR); \
 	   if test -f $$moddir/Makefile ; then \