Author: mikej Date: Sun Mar 18 12:45:57 2007 New Revision: 4642 Modified: freeswitch/trunk/Makefile.am freeswitch/trunk/Makefile.in freeswitch/trunk/build/modmake.rules.in freeswitch/trunk/src/mod/Makefile.am freeswitch/trunk/src/mod/Makefile.in Log: use -s for make without chekc on if it's supported. If we run into ones that do not support -s, we can adress it at that point. Modified: freeswitch/trunk/Makefile.am ============================================================================== --- freeswitch/trunk/Makefile.am (original) +++ freeswitch/trunk/Makefile.am Sun Mar 18 12:45:57 2007 @@ -13,7 +13,8 @@ LIBTOOL=$(switch_builddir)/libtool LTINSTALL = $(LIBTOOL) --mode=install $(INSTALL) TOUCH_TARGET=if test -f "$@" ; then touch "$@" ; fi ; -AM_MAKEFLAGS=`if test -z "$(VERBOSE)" ; then $(MAKE) --help | grep silent | grep "\-s" 2>&1 >/dev/null && echo -s;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` if CRASHPROT AM_CFLAGS += -DCRASH_PROT Modified: freeswitch/trunk/Makefile.in ============================================================================== --- freeswitch/trunk/Makefile.in (original) +++ freeswitch/trunk/Makefile.in Sun Mar 18 12:45:57 2007 @@ -40,6 +40,7 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ +#AM_MAKEFLAGS=`if test -z "$(VERBOSE)" ; then $(MAKE) --help | grep silent | grep "\-s" 2>&1 >/dev/null && echo -s;fi` @CRASHPROT_TRUE@am__append_1 = -DCRASH_PROT bin_PROGRAMS = freeswitch$(EXEEXT) DIST_COMMON = README $(am__configure_deps) $(library_include_HEADERS) \ @@ -300,7 +301,7 @@ OSARCH = `uname -s` LTINSTALL = $(LIBTOOL) --mode=install $(INSTALL) TOUCH_TARGET = if test -f "$@" ; then touch "$@" ; fi ; -AM_MAKEFLAGS = `if test -z "$(VERBOSE)" ; then $(MAKE) --help | grep silent | grep "\-s" 2>&1 >/dev/null && echo -s;fi` +AM_MAKEFLAGS = `test -n "$(VERBOSE)" || echo -s` libfreeswitch_la_SOURCES = \ src/switch_apr.c \ src/switch_buffer.c \ Modified: freeswitch/trunk/build/modmake.rules.in ============================================================================== --- freeswitch/trunk/build/modmake.rules.in (original) +++ freeswitch/trunk/build/modmake.rules.in Sun Mar 18 12:45:57 2007 @@ -48,7 +48,8 @@ CXXSOURCEFILE=$(MODNAME).cpp TOUCH_TARGET=if test -f "$@" ; then touch "$@" ; fi ; -MAKE_OPTS = `if test -z "$(VERBOSE)" ; then $(MAKE) --help | grep silent | grep "\-s" 2>&1 >/dev/null && echo -s;fi` +#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` RECURSE_MODNAME=`pwd | sed -e 's|^.*/||'` RECURSE_SOURCEFILE=`if test -f $$modname.cpp; then echo $$modname.cpp; else echo $$modname.c; fi` RECURSE_OUR_DEPS=`test -z "$(WANT_CURL)" || if test ! -z "$(LIBCURL_DEPS)"; then echo $(CURLLA); fi` Modified: freeswitch/trunk/src/mod/Makefile.am ============================================================================== --- freeswitch/trunk/src/mod/Makefile.am (original) +++ freeswitch/trunk/src/mod/Makefile.am Sun Mar 18 12:45:57 2007 @@ -6,7 +6,8 @@ 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 = `if test -z "$(VERBOSE)" ; then $(MAKE) --help | grep silent | grep "\-s" 2>&1 >/dev/null && echo -s;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) \ Modified: freeswitch/trunk/src/mod/Makefile.in ============================================================================== --- freeswitch/trunk/src/mod/Makefile.in (original) +++ freeswitch/trunk/src/mod/Makefile.in Sun Mar 18 12:45:57 2007 @@ -201,7 +201,7 @@ 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 = `if test -z "$(VERBOSE)" ; then $(MAKE) --help | grep silent | grep "\-s" 2>&1 >/dev/null && echo -s;fi` +AM_MAKEFLAGS = `test -n "$(VERBOSE)" || echo -s` all: all-am .SUFFIXES: @@ -358,6 +358,7 @@ mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \ uninstall-info-am +#AM_MAKEFLAGS = `if test -z "$(VERBOSE)" ; then $(MAKE) --help | grep silent | grep "\-s" 2>&1 >/dev/null && echo -s;fi` all: @$(CONF_MODULES) \