[Freeswitch-svn] [commit] r4636 - in freeswitch/trunk: . build src/mod
Freeswitch SVN
mikej at freeswitch.org
Sun Mar 18 01:20:35 EDT 2007
Author: mikej
Date: Sun Mar 18 01:20:35 2007
New Revision: 4636
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:
make the build a bit quieter. To make it loud again, export VERBOSE. It will still show you all the warnings and all that on errors.
Modified: freeswitch/trunk/Makefile.am
==============================================================================
--- freeswitch/trunk/Makefile.am (original)
+++ freeswitch/trunk/Makefile.am Sun Mar 18 01:20:35 2007
@@ -12,7 +12,7 @@
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 @@
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 @@
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}
Modified: freeswitch/trunk/Makefile.in
==============================================================================
--- freeswitch/trunk/Makefile.in (original)
+++ freeswitch/trunk/Makefile.in Sun Mar 18 01:20:35 2007
@@ -299,7 +299,7 @@
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 @@
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 @@
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}
Modified: freeswitch/trunk/build/modmake.rules.in
==============================================================================
--- freeswitch/trunk/build/modmake.rules.in (original)
+++ freeswitch/trunk/build/modmake.rules.in Sun Mar 18 01:20:35 2007
@@ -46,7 +46,7 @@
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 @@
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 @@
.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 \
Modified: freeswitch/trunk/src/mod/Makefile.am
==============================================================================
--- freeswitch/trunk/src/mod/Makefile.am (original)
+++ freeswitch/trunk/src/mod/Makefile.am Sun Mar 18 01:20:35 2007
@@ -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 @@
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 @@
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 @@
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 @@
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
Modified: freeswitch/trunk/src/mod/Makefile.in
==============================================================================
--- freeswitch/trunk/src/mod/Makefile.in (original)
+++ freeswitch/trunk/src/mod/Makefile.in Sun Mar 18 01:20:35 2007
@@ -193,9 +193,12 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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:
More information about the Freeswitch-svn
mailing list