From c7753b06d4c3d7d6890d213c921a44fe22da051b Mon Sep 17 00:00:00 2001
From: Michael Jerris <mike@jerris.com>
Date: Fri, 30 Mar 2007 20:22:38 +0000
Subject: [PATCH] some cleanup in the Makefiles

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@4814 d0543943-73ff-0310-b7d9-9358b9ac24b2
---
 Makefile.am            | 7 -------
 build/modmake.rules.in | 4 ++--
 configure.in           | 9 +++++++++
 src/mod/Makefile.am    | 2 --
 4 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 457b0358a6..bf11148ef4 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -10,13 +10,6 @@ AM_LDFLAGS  = $(SWITCH_AM_LDFLAGS)
 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
diff --git a/build/modmake.rules.in b/build/modmake.rules.in
index dc44b3d614..6ca265b0d4 100644
--- a/build/modmake.rules.in
+++ b/build/modmake.rules.in
@@ -9,7 +9,7 @@ AWK=@AWK@
 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 @@ CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(ALL_CXXFLAGS) $(LDFLAGS) -
 
 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`
diff --git a/configure.in b/configure.in
index 48a820dfbf..33cec5102d 100644
--- a/configure.in
+++ b/configure.in
@@ -327,6 +327,15 @@ AM_CONDITIONAL(ISLINUX, [test `uname -s` = Linux])
 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)
diff --git a/src/mod/Makefile.am b/src/mod/Makefile.am
index abe6ef477a..4cca14281f 100644
--- a/src/mod/Makefile.am
+++ b/src/mod/Makefile.am
@@ -6,8 +6,6 @@ OUR_CLEAN_MODULES=if test -z "$(MODULES)" ; then tmp_clean_modules=`echo $$conf_
 			 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) \