- Freeswitch-svn - FreeSWITCH Mailing Lists

[commit] r4645 - freeswitch/trunk/libs/portaudio
by Freeswitch SVN 18 Mar '07

18 Mar '07

Author: mikej Date: Sun Mar 18 13:28:59 2007 New Revision: 4645 Modified: freeswitch/trunk/libs/portaudio/Makefile.in Log: make makefile more bsd make friendly Modified: freeswitch/trunk/libs/portaudio/Makefile.in ============================================================================== --- freeswitch/trunk/libs/portaudio/Makefile.in (original) +++ freeswitch/trunk/libs/portaudio/Makefile.in Sun Mar 18 13:28:59 2007 @@ -164,16 +164,19 @@ distclean: clean rm -f config.log config.status Makefile libtool portaudio-2.0.pc -%.o: %.c $(MAKEFILE) $(PAINC) +.SUFFIXES: +.SUFFIXES: .c .lo .o .cpp + +.c.o: $(MAKEFILE) $(PAINC) $(CC) -c $(CFLAGS) $< -o $@ -%.lo: %.c $(MAKEFILE) $(PAINC) +.c.lo: $(MAKEFILE) $(PAINC) $(LIBTOOL) --mode=compile $(CC) -c $(CFLAGS) $< -o $@ -%.o: %.cpp $(MAKEFILE) $(PAINC) +.cpp.o: $(MAKEFILE) $(PAINC) $(CXX) -c $(CXXFLAGS) $< -o $@ -%.o: %.asm +.asm.o: $(NASM) $(NASMOPT) -o $@ $< bin-stamp:

1 0

[commit] r4644 - freeswitch/trunk/src/mod/asr_tts/mod_cepstral
by Freeswitch SVN 18 Mar '07

18 Mar '07

Author: mikej Date: Sun Mar 18 13:15:29 2007 New Revision: 4644 Modified: freeswitch/trunk/src/mod/asr_tts/mod_cepstral/mod_cepstral.c Log: resolve a few little warnings Modified: freeswitch/trunk/src/mod/asr_tts/mod_cepstral/mod_cepstral.c ============================================================================== --- freeswitch/trunk/src/mod/asr_tts/mod_cepstral/mod_cepstral.c (original) +++ freeswitch/trunk/src/mod/asr_tts/mod_cepstral/mod_cepstral.c Sun Mar 18 13:15:29 2007 @@ -48,6 +48,9 @@ #define MY_BUF_LEN 1024 * 32 #define MY_BLOCK_SIZE MY_BUF_LEN +#undef SWIFT_FAILED +#define SWIFT_FAILED(r) ((void *)(r) < (void *)0) + static const char modname[] = "mod_cepstral"; static swift_engine *engine;

1 0

[commit] r4643 - freeswitch/trunk/src/mod/endpoints/mod_portaudio
by Freeswitch SVN 18 Mar '07

18 Mar '07

Author: mikej Date: Sun Mar 18 13:15:00 2007 New Revision: 4643 Modified: freeswitch/trunk/src/mod/endpoints/mod_portaudio/Makefile Log: bsd make tweak Modified: freeswitch/trunk/src/mod/endpoints/mod_portaudio/Makefile ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_portaudio/Makefile (original) +++ freeswitch/trunk/src/mod/endpoints/mod_portaudio/Makefile Sun Mar 18 13:15:00 2007 @@ -3,12 +3,13 @@ PA_DIR=$(BASE)/libs/portaudio PALA=$(PA_DIR)/lib/libportaudio.la -LOCAL_CFLAGS=-I. -I$(PA_DIR)/include +LOCAL_CFLAGS=-I. -I$(PA_DIR)/include -D__EXTENSION__=1 LOCAL_INSERT_LDFLAGS=if test $$osarch = "Darwin" ; then echo "-framework CoreAudio -framework AudioToolbox -framework AudioUnit -framework Carbon" ; fi ; LOCAL_LIBADD=$(PALA) LOCAL_OBJS=pablio.o pa_ringbuffer.o +LOCAL_SOURCES=pablio.c pa_ringbuffer.c include $(BASE)/build/modmake.rules @@ -16,7 +17,4 @@ cd $(PA_DIR) && $(MAKE) $(TOUCH_TARGET) -pa_ringbuffer.o: pa_ringbuffer.c - $(COMPILE) -D__EXTENSION__=1 -c -o $@ $< - -pablio.o: pablio.c +$(LOCAL_OBJS): $(LOCAL_SOURCES)

1 0

[commit] r4642 - in freeswitch/trunk: . build src/mod
by Freeswitch SVN 18 Mar '07

18 Mar '07

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) \

1 0

[commit] r4641 - in freeswitch/trunk/src: include mod/applications/mod_conference mod/applications/mod_skel mod/endpoints/mod_opal mod/languages/mod_spidermonkey_etpan mod/xml_int/mod_xml_curl
by Freeswitch SVN 18 Mar '07

18 Mar '07

Author: mikej Date: Sun Mar 18 12:40:01 2007 New Revision: 4641 Modified: freeswitch/trunk/src/include/switch_bitpack.h freeswitch/trunk/src/include/switch_private.h.in freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c freeswitch/trunk/src/mod/applications/mod_skel/ (props changed) freeswitch/trunk/src/mod/endpoints/mod_opal/ (props changed) freeswitch/trunk/src/mod/languages/mod_spidermonkey_etpan/mod_spidermonkey_etpan.c freeswitch/trunk/src/mod/xml_int/mod_xml_curl/mod_xml_curl.c Log: fix some warnings Modified: freeswitch/trunk/src/include/switch_bitpack.h ============================================================================== --- freeswitch/trunk/src/include/switch_bitpack.h (original) +++ freeswitch/trunk/src/include/switch_bitpack.h Sun Mar 18 12:40:01 2007 @@ -63,8 +63,8 @@ \{ */ -static const int8_t SWITCH_BITPACKED_MASKS[] = {0, 1, 3, 7, 15, 31, 63, 127, 255}; -static const int8_t SWITCH_REVERSE_BITPACKED_MASKS[] = {255, 254, 252, 248, 240, 224, 192, 128}; +static const uint8_t SWITCH_BITPACKED_MASKS[] = {0, 1, 3, 7, 15, 31, 63, 127, 255}; +static const uint8_t SWITCH_REVERSE_BITPACKED_MASKS[] = {255, 254, 252, 248, 240, 224, 192, 128}; /*! \brief Initialize a bitpack object Modified: freeswitch/trunk/src/include/switch_private.h.in ============================================================================== --- freeswitch/trunk/src/include/switch_private.h.in (original) +++ freeswitch/trunk/src/include/switch_private.h.in Sun Mar 18 12:40:01 2007 @@ -7,6 +7,9 @@ */ #undef HAVE_DIRENT_H +/* Define to 1 if you have the <dlfcn.h> header file. */ +#undef HAVE_DLFCN_H + /* Define to 1 if you have the `gethostname' function. */ #undef HAVE_GETHOSTNAME Modified: freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c (original) +++ freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c Sun Mar 18 12:40:01 2007 @@ -522,7 +522,7 @@ if (conference->alone_sound) { conference_play_file(conference, conference->alone_sound, CONF_DEFAULT_LEADIN, switch_core_session_get_channel(member->session), 0); } else { - snprintf(msg, sizeof(msg), "You are currently the only person in this conference.", conference->count); + snprintf(msg, sizeof(msg), "You are currently the only person in this conference."); conference_member_say(member, msg, CONF_DEFAULT_LEADIN); } } Modified: freeswitch/trunk/src/mod/languages/mod_spidermonkey_etpan/mod_spidermonkey_etpan.c ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_spidermonkey_etpan/mod_spidermonkey_etpan.c (original) +++ freeswitch/trunk/src/mod/languages/mod_spidermonkey_etpan/mod_spidermonkey_etpan.c Sun Mar 18 12:40:01 2007 @@ -62,10 +62,12 @@ { } +#if 0 static JSBool etpan_my_method(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval) { return JS_FALSE; } +#endif enum etpan_tinyid { etpan_NAME Modified: freeswitch/trunk/src/mod/xml_int/mod_xml_curl/mod_xml_curl.c ============================================================================== --- freeswitch/trunk/src/mod/xml_int/mod_xml_curl/mod_xml_curl.c (original) +++ freeswitch/trunk/src/mod/xml_int/mod_xml_curl/mod_xml_curl.c Sun Mar 18 12:40:01 2007 @@ -77,7 +77,7 @@ return NULL; } - if (file_url = strstr(binding->url, "file:")) { + if ((file_url = strstr(binding->url, "file:"))) { file_url += 5; if (!(xml = switch_xml_parse_file(file_url))) {

1 0

[commit] r4640 - in freeswitch/trunk: . build src/mod
by Freeswitch SVN 18 Mar '07

18 Mar '07

Author: mikej Date: Sun Mar 18 12:13:34 2007 New Revision: 4640 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: be quieter in our checks Modified: freeswitch/trunk/Makefile.am ============================================================================== --- freeswitch/trunk/Makefile.am (original) +++ freeswitch/trunk/Makefile.am Sun Mar 18 12:13:34 2007 @@ -13,7 +13,7 @@ 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"> /dev/null && echo -s;fi` +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:13:34 2007 @@ -300,7 +300,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"> /dev/null && echo -s;fi` +AM_MAKEFLAGS = `if test -z "$(VERBOSE)" ; then $(MAKE) --help | grep silent | grep "\-s" 2>&1 >/dev/null && echo -s;fi` 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:13:34 2007 @@ -48,7 +48,7 @@ CXXSOURCEFILE=$(MODNAME).cpp TOUCH_TARGET=if test -f "$@" ; then touch "$@" ; fi ; -MAKE_OPTS = `if test -z "$(VERBOSE)" ; then $(MAKE) --help | grep silent | grep "\-s"> /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` 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:13:34 2007 @@ -6,7 +6,7 @@ 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"> /dev/null && echo -s;fi` +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:13:34 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"> /dev/null && echo -s;fi` +AM_MAKEFLAGS = `if test -z "$(VERBOSE)" ; then $(MAKE) --help | grep silent | grep "\-s" 2>&1 >/dev/null && echo -s;fi` all: all-am .SUFFIXES:

1 0

[commit] r4639 - freeswitch/trunk
by Freeswitch SVN 18 Mar '07

18 Mar '07

Author: mikej Date: Sun Mar 18 12:04:41 2007 New Revision: 4639 Modified: freeswitch/trunk/Makefile.am freeswitch/trunk/Makefile.in Log: a little more cleanup Modified: freeswitch/trunk/Makefile.am ============================================================================== --- freeswitch/trunk/Makefile.am (original) +++ freeswitch/trunk/Makefile.am Sun Mar 18 12:04:41 2007 @@ -202,7 +202,7 @@ mod_uninstall: uninstall_mod modclean: - cd src/mod && $(MAKE) $(AM_MAKEFLAGS) clean + @cd src/mod && $(MAKE) $(AM_MAKEFLAGS) 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 12:04:41 2007 @@ -1191,7 +1191,7 @@ mod_uninstall: uninstall_mod modclean: - cd src/mod && $(MAKE) $(AM_MAKEFLAGS) clean + @cd src/mod && $(MAKE) $(AM_MAKEFLAGS) clean modwipe: rm -f $(PREFIX)/mod/*.${DYNAMIC_LIB_EXTEN}

1 0

[commit] r4638 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by Freeswitch SVN 18 Mar '07

18 Mar '07

Author: brian Date: Sun Mar 18 03:04:40 2007 New Revision: 4638 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c Log: format string Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c Sun Mar 18 03:04:40 2007 @@ -4583,7 +4583,7 @@ if (sip->sip_max_forwards) { char max_forwards[32]; - snprintf(max_forwards, sizeof(max_forwards), "%u", sip->sip_max_forwards->mf_count); + snprintf(max_forwards, sizeof(max_forwards), "%lu", sip->sip_max_forwards->mf_count); switch_channel_set_variable(channel, SWITCH_MAX_FORWARDS_VARIABLE, max_forwards); }

1 0

[commit] r4637 - in freeswitch/trunk: . build src/mod
by Freeswitch SVN 18 Mar '07

18 Mar '07

Author: mikej Date: Sun Mar 18 02:48:26 2007 New Revision: 4637 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 build even quieter (at least on gmake)... export VERBOSE=yes if you think it's TOO quiet. Modified: freeswitch/trunk/Makefile.am ============================================================================== --- freeswitch/trunk/Makefile.am (original) +++ freeswitch/trunk/Makefile.am Sun Mar 18 02:48:26 2007 @@ -13,6 +13,7 @@ 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"> /dev/null && echo -s;fi` if CRASHPROT AM_CFLAGS += -DCRASH_PROT @@ -188,20 +189,20 @@ wayclean: clean modules: libfreeswitch.la - @cd src/mod && $(MAKE) + @cd src/mod && $(MAKE) $(AM_MAKEFLAGS) install_mod: libfreeswitch.la - @cd src/mod && $(MAKE) install + @cd src/mod && $(MAKE) $(AM_MAKEFLAGS) install mod_install: install_mod uninstall_mod: - @cd src/mod && $(MAKE) uninstall + @cd src/mod && $(MAKE) $(AM_MAKEFLAGS) uninstall mod_uninstall: uninstall_mod modclean: - @cd src/mod && $(MAKE) clean + cd src/mod && $(MAKE) $(AM_MAKEFLAGS) 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 02:48:26 2007 @@ -300,6 +300,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"> /dev/null && echo -s;fi` libfreeswitch_la_SOURCES = \ src/switch_apr.c \ src/switch_buffer.c \ @@ -1177,20 +1178,20 @@ wayclean: clean modules: libfreeswitch.la - @cd src/mod && $(MAKE) + @cd src/mod && $(MAKE) $(AM_MAKEFLAGS) install_mod: libfreeswitch.la - @cd src/mod && $(MAKE) install + @cd src/mod && $(MAKE) $(AM_MAKEFLAGS) install mod_install: install_mod uninstall_mod: - @cd src/mod && $(MAKE) uninstall + @cd src/mod && $(MAKE) $(AM_MAKEFLAGS) uninstall mod_uninstall: uninstall_mod modclean: - @cd src/mod && $(MAKE) clean + cd src/mod && $(MAKE) $(AM_MAKEFLAGS) 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 02:48:26 2007 @@ -48,6 +48,7 @@ CXXSOURCEFILE=$(MODNAME).cpp TOUCH_TARGET=if test -f "$@" ; then touch "$@" ; fi ; +MAKE_OPTS = `if test -z "$(VERBOSE)" ; then $(MAKE) --help | grep silent | grep "\-s"> /dev/null && echo -s;fi` 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` @@ -59,7 +60,7 @@ ourdefs="$(RECURSE_OUR_DEPS)" ; \ ourcflags="$(RECURSE_OUR_CFLAGS)" ; \ ourldflags="$(RECURSE_OUR_LDFLAGS)" ; \ - $(MAKE) MODNAME="$$modname" SOURCEFILE="$$sourcefile" OUR_DEPS="$$ourdefs" OUR_CFLAGS="$$ourcflags" OUR_LDFLAGS="$$ourldflags" + $(MAKE) $(MAKE_OPTS) MODNAME="$$modname" SOURCEFILE="$$sourcefile" OUR_DEPS="$$ourdefs" OUR_CFLAGS="$$ourcflags" OUR_LDFLAGS="$$ourldflags" all: Makefile @$(RECURSE_MAKE) all-modules || exit 1 Modified: freeswitch/trunk/src/mod/Makefile.am ============================================================================== --- freeswitch/trunk/src/mod/Makefile.am (original) +++ freeswitch/trunk/src/mod/Makefile.am Sun Mar 18 02:48:26 2007 @@ -6,6 +6,7 @@ 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"> /dev/null && echo -s;fi` all: @$(CONF_MODULES) \ @@ -17,8 +18,8 @@ echo making $$i ; \ moddir=$(MOD_DIR); \ if test -f $$moddir/Makefile ; then \ - cd $$moddir && MODNAME=$(MOD_NAME) BASE=$(switch_builddir) $(MAKE) || exit 1; else \ - cd $$moddir && MODNAME=$(MOD_NAME) BASE=$(switch_builddir) $(MAKE) -f $(switch_builddir)/build/modmake.rules || exit 1; \ + cd $$moddir && MODNAME=$(MOD_NAME) BASE=$(switch_builddir) $(MAKE) $(AM_MAKEFLAGS) || exit 1; else \ + cd $$moddir && MODNAME=$(MOD_NAME) BASE=$(switch_builddir) $(MAKE) $(AM_MAKEFLAGS) -f $(switch_builddir)/build/modmake.rules || exit 1; \ fi; \ done @echo @@ -35,8 +36,8 @@ echo making clean $$i ; \ moddir=$(MOD_DIR); \ if test -f $$moddir/Makefile ; then \ - cd $$moddir && MODNAME=$(MOD_NAME) BASE=$(switch_builddir) $(MAKE) clean || exit 1; else \ - cd $$moddir && MODNAME=$(MOD_NAME) BASE=$(switch_builddir) $(MAKE) -f $(switch_builddir)/build/modmake.rules clean || exit 1; \ + cd $$moddir && MODNAME=$(MOD_NAME) BASE=$(switch_builddir) $(MAKE) $(AM_MAKEFLAGS) clean || exit 1; else \ + cd $$moddir && MODNAME=$(MOD_NAME) BASE=$(switch_builddir) $(MAKE) $(AM_MAKEFLAGS) -f $(switch_builddir)/build/modmake.rules clean || exit 1; \ fi; \ done @echo @@ -52,8 +53,8 @@ echo making install $$i ; \ moddir=$(MOD_DIR); \ if test -f $$moddir/Makefile ; then \ - cd $$moddir && MODNAME=$(MOD_NAME) BASE=$(switch_builddir) $(MAKE) install || exit 1; else \ - cd $$moddir && MODNAME=$(MOD_NAME) BASE=$(switch_builddir) $(MAKE) -f $(switch_builddir)/build/modmake.rules install || exit 1; \ + cd $$moddir && MODNAME=$(MOD_NAME) BASE=$(switch_builddir) $(MAKE) $(AM_MAKEFLAGS) install || exit 1; else \ + cd $$moddir && MODNAME=$(MOD_NAME) BASE=$(switch_builddir) $(MAKE) $(AM_MAKEFLAGS) -f $(switch_builddir)/build/modmake.rules install || exit 1; \ fi; \ done @echo @@ -69,8 +70,8 @@ echo making uninstall $$i ; \ moddir=$(MOD_DIR); \ if test -f $$moddir/Makefile ; then \ - cd $$moddir && MODNAME=$(MOD_NAME) BASE=$(switch_builddir) $(MAKE) uninstall || exit 1; else \ - cd $$moddir && MODNAME=$(MOD_NAME) BASE=$(switch_builddir) $(MAKE) -f $(switch_builddir)/build/modmake.rules uninstall || exit 1; \ + cd $$moddir && MODNAME=$(MOD_NAME) BASE=$(switch_builddir) $(MAKE) $(AM_MAKEFLAGS) uninstall || exit 1; else \ + cd $$moddir && MODNAME=$(MOD_NAME) BASE=$(switch_builddir) $(MAKE) $(AM_MAKEFLAGS) -f $(switch_builddir)/build/modmake.rules uninstall || exit 1; \ fi; \ done @echo Modified: freeswitch/trunk/src/mod/Makefile.in ============================================================================== --- freeswitch/trunk/src/mod/Makefile.in (original) +++ freeswitch/trunk/src/mod/Makefile.in Sun Mar 18 02:48:26 2007 @@ -201,6 +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"> /dev/null && echo -s;fi` all: all-am .SUFFIXES: @@ -368,8 +369,8 @@ echo making $$i ; \ moddir=$(MOD_DIR); \ if test -f $$moddir/Makefile ; then \ - cd $$moddir && MODNAME=$(MOD_NAME) BASE=$(switch_builddir) $(MAKE) || exit 1; else \ - cd $$moddir && MODNAME=$(MOD_NAME) BASE=$(switch_builddir) $(MAKE) -f $(switch_builddir)/build/modmake.rules || exit 1; \ + cd $$moddir && MODNAME=$(MOD_NAME) BASE=$(switch_builddir) $(MAKE) $(AM_MAKEFLAGS) || exit 1; else \ + cd $$moddir && MODNAME=$(MOD_NAME) BASE=$(switch_builddir) $(MAKE) $(AM_MAKEFLAGS) -f $(switch_builddir)/build/modmake.rules || exit 1; \ fi; \ done @echo @@ -386,8 +387,8 @@ echo making clean $$i ; \ moddir=$(MOD_DIR); \ if test -f $$moddir/Makefile ; then \ - cd $$moddir && MODNAME=$(MOD_NAME) BASE=$(switch_builddir) $(MAKE) clean || exit 1; else \ - cd $$moddir && MODNAME=$(MOD_NAME) BASE=$(switch_builddir) $(MAKE) -f $(switch_builddir)/build/modmake.rules clean || exit 1; \ + cd $$moddir && MODNAME=$(MOD_NAME) BASE=$(switch_builddir) $(MAKE) $(AM_MAKEFLAGS) clean || exit 1; else \ + cd $$moddir && MODNAME=$(MOD_NAME) BASE=$(switch_builddir) $(MAKE) $(AM_MAKEFLAGS) -f $(switch_builddir)/build/modmake.rules clean || exit 1; \ fi; \ done @echo @@ -403,8 +404,8 @@ echo making install $$i ; \ moddir=$(MOD_DIR); \ if test -f $$moddir/Makefile ; then \ - cd $$moddir && MODNAME=$(MOD_NAME) BASE=$(switch_builddir) $(MAKE) install || exit 1; else \ - cd $$moddir && MODNAME=$(MOD_NAME) BASE=$(switch_builddir) $(MAKE) -f $(switch_builddir)/build/modmake.rules install || exit 1; \ + cd $$moddir && MODNAME=$(MOD_NAME) BASE=$(switch_builddir) $(MAKE) $(AM_MAKEFLAGS) install || exit 1; else \ + cd $$moddir && MODNAME=$(MOD_NAME) BASE=$(switch_builddir) $(MAKE) $(AM_MAKEFLAGS) -f $(switch_builddir)/build/modmake.rules install || exit 1; \ fi; \ done @echo @@ -420,8 +421,8 @@ echo making uninstall $$i ; \ moddir=$(MOD_DIR); \ if test -f $$moddir/Makefile ; then \ - cd $$moddir && MODNAME=$(MOD_NAME) BASE=$(switch_builddir) $(MAKE) uninstall || exit 1; else \ - cd $$moddir && MODNAME=$(MOD_NAME) BASE=$(switch_builddir) $(MAKE) -f $(switch_builddir)/build/modmake.rules uninstall || exit 1; \ + cd $$moddir && MODNAME=$(MOD_NAME) BASE=$(switch_builddir) $(MAKE) $(AM_MAKEFLAGS) uninstall || exit 1; else \ + cd $$moddir && MODNAME=$(MOD_NAME) BASE=$(switch_builddir) $(MAKE) $(AM_MAKEFLAGS) -f $(switch_builddir)/build/modmake.rules uninstall || exit 1; \ fi; \ done @echo

1 0

[commit] r4636 - in freeswitch/trunk: . build src/mod
by Freeswitch SVN 18 Mar '07

18 Mar '07

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:

1 0