make the build a bit quieter. To make it loud again, export VERBOSE. It will still...

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

diff --git a/Makefile.am b/Makefile.am
index d114e21943fc96d234c1a2786f4036fae4cd66f1..77c000188feb844b0132402629d8114fb7ab094a 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -12,7 +12,7 @@ OSARCH=`uname -s`
 
 LIBTOOL=$(switch_builddir)/libtool
 LTINSTALL = $(LIBTOOL) --mode=install $(INSTALL)
-TOUCH_TARGET=@if test -f "$@" ; then touch "$@" ; fi ;
+TOUCH_TARGET=if test -f "$@" ; then touch "$@" ; fi ;
 
 if CRASHPROT
 AM_CFLAGS += -DCRASH_PROT
@@ -146,32 +146,32 @@ yesdepends:
        rm .nodepends
 
 libs/apr/libapr-1.la: libs/apr libs/apr/.update
-       cd libs/apr && $(MAKE)
-       $(TOUCH_TARGET)
+       @cd libs/apr && $(MAKE)
+       @$(TOUCH_TARGET)
 
 libs/apr-util/libaprutil-1.la: libs/apr-util libs/apr-util/.update
-       cd libs/apr-util && $(MAKE)
-       $(TOUCH_TARGET)
+       @cd libs/apr-util && $(MAKE)
+       @$(TOUCH_TARGET)
 
 libs/sqlite/libsqlite3.la: libs/sqlite libs/sqlite/.update
-       cd libs/sqlite && $(MAKE)
-       $(TOUCH_TARGET)
+       @cd libs/sqlite && $(MAKE)
+       @$(TOUCH_TARGET)
 
 libs/pcre/libpcre.la: libs/pcre libs/pcre/.update
-       cd libs/pcre && $(MAKE)
-       $(TOUCH_TARGET)
+       @cd libs/pcre && $(MAKE)
+       @$(TOUCH_TARGET)
 
 libs/srtp/libsrtp.la: libs/srtp libs/srtp/.update
-       cd libs/srtp && $(MAKE)
-       $(TOUCH_TARGET)
+       @cd libs/srtp && $(MAKE)
+       @$(TOUCH_TARGET)
 
 libs/libteletone/libteletone.la: libs/libteletone libs/libteletone/.update
-       cd libs/libteletone && $(MAKE)
-       $(TOUCH_TARGET)
+       @cd libs/libteletone && $(MAKE)
+       @$(TOUCH_TARGET)
 
 libs/libresample/libresample.la: libs/libresample libs/libresample/.update
-       cd libs/libresample && $(MAKE)
-       $(TOUCH_TARGET)
+       @cd libs/libresample && $(MAKE)
+       @$(TOUCH_TARGET)
 
 core:  libfreeswitch.la  
 
@@ -188,20 +188,20 @@ sure: clean modwipe uninstall installall
 wayclean: clean
 
 modules: libfreeswitch.la
-       $(MAKE) -C src/mod
+       @cd src/mod && $(MAKE)
 
 install_mod: libfreeswitch.la
-       $(MAKE) -C src/mod install
+       @cd src/mod && $(MAKE) install
 
 mod_install: install_mod
 
 uninstall_mod:
-       $(MAKE) -C src/mod uninstall
+       @cd src/mod && $(MAKE) uninstall
 
 mod_uninstall: uninstall_mod
 
 modclean:
-       $(MAKE) -C src/mod clean
+       @cd src/mod && $(MAKE) clean
 
 modwipe:
        rm -f $(PREFIX)/mod/*.${DYNAMIC_LIB_EXTEN}

diff --git a/Makefile.in b/Makefile.in
index ad510994f2411692655e13bcfd5212061d23c0df..e5be05c931028e376842895dbed1ba9d652c3a16 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -299,7 +299,7 @@ AM_LDFLAGS = $(SWITCH_AM_LDFLAGS)
 BASE = $(switch_srcdir)
 OSARCH = `uname -s`
 LTINSTALL = $(LIBTOOL) --mode=install $(INSTALL)
-TOUCH_TARGET = @if test -f "$@" ; then touch "$@" ; fi ;
+TOUCH_TARGET = if test -f "$@" ; then touch "$@" ; fi ;
 libfreeswitch_la_SOURCES = \
 src/switch_apr.c \
 src/switch_buffer.c \
@@ -1135,32 +1135,32 @@ yesdepends:
        rm .nodepends
 
 libs/apr/libapr-1.la: libs/apr libs/apr/.update
-       cd libs/apr && $(MAKE)
-       $(TOUCH_TARGET)
+       @cd libs/apr && $(MAKE)
+       @$(TOUCH_TARGET)
 
 libs/apr-util/libaprutil-1.la: libs/apr-util libs/apr-util/.update
-       cd libs/apr-util && $(MAKE)
-       $(TOUCH_TARGET)
+       @cd libs/apr-util && $(MAKE)
+       @$(TOUCH_TARGET)
 
 libs/sqlite/libsqlite3.la: libs/sqlite libs/sqlite/.update
-       cd libs/sqlite && $(MAKE)
-       $(TOUCH_TARGET)
+       @cd libs/sqlite && $(MAKE)
+       @$(TOUCH_TARGET)
 
 libs/pcre/libpcre.la: libs/pcre libs/pcre/.update
-       cd libs/pcre && $(MAKE)
-       $(TOUCH_TARGET)
+       @cd libs/pcre && $(MAKE)
+       @$(TOUCH_TARGET)
 
 libs/srtp/libsrtp.la: libs/srtp libs/srtp/.update
-       cd libs/srtp && $(MAKE)
-       $(TOUCH_TARGET)
+       @cd libs/srtp && $(MAKE)
+       @$(TOUCH_TARGET)
 
 libs/libteletone/libteletone.la: libs/libteletone libs/libteletone/.update
-       cd libs/libteletone && $(MAKE)
-       $(TOUCH_TARGET)
+       @cd libs/libteletone && $(MAKE)
+       @$(TOUCH_TARGET)
 
 libs/libresample/libresample.la: libs/libresample libs/libresample/.update
-       cd libs/libresample && $(MAKE)
-       $(TOUCH_TARGET)
+       @cd libs/libresample && $(MAKE)
+       @$(TOUCH_TARGET)
 
 core:  libfreeswitch.la  
 
@@ -1177,20 +1177,20 @@ sure: clean modwipe uninstall installall
 wayclean: clean
 
 modules: libfreeswitch.la
-       $(MAKE) -C src/mod
+       @cd src/mod && $(MAKE)
 
 install_mod: libfreeswitch.la
-       $(MAKE) -C src/mod install
+       @cd src/mod && $(MAKE) install
 
 mod_install: install_mod
 
 uninstall_mod:
-       $(MAKE) -C src/mod uninstall
+       @cd src/mod && $(MAKE) uninstall
 
 mod_uninstall: uninstall_mod
 
 modclean:
-       $(MAKE) -C src/mod clean
+       @cd src/mod && $(MAKE) clean
 
 modwipe:
        rm -f $(PREFIX)/mod/*.${DYNAMIC_LIB_EXTEN}

diff --git a/build/modmake.rules.in b/build/modmake.rules.in
index f164e1ed8f494b638689193c7e09d0b10c915aff..88fdf83626039799c63d73ac9f5975ac1c09c890 100644 (file)
--- a/build/modmake.rules.in
+++ b/build/modmake.rules.in
@@ -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=if test -f "$@" ; then touch "$@" ; fi ;
 
 RECURSE_MODNAME=`pwd | sed -e 's|^.*/||'`
 RECURSE_SOURCEFILE=`if test -f $$modname.cpp; then echo $$modname.cpp; else echo $$modname.c; fi`
@@ -92,27 +92,36 @@ Makefile:
        fi ;
 
 $(CURLLA):
-       cd $(CURL_DIR) && $(MAKE)
+       @cd $(CURL_DIR) && $(MAKE)
+
+LINK_OUTPUT_REDIR=> .libs/$(MODNAME).log || error="yes" ; \
+                       if test -n "$(VERBOSE)" -o "$$error" = "yes"; then \
+                         cat .libs/$(MODNAME).log ; \
+                       fi ;\
+                       if test "$$error" = "yes"; then \
+                         exit 1 ;\
+                        fi 
 
 $(MODNAME).$(DYNAMIC_LIB_EXTEN): $(LIBS) $(LOCAL_LIBADD) $(OUR_DEPS) $(LOCAL_OBJS) $(SOURCEFILE) $(MODNAME).o 
-       @if test -f $(CSOURCEFILE); then \
-       echo $(LINK) $(SOLINK) $(MODNAME).o -o $(MODNAME).$(DYNAMIC_LIB_EXTEN) $(LIBS) $(LOCAL_LDFLAGS) $(LOCAL_OBJS) $(LOCAL_LIBADD); \
-       $(LINK) $(SOLINK) $(MODNAME).o -o $(MODNAME).$(DYNAMIC_LIB_EXTEN) $(LIBS) $(LOCAL_LDFLAGS) $(LOCAL_OBJS) $(LOCAL_LIBADD); \
+       @echo Creating $@...
+       @test -d .libs || mkdir .libs
+       @error="";\
+       if test -f $(CSOURCEFILE); then \
+       $(LINK) $(SOLINK) $(MODNAME).o -o $(MODNAME).$(DYNAMIC_LIB_EXTEN) $(LIBS) $(LOCAL_LDFLAGS) $(LOCAL_OBJS) $(LOCAL_LIBADD) $(LINK_OUTPUT_REDIR) ;\
        else \
-       echo $(CXXLINK) $(SOLINK) $(MODNAME).o -o $(MODNAME).$(DYNAMIC_LIB_EXTEN) $(LIBS) $(LOCAL_LDFLAGS) $(LOCAL_OBJS) $(LOCAL_LIBADD); \
-       $(CXXLINK) $(SOLINK) $(MODNAME).o -o $(MODNAME).$(DYNAMIC_LIB_EXTEN) $(LIBS) $(LOCAL_LDFLAGS) $(LOCAL_OBJS) $(LOCAL_LIBADD); \
+       $(CXXLINK) $(SOLINK) $(MODNAME).o -o $(MODNAME).$(DYNAMIC_LIB_EXTEN) $(LIBS) $(LOCAL_LDFLAGS) $(LOCAL_OBJS) $(LOCAL_LIBADD) $(LINK_OUTPUT_REDIR) ;\
        fi;
 
 mod_clean:
-       rm -fr *.$(DYNAMIC_LIB_EXTEN) *.o *~ .libs
+       @rm -fr *.$(DYNAMIC_LIB_EXTEN) *.o *.lo *~ .libs
 
 mod_install: $(DESTDIR)$(PREFIX)/mod/$(MODNAME).$(DYNAMIC_LIB_EXTEN)
 
 $(DESTDIR)$(PREFIX)/mod/$(MODNAME).$(DYNAMIC_LIB_EXTEN):$(MODNAME).$(DYNAMIC_LIB_EXTEN)
-       $(LTINSTALL) $(MODNAME).$(DYNAMIC_LIB_EXTEN) $(DESTDIR)$(PREFIX)/mod
+       @$(LTINSTALL) $(MODNAME).$(DYNAMIC_LIB_EXTEN) $(DESTDIR)$(PREFIX)/mod
 
 mod_uninstall:
-       $(LTUNINSTALL) $(DESTDIR)$(PREFIX)/mod/$(MODNAME).$(DYNAMIC_LIB_EXTEN)
+       @$(LTUNINSTALL) $(DESTDIR)$(PREFIX)/mod/$(MODNAME).$(DYNAMIC_LIB_EXTEN)
 
 # define these in your makefile if you wish
 local_all local_depend local_clean depend_install local_install local_distclean local_extraclean local_uninstall:
@@ -124,18 +133,26 @@ local_all local_depend local_clean depend_install local_install local_distclean
 .SUFFIXES: .c .lo .o .cpp
 
 .c.o:
-       $(COMPILE) -c -o $@ $<
+       @echo Compiling $<...
+       @if test ! -z $(VERBOSE) ; then echo $(COMPILE) -c -o $@ $< ; fi
+       @$(COMPILE) -c -o $@ $< || exit 1
 
 .c.lo:
-       $(LTCOMPILE) -c -o $@ $<
+       @echo Compiling $<...
+       @if test ! -z $(VERBOSE) ; then echo $(LTCOMPILE) -c -o $@ $< ; fi
+       @$(LTCOMPILE) -c -o $@ $< || exit 1
 
 .cpp.o:
-       $(CXXCOMPILE) -c -o $@ $<
+       @echo Compiling $<...
+       @if test ! -z $(VERBOSE) ; then echo $(CXXCOMPILE) -c -o $@ $< ; fi
+       @$(CXXCOMPILE) -c -o $@ $< || exit 1
 
 .cpp.lo:
-       $(LTCXXCOMPILE) -c -o $@ $<
+       @echo Compiling $<...
+       @if test ! -z $(VERBOSE) ; then echo $(LTCXXCOMPILE) -c -o $@ $< ; fi
+       @$(LTCXXCOMPILE) -c -o $@ $< || exit 1
 
-$(MODNAME).o: $(SOURCEFILE) \
+$(MODNAME).o $(MODNAME).lo: $(SOURCEFILE) \
   $(switch_srcdir)/src/include/switch.h $(switch_srcdir)/src/include/switch_am_config.h \
   $(switch_srcdir)/src/include/switch_types.h $(switch_srcdir)/src/include/switch_apr.h \
   $(switch_srcdir)/src/include/switch_core_db.h $(switch_srcdir)/src/include/switch_regex.h \

diff --git a/src/mod/Makefile.am b/src/mod/Makefile.am
index a47692f4e90ce1d5f927973741241c4e258be1d2..0f67551e77b2a472c06b1f55d5d08092ae890e34 100644 (file)
--- a/src/mod/Makefile.am
+++ b/src/mod/Makefile.am
@@ -1,16 +1,19 @@
 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_\*` ;
+FOUND_MODULES=found_modules=`find . -type d -name mod_\* | sed -e 's|^\./||'` ;
 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 ;
+OUR_CLEAN_MODULES=if test -z "$(MODULES)" ; then tmp_clean_modules=`echo $$conf_modules $$found_modules`; \
+                       our_clean_modules=`for i in $$tmp_clean_modules ; do echo $$i ; done | sort | uniq` ; \
+                        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: 
        @$(CONF_MODULES) \
        $(OUR_MODULES) \
+       echo ;\
        echo making modules ; \
        for i in $$our_modules ; do  \
+          echo ;\
           echo making $$i ; \
           moddir=$(MOD_DIR); \
           if test -f $$moddir/Makefile ; then \
@@ -18,13 +21,17 @@ all:
              cd $$moddir && MODNAME=$(MOD_NAME) BASE=$(switch_builddir) $(MAKE) -f $(switch_builddir)/build/modmake.rules || exit 1; \
           fi; \
         done
+       @echo
+       @echo done making modules
 
 clean:
        @$(CONF_MODULES) \
        $(FOUND_MODULES) \
        $(OUR_CLEAN_MODULES) \
+       echo ;\
        echo making clean modules ; \
        for i in $$our_clean_modules ; do \
+          echo ;\
           echo making clean $$i ; \
           moddir=$(MOD_DIR); \
           if test -f $$moddir/Makefile ; then \
@@ -32,12 +39,16 @@ clean:
              cd $$moddir && MODNAME=$(MOD_NAME) BASE=$(switch_builddir) $(MAKE) -f $(switch_builddir)/build/modmake.rules clean || exit 1; \
           fi; \
         done
+       @echo
+       @echo done making clean modules
 
 install:
        @$(CONF_MODULES) \
        $(OUR_MODULES) \
+       echo ;\
        echo Installing Modules ; \
        for i in $$our_modules ; do  \
+          echo ;\
           echo making install $$i ; \
           moddir=$(MOD_DIR); \
           if test -f $$moddir/Makefile ; then \
@@ -45,13 +56,16 @@ install:
              cd $$moddir && MODNAME=$(MOD_NAME) BASE=$(switch_builddir) $(MAKE) -f $(switch_builddir)/build/modmake.rules install || exit 1; \
           fi; \
        done
-       @echo done
+       @echo
+       @echo done Installing Modules
 
 uninstall:
        @$(CONF_MODULES) \
        $(OUR_MODULES) \
+       echo ;\
        echo Uninstalling Modules ; \
        for i in $$our_modules ; do  \
+          echo ;\
           echo making uninstall $$i ; \
           moddir=$(MOD_DIR); \
           if test -f $$moddir/Makefile ; then \
@@ -59,5 +73,6 @@ uninstall:
              cd $$moddir && MODNAME=$(MOD_NAME) BASE=$(switch_builddir) $(MAKE) -f $(switch_builddir)/build/modmake.rules uninstall || exit 1; \
           fi; \
        done
-       @echo done
+       @echo
+       @echo done Uninstalling Modules
 

diff --git a/src/mod/Makefile.in b/src/mod/Makefile.in
index 6ed9aab8d5434a0f106745fe932c911fb83dfed3..37b8fe840fb25cbfa3da5a0608f97be005939fce 100644 (file)
--- a/src/mod/Makefile.in
+++ b/src/mod/Makefile.in
@@ -193,9 +193,12 @@ target_alias = @target_alias@
 uint64_t_fmt = @uint64_t_fmt@
 voidp_size = @voidp_size@
 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_\*` ;
+FOUND_MODULES = found_modules=`find . -type d -name mod_\* | sed -e 's|^\./||'` ;
 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 ;
+OUR_CLEAN_MODULES = if test -z "$(MODULES)" ; then tmp_clean_modules=`echo $$conf_modules $$found_modules`; \
+                       our_clean_modules=`for i in $$tmp_clean_modules ; do echo $$i ; done | sort | uniq` ; \
+                        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
@@ -358,8 +361,10 @@ uninstall-am: uninstall-info-am
 all: 
        @$(CONF_MODULES) \
        $(OUR_MODULES) \
+       echo ;\
        echo making modules ; \
        for i in $$our_modules ; do  \
+          echo ;\
           echo making $$i ; \
           moddir=$(MOD_DIR); \
           if test -f $$moddir/Makefile ; then \
@@ -367,13 +372,17 @@ all:
              cd $$moddir && MODNAME=$(MOD_NAME) BASE=$(switch_builddir) $(MAKE) -f $(switch_builddir)/build/modmake.rules || exit 1; \
           fi; \
         done
+       @echo
+       @echo done making modules
 
 clean:
        @$(CONF_MODULES) \
        $(FOUND_MODULES) \
        $(OUR_CLEAN_MODULES) \
+       echo ;\
        echo making clean modules ; \
        for i in $$our_clean_modules ; do \
+          echo ;\
           echo making clean $$i ; \
           moddir=$(MOD_DIR); \
           if test -f $$moddir/Makefile ; then \
@@ -381,12 +390,16 @@ clean:
              cd $$moddir && MODNAME=$(MOD_NAME) BASE=$(switch_builddir) $(MAKE) -f $(switch_builddir)/build/modmake.rules clean || exit 1; \
           fi; \
         done
+       @echo
+       @echo done making clean modules
 
 install:
        @$(CONF_MODULES) \
        $(OUR_MODULES) \
+       echo ;\
        echo Installing Modules ; \
        for i in $$our_modules ; do  \
+          echo ;\
           echo making install $$i ; \
           moddir=$(MOD_DIR); \
           if test -f $$moddir/Makefile ; then \
@@ -394,13 +407,16 @@ install:
              cd $$moddir && MODNAME=$(MOD_NAME) BASE=$(switch_builddir) $(MAKE) -f $(switch_builddir)/build/modmake.rules install || exit 1; \
           fi; \
        done
-       @echo done
+       @echo
+       @echo done Installing Modules
 
 uninstall:
        @$(CONF_MODULES) \
        $(OUR_MODULES) \
+       echo ;\
        echo Uninstalling Modules ; \
        for i in $$our_modules ; do  \
+          echo ;\
           echo making uninstall $$i ; \
           moddir=$(MOD_DIR); \
           if test -f $$moddir/Makefile ; then \
@@ -408,7 +424,8 @@ uninstall:
              cd $$moddir && MODNAME=$(MOD_NAME) BASE=$(switch_builddir) $(MAKE) -f $(switch_builddir)/build/modmake.rules uninstall || exit 1; \
           fi; \
        done
-       @echo done
+       @echo
+       @echo done Uninstalling Modules
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT: