- Freeswitch-trunk - FreeSWITCH Mailing Lists

[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

[commit] r4635 - in freeswitch/trunk: build src/mod/asr_tts/mod_cepstral src/mod/endpoints/mod_portaudio src/mod/endpoints/mod_sofia
by Freeswitch SVN 18 Mar '07

18 Mar '07

Author: mikej Date: Sat Mar 17 21:52:23 2007 New Revision: 4635 Modified: freeswitch/trunk/build/modmake.rules.in freeswitch/trunk/src/mod/asr_tts/mod_cepstral/Makefile freeswitch/trunk/src/mod/endpoints/mod_portaudio/Makefile freeswitch/trunk/src/mod/endpoints/mod_sofia/Makefile Log: remove gmakeisms from sofia, portaudio and cepstral makefiles. simplify the module template makefiles Modified: freeswitch/trunk/build/modmake.rules.in ============================================================================== --- freeswitch/trunk/build/modmake.rules.in (original) +++ freeswitch/trunk/build/modmake.rules.in Sat Mar 17 21:52:23 2007 @@ -53,42 +53,28 @@ RECURSE_OUR_DEPS=`test -z "$(WANT_CURL)" || if test ! -z "$(LIBCURL_DEPS)"; then echo $(CURLLA); fi` RECURSE_OUR_CFLAGS=`test -z "$(WANT_CURL)" || echo $(LIBCURL_CPPFLAGS) ; $(LOCAL_INSERT_CFLAGS) ` RECURSE_OUR_LDFLAGS=`test -z "$(WANT_CURL)" || echo $(LIBCURL) ; $(LOCAL_INSERT_LDFLAGS) ` -RECURSE_CHECKS=if test -z "$(MODNAME)" || test -z "$(SOURCEFILE)" || test -z "$(OUR_DEPS)" ; \ - then modname=$(RECURSE_MODNAME) ; \ - sourcefile=$(RECURSE_SOURCEFILE) ; \ - ourdefs=$(RECURSE_OUR_DEPS) ; \ - ourcflags=$(RECURSE_OUR_CFLAGS) ; \ - ourldflags=$(RECURSE_OUR_LDFLAGS) ; +RECURSE_MAKE=modname="$(RECURSE_MODNAME)" ; \ + sourcefile="$(RECURSE_SOURCEFILE)" ; \ + osarch=`uname -s` ; \ + 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" all: Makefile - @$(RECURSE_CHECKS) \ - $(MAKE) MODNAME=$$modname SOURCEFILE=$$sourcefile OUR_DEPS=$$ourdefs OUR_CFLAGS=$$ourcflags OUR_LDFLAGS=$$our_ldflags all-modules || exit 1;\ - fi + @$(RECURSE_MAKE) all-modules || exit 1 depend: Makefile - @$(RECURSE_CHECKS) \ - $(MAKE) MODNAME=$$modname SOURCEFILE=$$sourcefile OUR_DEPS=$$ourdefs OUR_CFLAGS=$$ourcflags OUR_LDFLAGS=$$our_ldflags depend-modules || exit 1;\ - fi + @$(RECURSE_MAKE) depend-modules || exit 1 clean: Makefile - @$(RECURSE_CHECKS) \ - $(MAKE) MODNAME=$$modname SOURCEFILE=$$sourcefile OUR_DEPS=$$ourdefs OUR_CFLAGS=$$ourcflags OUR_LDFLAGS=$$our_ldflags clean-modules || exit 1;\ - fi + @$(RECURSE_MAKE) clean-modules || exit 1 install: Makefile - @$(RECURSE_CHECKS) \ - $(MAKE) MODNAME=$$modname SOURCEFILE=$$sourcefile OUR_DEPS=$$ourdefs OUR_CFLAGS=$$ourcflags OUR_LDFLAGS=$$our_ldflags install-modules || exit 1;\ - fi + @$(RECURSE_MAKE) install-modules || exit 1 uninstall: Makefile - @$(RECURSE_CHECKS) \ - $(MAKE) MODNAME=$$modname SOURCEFILE=$$sourcefile OUR_DEPS=$$ourdefs OUR_CFLAGS=$$ourcflags OUR_LDFLAGS=$$our_ldflags uninstall-modules || exit 1;\ - fi + @$(RECURSE_MAKE) uninstall-modules || exit 1 distclean: Makefile - @$(RECURSE_CHECKS) \ - $(MAKE) MODNAME=$$modname SOURCEFILE=$$sourcefile OUR_DEPS=$$ourdefs OUR_CFLAGS=$$ourcflags OUR_LDFLAGS=$$our_ldflags distclean-modules || exit 1;\ - fi + @$(RECURSE_MAKE) distclean-modules || exit 1 extraclean: Makefile - @$(RECURSE_CHECKS) \ - $(MAKE) MODNAME=$$modname SOURCEFILE=$$sourcefile OUR_DEPS=$$ourdefs OUR_CFLAGS=$$ourcflags OUR_LDFLAGS=$$our_ldflags extraclean-modules || exit 1;\ - fi - + @$(RECURSE_MAKE) extraclean-modules || exit 1 all-modules: local_depend local_all $(MODNAME).$(DYNAMIC_LIB_EXTEN) Makefile depend-modules: local_depend Modified: freeswitch/trunk/src/mod/asr_tts/mod_cepstral/Makefile ============================================================================== --- freeswitch/trunk/src/mod/asr_tts/mod_cepstral/Makefile (original) +++ freeswitch/trunk/src/mod/asr_tts/mod_cepstral/Makefile Sat Mar 17 21:52:23 2007 @@ -1,15 +1,6 @@ -# define these targets in your makefile if you wish -# local_all local_depend local_clean depend_install local_install local_distclean local_extraclean: -OSARCH=$(shell uname -s) -# and define these variables to impact your build +LOCAL_INSERT_LDFLAGS=if test $$osarch = "Darwin" ; then echo "-framework swift" ; else echo "-L/opt/swift/lib -lswift -lceplex_us -lceplang_en -lm" ; fi ; +LOCAL_INSERT_CFLAGS=test $$osarch = "Darwin" || echo "-I/opt/swift/include"; -ifeq ($(OSARCH),Darwin) -LOCAL_LDFLAGS += -framework swift -else -LOCAL_LDFLAGS += -L/opt/swift/lib -lswift -lceplex_us -lceplang_en -lm -LOCAL_CFLAGS += -I/opt/swift/include -endif -LOCAL_OBJS= include ../../../../build/modmake.rules 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 Sat Mar 17 21:52:23 2007 @@ -1,14 +1,12 @@ BASE=../../../.. -OSARCH=$(shell uname -s) PA_DIR=$(BASE)/libs/portaudio PALA=$(PA_DIR)/lib/libportaudio.la LOCAL_CFLAGS=-I. -I$(PA_DIR)/include -LOCAL_LDFLAGS= -ifeq ($(OSARCH),Darwin) -LOCAL_LDFLAGS += -framework CoreAudio -framework AudioToolbox -framework AudioUnit -framework Carbon -endif + +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 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/Makefile ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/Makefile (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/Makefile Sat Mar 17 21:52:23 2007 @@ -1,7 +1,5 @@ BASE=../../../.. -OS_ARCH := $(subst /,_,$(shell uname -s | sed /\ /s//_/)) - SOFIA_DIR=$(BASE)/libs/sofia-sip SOFIAUA_DIR=$(SOFIA_DIR)/libsofia-sip-ua @@ -19,9 +17,7 @@ LOCAL_LIBADD=$(SOFIALA) -ifeq ($(OS_ARCH),Darwin) - LOCAL_LDFLAGS +=-framework CoreFoundation -framework SystemConfiguration -endif +LOCAL_INSERT_LDFLAGS=if test $$osarch = "Darwin" ; then echo "-framework CoreFoundation -framework SystemConfiguration" ; fi ; include $(BASE)/build/modmake.rules

1 0

[commit] r4634 - in freeswitch/trunk: libs/libdingaling src/mod/endpoints/mod_dingaling
by Freeswitch SVN 17 Mar '07

17 Mar '07

Author: mikej Date: Sat Mar 17 18:21:27 2007 New Revision: 4634 Added: freeswitch/trunk/libs/libdingaling/configure.gnu Modified: freeswitch/trunk/libs/libdingaling/Makefile.am freeswitch/trunk/libs/libdingaling/Makefile.in freeswitch/trunk/src/mod/endpoints/mod_dingaling/Makefile Log: make libdingaling static and have it properly handle building it's own deps. Use in tree static apr, apr-utils, iksemel with libdingaling Modified: freeswitch/trunk/libs/libdingaling/Makefile.am ============================================================================== --- freeswitch/trunk/libs/libdingaling/Makefile.am (original) +++ freeswitch/trunk/libs/libdingaling/Makefile.am Sat Mar 17 18:21:27 2007 @@ -1,32 +1,39 @@ EXTRA_DIST = SUBDIRS = -AUTOMAKE_OPTS= gnu +AUTOMAKE_OPTS=foreign NAME=dingaling PREFIX=$(prefix) +TOUCH_TARGET=@if test -f "$@" ; then touch "$@" ; fi ; AM_CFLAGS = $(new_AM_CFLAGS) -I./src -I$(prefix)/include AM_CPPFLAGS = $(AM_CFLAGS) AM_LDFLAGS = $(new_AM_LDFLAGS) -APR_CONFIG= $(shell which ../apr/apr-1-config || which $(prefix)/bin/apr-1-config ) -APU_CONFIG= $(shell which ../apr-util/apu-1-config || which $(prefix)/bin/apu-1-config) -AM_CFLAGS += -I$(PREFIX)/include $(shell $(APR_CONFIG) --cflags --cppflags --includes) -AM_LDFLAGS += -L$(PREFIX)/lib -AM_LDFLAGS += $(shell $(APR_CONFIG) --link-ld --libs ) -AM_CFLAGS += $(shell $(APU_CONFIG) --includes) -AM_LDFLAGS += $(shell $(APU_CONFIG) --link-ld --libs ) +AM_CFLAGS += `../apr/apr-1-config --cflags --cppflags --includes || $(prefix)/bin/apr-1-config --cflags --cppflags --includes` +AM_CFLAGS += `../apr-util/apu-1-config --includes || $(prefix)/bin/apu-1-config --includes` AM_CFLAGS += -I../iksemel/include - lib_LTLIBRARIES = libdingaling.la libdingaling_la_SOURCES = src/libdingaling.c src/sha1.c libdingaling_la_CFLAGS = $(AM_CFLAGS) -libdingaling_la_LDFLAGS = -libdingaling_la_LIBADD = ../iksemel/src/libiksemel.la +libdingaling_la_LDFLAGS = $(AM_LDFLAGS) +libdingaling_la_LIBADD = ../iksemel/src/libiksemel.la ../apr/libapr-1.la ../apr-util/libaprutil-1.la library_includedir = $(prefix)/include library_include_HEADERS = src/libdingaling.h +$(libdingaling_la_SOURCES): $(libdingaling_la_LIBADD) +../apr/libapr-1.la: ../apr ../apr/.update + cd ../apr && $(MAKE) + $(TOUCH_TARGET) + +../apr-util/libaprutil-1.la: ../apr-util ../apr-util/.update + cd ../apr-util && $(MAKE) + $(TOUCH_TARGET) + +../iksemel/src/libiksemel.la: ../iksemel ../iksemel/.update + cd ../iksemel && $(MAKE) + $(TOUCH_TARGET) dox: cd docs && doxygen $(PWD)/docs/Doxygen.conf Modified: freeswitch/trunk/libs/libdingaling/Makefile.in ============================================================================== --- freeswitch/trunk/libs/libdingaling/Makefile.in (original) +++ freeswitch/trunk/libs/libdingaling/Makefile.in Sat Mar 17 18:21:27 2007 @@ -74,7 +74,8 @@ "$(DESTDIR)$(library_includedir)" libLTLIBRARIES_INSTALL = $(INSTALL) LTLIBRARIES = $(lib_LTLIBRARIES) -libdingaling_la_DEPENDENCIES = ../iksemel/src/libiksemel.la +libdingaling_la_DEPENDENCIES = ../iksemel/src/libiksemel.la \ + ../apr/libapr-1.la ../apr-util/libaprutil-1.la am_libdingaling_la_OBJECTS = libdingaling_la-libdingaling.lo \ libdingaling_la-sha1.lo libdingaling_la_OBJECTS = $(am_libdingaling_la_OBJECTS) @@ -218,23 +219,22 @@ target_alias = @target_alias@ EXTRA_DIST = SUBDIRS = -AUTOMAKE_OPTS = gnu +AUTOMAKE_OPTS = foreign NAME = dingaling PREFIX = $(prefix) +TOUCH_TARGET = @if test -f "$@" ; then touch "$@" ; fi ; AM_CFLAGS = $(new_AM_CFLAGS) -I./src -I$(prefix)/include \ - -I$(PREFIX)/include $(shell $(APR_CONFIG) --cflags --cppflags \ - --includes) $(shell $(APU_CONFIG) --includes) \ - -I../iksemel/include + `../apr/apr-1-config --cflags --cppflags --includes || \ + $(prefix)/bin/apr-1-config --cflags --cppflags --includes` \ + `../apr-util/apu-1-config --includes || \ + $(prefix)/bin/apu-1-config --includes` -I../iksemel/include AM_CPPFLAGS = $(AM_CFLAGS) -AM_LDFLAGS = $(new_AM_LDFLAGS) -L$(PREFIX)/lib $(shell $(APR_CONFIG) \ - --link-ld --libs ) $(shell $(APU_CONFIG) --link-ld --libs ) -APR_CONFIG = $(shell which ../apr/apr-1-config || which $(prefix)/bin/apr-1-config ) -APU_CONFIG = $(shell which ../apr-util/apu-1-config || which $(prefix)/bin/apu-1-config) +AM_LDFLAGS = $(new_AM_LDFLAGS) lib_LTLIBRARIES = libdingaling.la libdingaling_la_SOURCES = src/libdingaling.c src/sha1.c libdingaling_la_CFLAGS = $(AM_CFLAGS) -libdingaling_la_LDFLAGS = -libdingaling_la_LIBADD = ../iksemel/src/libiksemel.la +libdingaling_la_LDFLAGS = $(AM_LDFLAGS) +libdingaling_la_LIBADD = ../iksemel/src/libiksemel.la ../apr/libapr-1.la ../apr-util/libaprutil-1.la library_includedir = $(prefix)/include library_include_HEADERS = src/libdingaling.h all: all-recursive @@ -763,6 +763,20 @@ uninstall-library_includeHEADERS +$(libdingaling_la_SOURCES): $(libdingaling_la_LIBADD) + +../apr/libapr-1.la: ../apr ../apr/.update + cd ../apr && $(MAKE) + $(TOUCH_TARGET) + +../apr-util/libaprutil-1.la: ../apr-util ../apr-util/.update + cd ../apr-util && $(MAKE) + $(TOUCH_TARGET) + +../iksemel/src/libiksemel.la: ../iksemel ../iksemel/.update + cd ../iksemel && $(MAKE) + $(TOUCH_TARGET) + dox: cd docs && doxygen $(PWD)/docs/Doxygen.conf Added: freeswitch/trunk/libs/libdingaling/configure.gnu ============================================================================== --- (empty file) +++ freeswitch/trunk/libs/libdingaling/configure.gnu Sat Mar 17 18:21:27 2007 @@ -0,0 +1,3 @@ +#! /bin/sh +./configure "$@" --disable-shared + Modified: freeswitch/trunk/src/mod/endpoints/mod_dingaling/Makefile ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_dingaling/Makefile (original) +++ freeswitch/trunk/src/mod/endpoints/mod_dingaling/Makefile Sat Mar 17 18:21:27 2007 @@ -1,8 +1,6 @@ BASE=../../../.. -IKSEMEL_DIR=$(BASE)/libs/iksemel DING_DIR=$(BASE)/libs/libdingaling -IKSEMELLA=$(IKSEMEL_DIR)/src/libiksemel.la DINGLA=$(DING_DIR)/libdingaling.la LOCAL_CFLAGS=-I$(DING_DIR)/src @@ -10,18 +8,6 @@ include $(BASE)/build/modmake.rules -INST_DINGLA=$(PREFIX)/lib/libdingaling.la - -$(IKSEMELLA): $(IKSEMEL_DIR) $(IKSEMEL_DIR)/.update - cd $(IKSEMEL_DIR) && $(MAKE) - $(TOUCH_TARGET) - -$(DINGLA): $(IKSEMELLA) $(DING_DIR) $(DING_DIR)/.update +$(DINGLA): $(DING_DIR) $(DING_DIR)/.update cd $(DING_DIR) && $(MAKE) $(TOUCH_TARGET) - -depend_install: $(INST_DINGLA) - -$(INST_DINGLA): $(DINGLA) - cd $(DING_DIR) && $(MAKE) install -

1 0

[commit] r4633 - freeswitch/trunk/src/mod/xml_int/mod_xml_rpc
by Freeswitch SVN 17 Mar '07

17 Mar '07

Author: mikej Date: Sat Mar 17 16:12:13 2007 New Revision: 4633 Modified: freeswitch/trunk/src/mod/xml_int/mod_xml_rpc/mod_xml_rpc.c Log: catch up with changed name Modified: freeswitch/trunk/src/mod/xml_int/mod_xml_rpc/mod_xml_rpc.c ============================================================================== --- freeswitch/trunk/src/mod/xml_int/mod_xml_rpc/mod_xml_rpc.c (original) +++ freeswitch/trunk/src/mod/xml_int/mod_xml_rpc/mod_xml_rpc.c Sat Mar 17 16:12:13 2007 @@ -230,8 +230,8 @@ return NULL; } - if (!strncasecmp(oid, FREESWITCH_MIB, strlen(FREESWITCH_MIB))) { - relative_oid = oid + strlen(FREESWITCH_MIB); + if (!strncasecmp(oid, FREESWITCH_OID_PREFIX, strlen(FREESWITCH_OID_PREFIX))) { + relative_oid = oid + strlen(FREESWITCH_OID_PREFIX); } else { relative_oid = oid; }

1 0

[commit] r4632 - in freeswitch/trunk/src: . include mod/applications/mod_commands
by Freeswitch SVN 17 Mar '07

17 Mar '07

Author: anthm Date: Sat Mar 17 15:51:08 2007 New Revision: 4632 Modified: freeswitch/trunk/src/include/switch.h freeswitch/trunk/src/include/switch_loadable_module.h freeswitch/trunk/src/include/switch_types.h freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c freeswitch/trunk/src/switch_loadable_module.c Log: update Modified: freeswitch/trunk/src/include/switch.h ============================================================================== --- freeswitch/trunk/src/include/switch.h (original) +++ freeswitch/trunk/src/include/switch.h Sat Mar 17 15:51:08 2007 @@ -48,7 +48,7 @@ #endif #define FREESWITCH_PEN "27880" -#define FREESWITCH_MIB ".1.3.6.1.4.1." FREESWITCH_PEN +#define FREESWITCH_OID_PREFIX ".1.3.6.1.4.1." FREESWITCH_PEN #define FREESWITCH_ITAD "543" Modified: freeswitch/trunk/src/include/switch_loadable_module.h ============================================================================== --- freeswitch/trunk/src/include/switch_loadable_module.h (original) +++ freeswitch/trunk/src/include/switch_loadable_module.h Sat Mar 17 15:51:08 2007 @@ -240,7 +240,7 @@ \param fname the file name of the module \return the status */ -SWITCH_DECLARE(switch_status_t) switch_loadable_module_load_module(char *dir, char *fname); +SWITCH_DECLARE(switch_status_t) switch_loadable_module_load_module(char *dir, char *fname, switch_bool_t runtime); /* Prototypes of module interface functions */ Modified: freeswitch/trunk/src/include/switch_types.h ============================================================================== --- freeswitch/trunk/src/include/switch_types.h (original) +++ freeswitch/trunk/src/include/switch_types.h Sat Mar 17 15:51:08 2007 @@ -129,6 +129,11 @@ typedef uint8_t switch_byte_t; typedef enum { + SWITCH_FALSE = 0, + SWITCH_TRUE = 1 +} switch_bool_t; + +typedef enum { SSM_NA, SSM_PRONOUNCED, SSM_ITERATED, Modified: freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c (original) +++ freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c Sat Mar 17 15:51:08 2007 @@ -158,8 +158,11 @@ return SWITCH_STATUS_SUCCESS; } - switch_loadable_module_load_module((char *) SWITCH_GLOBAL_dirs.mod_dir, (char *) mod); - stream->write_function(stream, "OK\n"); + if (switch_loadable_module_load_module((char *) SWITCH_GLOBAL_dirs.mod_dir, (char *) mod, SWITCH_TRUE) == SWITCH_STATUS_SUCCESS) { + stream->write_function(stream, "OK\n"); + } else { + stream->write_function(stream, "ERROR\n"); + } return SWITCH_STATUS_SUCCESS; } Modified: freeswitch/trunk/src/switch_loadable_module.c ============================================================================== --- freeswitch/trunk/src/switch_loadable_module.c (original) +++ freeswitch/trunk/src/switch_loadable_module.c Sat Mar 17 15:51:08 2007 @@ -96,8 +96,22 @@ } +static void switch_loadable_module_runtime(void) +{ + switch_hash_index_t *hi; + void *val; + switch_loadable_module_t *module; - + for (hi = switch_hash_first(loadable_modules.pool, loadable_modules.module_hash); hi; hi = switch_hash_next(hi)) { + switch_hash_this(hi, NULL, NULL, &val); + module = (switch_loadable_module_t *) val; + + if (module->switch_module_runtime) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CONSOLE, "Starting runtime thread for %s\n", module->module_interface->module_name); + switch_core_launch_thread(switch_loadable_module_exec, module, loadable_modules.pool); + } + } +} static switch_status_t switch_loadable_module_process(char *key, switch_loadable_module_t *new_module) { @@ -349,13 +363,20 @@ if (!ptr->relative_oid) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Failed to load management interface from %s due to no interface name.\n", key); } else { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "Adding Management interface '%s'\n", ptr->relative_oid); - if (switch_event_create(&event, SWITCH_EVENT_MODULE_LOAD) == SWITCH_STATUS_SUCCESS) { - switch_event_add_header(event, SWITCH_STACK_BOTTOM, "type", "management"); - switch_event_add_header(event, SWITCH_STACK_BOTTOM, "name", "%s", ptr->relative_oid); - switch_event_fire(&event); + if (switch_core_hash_find(loadable_modules.management_hash, ptr->relative_oid)) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, + "Failed to load management interface %s. OID %s already exists\n", key, ptr->relative_oid); + } else { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, + "Adding Management interface '%s' OID[%s.%s]\n", key, FREESWITCH_OID_PREFIX, ptr->relative_oid); + switch_core_hash_insert(loadable_modules.management_hash, ptr->relative_oid, (const void *) ptr); + if (switch_event_create(&event, SWITCH_EVENT_MODULE_LOAD) == SWITCH_STATUS_SUCCESS) { + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "type", "management"); + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "name", "%s", ptr->relative_oid); + switch_event_fire(&event); + } } - switch_core_hash_insert(loadable_modules.management_hash, ptr->relative_oid, (const void *) ptr); + } } } @@ -429,10 +450,6 @@ module->lib = dso; - if (module->switch_module_runtime) { - switch_core_launch_thread(switch_loadable_module_exec, module, loadable_modules.pool); - } - *new_module = module; switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CONSOLE, "Successfully Loaded [%s]\n", module_interface->module_name); @@ -440,7 +457,7 @@ } -SWITCH_DECLARE(switch_status_t) switch_loadable_module_load_module(char *dir, char *fname) +SWITCH_DECLARE(switch_status_t) switch_loadable_module_load_module(char *dir, char *fname, switch_bool_t runtime) { switch_size_t len = 0; char *path; @@ -485,10 +502,15 @@ } if ((status = switch_loadable_module_load_file(path, &new_module) == SWITCH_STATUS_SUCCESS)) { - return switch_loadable_module_process((char *) file, new_module); - } else { - return status; + if ((status = switch_loadable_module_process((char *) file, new_module)) == SWITCH_STATUS_SUCCESS && runtime) { + if (new_module->switch_module_runtime) { + switch_core_launch_thread(switch_loadable_module_exec, new_module, loadable_modules.pool); + } + } } + + return status; + } SWITCH_DECLARE(switch_status_t) switch_loadable_module_build_dynamic(char *filename, @@ -625,7 +647,7 @@ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CONSOLE, "Invalid extension for %s\n", val); continue; } - switch_loadable_module_load_module((char *) SWITCH_GLOBAL_dirs.mod_dir, (char *) val); + switch_loadable_module_load_module((char *) SWITCH_GLOBAL_dirs.mod_dir, (char *) val, SWITCH_FALSE); count++; } } @@ -645,7 +667,7 @@ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CONSOLE, "Invalid extension for %s\n", val); continue; } - switch_loadable_module_load_module((char *) SWITCH_GLOBAL_dirs.mod_dir, (char *) val); + switch_loadable_module_load_module((char *) SWITCH_GLOBAL_dirs.mod_dir, (char *) val, SWITCH_FALSE); count++; } } @@ -685,11 +707,12 @@ continue; } - switch_loadable_module_load_module((char *) SWITCH_GLOBAL_dirs.mod_dir, (char *) fname); + switch_loadable_module_load_module((char *) SWITCH_GLOBAL_dirs.mod_dir, (char *) fname, SWITCH_FALSE); } apr_dir_close(module_dir_handle); } + switch_loadable_module_runtime(); return SWITCH_STATUS_SUCCESS; }

1 0

[commit] r4631 - freeswitch/trunk
by Freeswitch SVN 17 Mar '07

17 Mar '07

Author: mikej Date: Sat Mar 17 15:02:26 2007 New Revision: 4631 Modified: freeswitch/trunk/Makefile.am freeswitch/trunk/Makefile.in Log: build fix Modified: freeswitch/trunk/Makefile.am ============================================================================== --- freeswitch/trunk/Makefile.am (original) +++ freeswitch/trunk/Makefile.am Sat Mar 17 15:02:26 2007 @@ -97,6 +97,8 @@ freeswitch_CFLAGS = $(AM_CFLAGS) freeswitch_LDADD = ${MOD_LINK} +$(libfreeswitch_la_SOURCES): $(CORE_LIBS) + install-data-local: @echo Installing $(NAME) @for x in conf mod db log log/xml_cdr bin scripts htdocs grammar ; do \ Modified: freeswitch/trunk/Makefile.in ============================================================================== --- freeswitch/trunk/Makefile.in (original) +++ freeswitch/trunk/Makefile.in Sat Mar 17 15:02:26 2007 @@ -1086,6 +1086,8 @@ uninstall-libLTLIBRARIES uninstall-library_includeHEADERS +$(libfreeswitch_la_SOURCES): $(CORE_LIBS) + install-data-local: @echo Installing $(NAME) @for x in conf mod db log log/xml_cdr bin scripts htdocs grammar ; do \

1 0