Author: mikej Date: Fri Mar 30 16:22:38 2007 New Revision: 4814 Modified: freeswitch/trunk/Makefile.am freeswitch/trunk/build/modmake.rules.in freeswitch/trunk/configure.in freeswitch/trunk/src/mod/Makefile.am Log: some cleanup in the Makefiles Modified: freeswitch/trunk/Makefile.am ============================================================================== --- freeswitch/trunk/Makefile.am (original) +++ freeswitch/trunk/Makefile.am Fri Mar 30 16:22:38 2007 @@ -10,13 +10,6 @@ BASE = $(switch_srcdir) OSARCH=`uname -s` -LIBTOOL=`if test -z "$(VERBOSE)" ; then echo $(SHELL) $(switch_builddir)/quiet_libtool ;else echo $(switch_builddir)/libtool; fi;` -#LIBS+=> core.log || error="yes";if test -n "$(VERBOSE)" -o "$$error" = "yes";then cat core.log;fi;if test "$$error" = "yes";then exit 1;fi - -LTINSTALL = $(LIBTOOL) --mode=install $(INSTALL) -TOUCH_TARGET=if test -f "$@" ; then touch "$@" ; fi ; -AM_MAKEFLAGS=`test -n "$(VERBOSE)" || echo -s` - if CRASHPROT AM_CFLAGS += -DCRASH_PROT endif Modified: freeswitch/trunk/build/modmake.rules.in ============================================================================== --- freeswitch/trunk/build/modmake.rules.in (original) +++ freeswitch/trunk/build/modmake.rules.in Fri Mar 30 16:22:38 2007 @@ -9,7 +9,7 @@ SHELL=@SHELL@ INSTALL=@INSTALL@ GETLIB=@GETLIB@ -LIBTOOL=$(switch_builddir)/libtool +LIBTOOL=@LIBTOOL@ LTINSTALL=$(LIBTOOL) --mode=install $(INSTALL) LTUNINSTALL=$(LIBTOOL) --mode=uninstall rm -f CCLD = $(CC) @@ -46,7 +46,7 @@ CSOURCEFILE=$(MODNAME).c CXXSOURCEFILE=$(MODNAME).cpp -TOUCH_TARGET=if test -f "$@" ; then touch "$@" ; fi ; +TOUCH_TARGET=@TOUCH_TARGET@ #MAKE_OPTS = `if test -z "$(VERBOSE)" ; then $(MAKE) --help | grep silent | grep "\-s" 2>&1 >/dev/null && echo -s;fi` MAKE_OPTS = `test -n "$(VERBOSE)" || echo -s` Modified: freeswitch/trunk/configure.in ============================================================================== --- freeswitch/trunk/configure.in (original) +++ freeswitch/trunk/configure.in Fri Mar 30 16:22:38 2007 @@ -327,6 +327,15 @@ AM_CONDITIONAL(ISMAC, [test `uname -s` = Darwin]) AM_CONDITIONAL(IS64BITLINUX, [test `uname -m` = x86_64]) +#some vars to sub into the Makefile.am's +#LIBS+=> core.log || error="yes";if test -n "$(VERBOSE)" -o "$$error" = "yes";then cat core.log;fi;if test "$$error" = "yes";then exit 1;fi +LIBTOOL='`if test -z "$(VERBOSE)" ; then echo $(SHELL) $(switch_builddir)/quiet_libtool ;else echo $(switch_builddir)/libtool; fi;`' +TOUCH_TARGET='if test -f "$@";then touch "$@";fi;' +AM_MAKEFLAGS='`test -n "$(VERBOSE)" || echo -s`' +AC_SUBST(LIBTOOL) +AC_SUBST(TOUCH_TARGET) +AC_SUBST(AM_MAKEFLAGS) + # Run configure in all the subdirs AC_CONFIG_SUBDIRS(libs/srtp) AC_CONFIG_SUBDIRS(libs/sqlite) Modified: freeswitch/trunk/src/mod/Makefile.am ============================================================================== --- freeswitch/trunk/src/mod/Makefile.am (original) +++ freeswitch/trunk/src/mod/Makefile.am Fri Mar 30 16:22:38 2007 @@ -6,8 +6,6 @@ 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;` -AM_MAKEFLAGS = `test -n "$(VERBOSE)" || echo -s` -#AM_MAKEFLAGS = `if test -z "$(VERBOSE)" ; then $(MAKE) --help | grep silent | grep "\-s" 2>&1 >/dev/null && echo -s;fi` all: @$(CONF_MODULES) \