- Freeswitch-svn - FreeSWITCH Mailing Lists

[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

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

17 Mar '07

Author: anthm Date: Sat Mar 17 11:06:33 2007 New Revision: 4630 Modified: freeswitch/trunk/src/switch_xml.c Log: improve reloadxml code to fix potential issue Modified: freeswitch/trunk/src/switch_xml.c ============================================================================== --- freeswitch/trunk/src/switch_xml.c (original) +++ freeswitch/trunk/src/switch_xml.c Sat Mar 17 11:06:33 2007 @@ -1083,37 +1083,40 @@ SWITCH_DECLARE(switch_xml_t) switch_xml_open_root(uint8_t reload, const char **err) { char path_buf[1024]; - uint8_t hasmain = 0; - + uint8_t hasmain = 0, errcnt = 0; + switch_xml_t new_main; + switch_mutex_lock(XML_LOCK); if (MAIN_XML_ROOT) { - switch_xml_t xml; hasmain++; if (!reload) { switch_mutex_unlock(XML_LOCK); return switch_xml_root(); } - xml = MAIN_XML_ROOT; - MAIN_XML_ROOT = NULL; switch_thread_rwlock_wrlock(RWLOCK); - switch_xml_free(xml); } snprintf(path_buf, sizeof(path_buf), "%s%s%s", SWITCH_GLOBAL_dirs.conf_dir, SWITCH_PATH_SEPARATOR, "freeswitch.xml"); - if ((MAIN_XML_ROOT = switch_xml_parse_file(path_buf))) { - *err = switch_xml_error(MAIN_XML_ROOT); + if ((new_main = switch_xml_parse_file(path_buf))) { + *err = switch_xml_error(new_main); if (!switch_strlen_zero(*err)) { - switch_xml_free(MAIN_XML_ROOT); - MAIN_XML_ROOT = NULL; + switch_xml_free(new_main); + new_main = NULL; + errcnt++; } else { + switch_xml_t old_root; *err = "Success"; + old_root = MAIN_XML_ROOT; + MAIN_XML_ROOT = new_main; switch_set_flag(MAIN_XML_ROOT, SWITCH_XML_ROOT); + switch_xml_free(old_root); } } else { *err = "Cannot Open log directory or XML Root!"; + errcnt++; } if (hasmain) { @@ -1121,7 +1124,7 @@ } switch_mutex_unlock(XML_LOCK); - return switch_xml_root(); + return errcnt == 0 ? switch_xml_root() : NULL; }

1 0

17 Mar '07

Author: mikej Date: Sat Mar 17 04:40:10 2007 New Revision: 4629 Modified: freeswitch/trunk/build/modmake.rules.in freeswitch/trunk/src/mod/applications/mod_enum/Makefile freeswitch/trunk/src/mod/codecs/mod_amr/Makefile freeswitch/trunk/src/mod/codecs/mod_g711/Makefile freeswitch/trunk/src/mod/codecs/mod_g722/Makefile freeswitch/trunk/src/mod/codecs/mod_g723_1/Makefile freeswitch/trunk/src/mod/codecs/mod_g726/Makefile freeswitch/trunk/src/mod/codecs/mod_g729/Makefile freeswitch/trunk/src/mod/codecs/mod_gsm/Makefile freeswitch/trunk/src/mod/codecs/mod_ilbc/Makefile freeswitch/trunk/src/mod/codecs/mod_lpc10/Makefile freeswitch/trunk/src/mod/codecs/mod_speex/Makefile freeswitch/trunk/src/mod/directories/mod_ldap/Makefile freeswitch/trunk/src/mod/endpoints/mod_dingaling/Makefile freeswitch/trunk/src/mod/endpoints/mod_iax/Makefile freeswitch/trunk/src/mod/endpoints/mod_portaudio/Makefile freeswitch/trunk/src/mod/endpoints/mod_sofia/Makefile freeswitch/trunk/src/mod/endpoints/mod_wanpipe/Makefile freeswitch/trunk/src/mod/event_handlers/mod_xmpp_event/Makefile freeswitch/trunk/src/mod/event_handlers/mod_zeroconf/Makefile freeswitch/trunk/src/mod/formats/mod_shout/Makefile freeswitch/trunk/src/mod/formats/mod_sndfile/Makefile freeswitch/trunk/src/mod/languages/mod_spidermonkey/Makefile freeswitch/trunk/src/mod/languages/mod_spidermonkey/sm.mak freeswitch/trunk/src/mod/languages/mod_spidermonkey_core_db/Makefile freeswitch/trunk/src/mod/languages/mod_spidermonkey_etpan/Makefile freeswitch/trunk/src/mod/languages/mod_spidermonkey_odbc/Makefile freeswitch/trunk/src/mod/languages/mod_spidermonkey_teletone/Makefile freeswitch/trunk/src/mod/xml_int/mod_xml_curl/Makefile freeswitch/trunk/src/mod/xml_int/mod_xml_rpc/Makefile Log: Do a better job at tracking dependencies into the libs, so libs are re-built when they need to. Eliminate some more gmakeisms in the modules makefiles Modified: freeswitch/trunk/build/modmake.rules.in ============================================================================== --- freeswitch/trunk/build/modmake.rules.in (original) +++ freeswitch/trunk/build/modmake.rules.in Sat Mar 17 04:40:10 2007 @@ -46,12 +46,13 @@ CSOURCEFILE=$(MODNAME).c CXXSOURCEFILE=$(MODNAME).cpp +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` 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)` -RECURSE_OUR_LDFLAGS=`test -z "$(WANT_CURL)" || echo $(LIBCURL)` +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) ; \ @@ -92,9 +93,9 @@ all-modules: local_depend local_all $(MODNAME).$(DYNAMIC_LIB_EXTEN) Makefile depend-modules: local_depend clean-modules: local_clean mod_clean -install-modules: all depend_install local_install mod_install +install-modules: all-modules depend_install local_install mod_install uninstall-modules: local_uninstall mod_uninstall -distclean-modules: clean local_distclean +distclean-modules: clean-modules local_distclean extraclean-modules: distclean local_extraclean Makefile: Modified: freeswitch/trunk/src/mod/applications/mod_enum/Makefile ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_enum/Makefile (original) +++ freeswitch/trunk/src/mod/applications/mod_enum/Makefile Sat Mar 17 04:40:10 2007 @@ -1,11 +1,11 @@ - BASE=../../../.. -UDNSA=$(BASE)/libs/udns/libudns.a -LOCAL_CFLAGS=-I$(BASE)/libs/udns +UDNS_DIR=$(BASE)/libs/udns +UDNSA=$(UDNS_DIR)/libudns.a +LOCAL_CFLAGS=-I$(UDNS_DIR) LOCAL_LIBADD=$(UDNSA) include $(BASE)/build/modmake.rules -$(UDNSA): - cd $(BASE)/libs/udns && $(MAKE) staticlib - +$(UDNSA): $(UDNS_DIR) $(UDNS_DIR)/.update + cd $(UDNS_DIR) && $(MAKE) staticlib + $(TOUCH_TARGET) Modified: freeswitch/trunk/src/mod/codecs/mod_amr/Makefile ============================================================================== --- freeswitch/trunk/src/mod/codecs/mod_amr/Makefile (original) +++ freeswitch/trunk/src/mod/codecs/mod_amr/Makefile Sat Mar 17 04:40:10 2007 @@ -1,16 +1,6 @@ - BASE=../../../.. -topdir=$(shell cd $(BASE) && pwd) -ifeq ($(shell test -d $(topdir)/libs/amr && cd $(topdir)/libs/amr && pwd),$(topdir)/libs/amr) - -LOCAL_CFLAGS = -I$(PREFIX)/include/amr -LOCAL_LDFLAGS =-lamr - -else - -LOCAL_CFLAGS = -DAMR_PASSTHROUGH - -endif +LOCAL_INSERT_CFLAGS=if test -d $(BASE)/libs/amr; then echo "-I$(PREFIX)/include/amr" ; else echo "-DAMR_PASSTHROUGH" ; fi ; +LOCAL_INSERT_LDFLAGS=test ! -d $(BASE)/libs/amp || echo "-lamr" include $(BASE)/build/modmake.rules Modified: freeswitch/trunk/src/mod/codecs/mod_g711/Makefile ============================================================================== --- freeswitch/trunk/src/mod/codecs/mod_g711/Makefile (original) +++ freeswitch/trunk/src/mod/codecs/mod_g711/Makefile Sat Mar 17 04:40:10 2007 @@ -1,11 +1,5 @@ -# define these targets in your makefile if you wish -# local_all local_depend local_clean depend_install local_install local_distclean local_extraclean: - -# and define these variables to impact your build - +BASE=../../../.. LOCAL_CFLAGS=-I$(BASE)/libs/codec/g7xx/src/include -LOCAL_LDFLAGS= -LOCAL_OBJS= -include ../../../../build/modmake.rules +include $(BASE)/build/modmake.rules Modified: freeswitch/trunk/src/mod/codecs/mod_g722/Makefile ============================================================================== --- freeswitch/trunk/src/mod/codecs/mod_g722/Makefile (original) +++ freeswitch/trunk/src/mod/codecs/mod_g722/Makefile Sat Mar 17 04:40:10 2007 @@ -1,10 +1,10 @@ - BASE=../../../.. -G7XXLA=$(BASE)/libs/codec/g7xx/libg7xx.la -LOCAL_CFLAGS=-I$(BASE)/libs/codec/g7xx/src/include/ +G7XX_DIR=$(BASE)/libs/codec/g7xx +G7XXLA=$(G7XX_DIR)/libg7xx.la +LOCAL_CFLAGS=-I$(G7XX_DIR)/src/include/ LOCAL_LIBADD=$(G7XXLA) include $(BASE)/build/modmake.rules -$(G7XXLA): - cd $(BASE)/libs/codec/g7xx && $(MAKE) - +$(G7XXLA): $(G7XX_DIR) $(G7XX_DIR)/.update + cd $(G7XX_DIR) && $(MAKE) + $(TOUCH_TARGET) Modified: freeswitch/trunk/src/mod/codecs/mod_g723_1/Makefile ============================================================================== --- freeswitch/trunk/src/mod/codecs/mod_g723_1/Makefile (original) +++ freeswitch/trunk/src/mod/codecs/mod_g723_1/Makefile Sat Mar 17 04:40:10 2007 @@ -1,10 +1,6 @@ - BASE=../../../.. -topdir=$(shell cd $(BASE) && pwd) -ifeq ($(shell test -d $(topdir)/libs/libg723_1 && cd $(topdir)/libs/libg723_1 && pwd),$(topdir)/libs/libg723_1) -LOCAL_CFLAGS += -I$(PREFIX)/include/g723 -LOCAL_LDFLAGS +=-lg723 -else -LOCAL_CFLAGS += -DG723_PASSTHROUGH -endif + +LOCAL_INSERT_CFLAGS=if test -d $(BASE)/libs/libg723_1; then echo "-I$(PREFIX)/include/g723" ; else echo "-DG723_PASSTHROUGH" ; fi ; +LOCAL_INSERT_LDFLAGS=test ! -d $(BASE)/libs/libg723_1 || echo "-lg723" + include $(BASE)/build/modmake.rules Modified: freeswitch/trunk/src/mod/codecs/mod_g726/Makefile ============================================================================== --- freeswitch/trunk/src/mod/codecs/mod_g726/Makefile (original) +++ freeswitch/trunk/src/mod/codecs/mod_g726/Makefile Sat Mar 17 04:40:10 2007 @@ -1,10 +1,10 @@ - BASE=../../../.. -G726LA=$(BASE)/libs/codec/g726/libg726.la -LOCAL_CFLAGS=-I$(BASE)/libs/codec/g726/src +G726_DIR=$(BASE)/libs/codec/g726 +G726LA=$(G726_DIR)/libg726.la +LOCAL_CFLAGS=-I$(G726_DIR)/src LOCAL_LIBADD=$(G726LA) include $(BASE)/build/modmake.rules -$(G726LA): - cd $(BASE)/libs/codec/g726 && $(MAKE) - +$(G726LA): $(G726_DIR) $(G726_DIR)/.update + cd $(G726_DIR) && $(MAKE) + $(TOUCH_TARGET) Modified: freeswitch/trunk/src/mod/codecs/mod_g729/Makefile ============================================================================== --- freeswitch/trunk/src/mod/codecs/mod_g729/Makefile (original) +++ freeswitch/trunk/src/mod/codecs/mod_g729/Makefile Sat Mar 17 04:40:10 2007 @@ -1,11 +1,4 @@ - BASE=../../../.. -topdir=$(shell cd $(BASE) && pwd) -ifeq ($(shell test -d $(topdir)/libs/libg729 && cd $(topdir)/libs/libg729 && pwd),$(topdir)/libs/libg729) -LOCAL_CFLAGS += -I$(PREFIX)/include/libg729 -LOCAL_LDFLAGS +=-lg729 -else -LOCAL_CFLAGS += -DG729_PASSTHROUGH -endif - +LOCAL_INSERT_CFLAGS=if test -d $(BASE)/libs/libg729; then echo "-I$(PREFIX)/include/libg729" ; else echo "-DG729_PASSTHROUGH" ; fi ; +LOCAL_INSERT_LDFLAGS=test ! -d $(BASE)/libs/libg729 || echo "-lg729" include $(BASE)/build/modmake.rules Modified: freeswitch/trunk/src/mod/codecs/mod_gsm/Makefile ============================================================================== --- freeswitch/trunk/src/mod/codecs/mod_gsm/Makefile (original) +++ freeswitch/trunk/src/mod/codecs/mod_gsm/Makefile Sat Mar 17 04:40:10 2007 @@ -1,9 +1,10 @@ - BASE=../../../.. -GSMLA=$(BASE)/libs/codec/gsm/libgsm.la -LOCAL_CFLAGS=-I$(BASE)/libs/codec/gsm/inc +GSM_DIR=$(BASE)/libs/codec/gsm +GSMLA=$(GSM_DIR)/libgsm.la +LOCAL_CFLAGS=-I$(GSM_DIR)/inc LOCAL_LIBADD=$(GSMLA) include $(BASE)/build/modmake.rules -$(GSMLA): - cd $(BASE)/libs/codec/gsm && $(MAKE) +$(GSMLA): $(GSM_DIR) $(GSM_DIR)/.update + cd $(GSM_DIR) && $(MAKE) + $(TOUCH_TARGET) Modified: freeswitch/trunk/src/mod/codecs/mod_ilbc/Makefile ============================================================================== --- freeswitch/trunk/src/mod/codecs/mod_ilbc/Makefile (original) +++ freeswitch/trunk/src/mod/codecs/mod_ilbc/Makefile Sat Mar 17 04:40:10 2007 @@ -1,9 +1,10 @@ - BASE=../../../.. -ILBCLA=$(BASE)/libs/codec/ilbc/libilbc.la -LOCAL_CFLAGS=-I$(BASE)/libs/codec/ilbc/src +ILBC_DIR=$(BASE)/libs/codec/ilbc +ILBCLA=$(ILBC_DIR)/libilbc.la +LOCAL_CFLAGS=-I$(ILBC_DIR)/src LOCAL_LIBADD=$(ILBCLA) include $(BASE)/build/modmake.rules -$(ILBCLA): - cd $(BASE)/libs/codec/ilbc && $(MAKE) +$(ILBCLA): $(ILBC_DIR) $(ILBC_DIR)/.update + cd $(ILBC_DIR) && $(MAKE) + $(TOUCH_TARGET) Modified: freeswitch/trunk/src/mod/codecs/mod_lpc10/Makefile ============================================================================== --- freeswitch/trunk/src/mod/codecs/mod_lpc10/Makefile (original) +++ freeswitch/trunk/src/mod/codecs/mod_lpc10/Makefile Sat Mar 17 04:40:10 2007 @@ -1,9 +1,9 @@ - BASE=../../../.. -LPC10LA=$(BASE)/libs/codec/lpc10/liblpc10.la -LOCAL_CFLAGS=-I$(BASE)/libs/codec/lpc10/src +LPC10_DIR=$(BASE)/libs/codec/lpc10 +LPC10LA=$(LPC10_DIR)/liblpc10.la +LOCAL_CFLAGS=-I$(LPC10_DIR)/src LOCAL_LIBADD=$(LPC10LA) include $(BASE)/build/modmake.rules -$(LPC10LA): - cd $(BASE)/libs/codec/lpc10 && $(MAKE) +$(LPC10LA): $(LPC10_DIR) $(LPC10_DIR)/.update + cd $(LPC10_DIR) && $(MAKE) Modified: freeswitch/trunk/src/mod/codecs/mod_speex/Makefile ============================================================================== --- freeswitch/trunk/src/mod/codecs/mod_speex/Makefile (original) +++ freeswitch/trunk/src/mod/codecs/mod_speex/Makefile Sat Mar 17 04:40:10 2007 @@ -1,19 +1,12 @@ -# define these targets in your makefile if you wish -# local_all local_depend local_clean depend_install local_install local_distclean local_extraclean: - -# and define these variables to impact your build - - BASE=../../../.. -SPEEXLA=$(BASE)/libs/speex/libspeex/libspeex.la +SPEEX_DIR=$(BASE)/libs/speex +SPEEXLA=$(SPEEX_DIR)/libspeex/libspeex.la -LOCAL_CFLAGS=-I$(BASE)/libs/speex/include -LOCAL_LDFLAGS=$(SPEEXLA) -LOCAL_OBJS= +LOCAL_CFLAGS=-I$(SPEEX_DIR)/include +LOCAL_LIBADD=$(SPEEXLA) include $(BASE)/build/modmake.rules -local_depend: $(SPEEXLA) - -$(SPEEXLA): $(BASE)/libs/speex/stamp-h1 - cd $(BASE)/libs/speex && $(MAKE) +$(SPEEXLA): $(SPEEX_DIR) $(SPEEX_DIR)/.update + cd $(SPEEX_DIR) && $(MAKE) + $(TOUCH_TARGET) Modified: freeswitch/trunk/src/mod/directories/mod_ldap/Makefile ============================================================================== --- freeswitch/trunk/src/mod/directories/mod_ldap/Makefile (original) +++ freeswitch/trunk/src/mod/directories/mod_ldap/Makefile Sat Mar 17 04:40:10 2007 @@ -1,4 +1,3 @@ - switch_srcdir=../../../.. LDAP=openldap-2.3.19 @@ -15,9 +14,10 @@ include $(switch_srcdir)/build/modmake.rules -$(LDAP_DIR)/Makefile: +$(LDAP_DIR): $(GETLIB) $(LDAP).tgz cd $(LDAP_DIR) && ./configure $(DEFAULT_ARGS) --disable-bdb --disable-hdb -$(LDAPLA) $(LIBLBERLA): $(LDAP_DIR)/Makefile $(LDAP_DIR)/stamp-h +$(LDAPLA) $(LIBLBERLA): $(LDAP_DIR) cd $(LDAP_DIR) && $(MAKE) + $(TOUCH_TARGET) 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 04:40:10 2007 @@ -1,30 +1,27 @@ -# define these targets in your makefile if you wish -# local_all local_depend local_clean depend_install local_install local_distclean local_extraclean: - -# and define these variables to impact your build - BASE=../../../.. -IKSEMELLA=$(BASE)/libs/iksemel/src/libiksemel.la -DINGLA=$(BASE)/libs/libdingaling/libdingaling.la +IKSEMEL_DIR=$(BASE)/libs/iksemel +DING_DIR=$(BASE)/libs/libdingaling +IKSEMELLA=$(IKSEMEL_DIR)/src/libiksemel.la +DINGLA=$(DING_DIR)/libdingaling.la -LOCAL_CFLAGS=-I$(BASE)/libs/libdingaling/src -LOCAL_LDFLAGS= -LOCAL_OBJS= +LOCAL_CFLAGS=-I$(DING_DIR)/src LOCAL_LIBADD=$(DINGLA) include $(BASE)/build/modmake.rules INST_DINGLA=$(PREFIX)/lib/libdingaling.la -$(IKSEMELLA): - cd $(BASE)/libs/iksemel && $(MAKE) - -$(DINGLA): $(IKSEMELLA) - cd $(BASE)/libs/libdingaling && $(MAKE) +$(IKSEMELLA): $(IKSEMEL_DIR) $(IKSEMEL_DIR)/.update + cd $(IKSEMEL_DIR) && $(MAKE) + $(TOUCH_TARGET) + +$(DINGLA): $(IKSEMELLA) $(DING_DIR) $(DING_DIR)/.update + cd $(DING_DIR) && $(MAKE) + $(TOUCH_TARGET) depend_install: $(INST_DINGLA) $(INST_DINGLA): $(DINGLA) - cd $(BASE)/libs/libdingaling && $(MAKE) install + cd $(DING_DIR) && $(MAKE) install Modified: freeswitch/trunk/src/mod/endpoints/mod_iax/Makefile ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_iax/Makefile (original) +++ freeswitch/trunk/src/mod/endpoints/mod_iax/Makefile Sat Mar 17 04:40:10 2007 @@ -1,15 +1,11 @@ -# define these targets in your makefile if you wish -# local_all local_depend local_clean depend_install local_install local_distclean local_extraclean: - -# and define these variables to impact your build - BASE=../../../.. -IAXLA=$(BASE)/libs/iax/src/libiax.la -LOCAL_CFLAGS=-I$(BASE)/libs/iax/src -LOCAL_LDFLAGS= + +IAX_DIR=$(BASE)/libs/iax +IAXLA=$(IAX_DIR)/src/libiax.la +LOCAL_CFLAGS=-I$(IAX_DIR)/src LOCAL_LIBADD=$(IAXLA) include $(BASE)/build/modmake.rules -$(IAXLA): - cd $(BASE)/libs/iax && $(MAKE) +$(IAXLA): $(IAX_DIR) $(IAX_DIR)/.update + cd $(IAX_DIR) && $(MAKE) 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 04:40:10 2007 @@ -1,10 +1,10 @@ BASE=../../../.. OSARCH=$(shell uname -s) -BASE=../../../.. +PA_DIR=$(BASE)/libs/portaudio -PALA=$(BASE)/libs/portaudio/lib/libportaudio.la -LOCAL_CFLAGS=-I. -I$(BASE)/libs/portaudio/include +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 @@ -14,8 +14,11 @@ include $(BASE)/build/modmake.rules -$(PALA): - cd $(BASE)/libs/portaudio && $(MAKE) +$(PALA): $(PA_DIR) $(PA_DIR)/.update + cd $(PA_DIR) && $(MAKE) + $(TOUCH_TARGET) pa_ringbuffer.o: pa_ringbuffer.c $(COMPILE) -D__EXTENSION__=1 -c -o $@ $< + +pablio.o: pablio.c 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 04:40:10 2007 @@ -1,30 +1,30 @@ - - BASE=../../../.. OS_ARCH := $(subst /,_,$(shell uname -s | sed /\ /s//_/)) -LOCAL_CFLAGS = -I. -I$(BASE)/libs/sofia-sip/libsofia-sip-ua/bnf -I$(BASE)/libs/sofia-sip/libsofia-sip-ua/features -LOCAL_CFLAGS += -I$(BASE)/libs/sofia-sip/libsofia-sip-ua/http -I$(BASE)/libs/sofia-sip/libsofia-sip-ua/ipt -LOCAL_CFLAGS += -I$(BASE)/libs/sofia-sip/libsofia-sip-ua/iptsec -I$(BASE)/libs/sofia-sip/libsofia-sip-ua/msg -LOCAL_CFLAGS += -I$(BASE)/libs/sofia-sip/libsofia-sip-ua/nea -I$(BASE)/libs/sofia-sip/libsofia-sip-ua/nta -LOCAL_CFLAGS += -I$(BASE)/libs/sofia-sip/libsofia-sip-ua/nth -I$(BASE)/libs/sofia-sip/libsofia-sip-ua/nua -LOCAL_CFLAGS += -I$(BASE)/libs/sofia-sip/libsofia-sip-ua/sdp -I$(BASE)/libs/sofia-sip/libsofia-sip-ua/sip -LOCAL_CFLAGS += -I$(BASE)/libs/sofia-sip/libsofia-sip-ua/soa -I$(BASE)/libs/sofia-sip/libsofia-sip-ua/sresolv -LOCAL_CFLAGS += -I$(BASE)/libs/sofia-sip/libsofia-sip-ua/stun -I$(BASE)/libs/sofia-sip/libsofia-sip-ua/su -LOCAL_CFLAGS += -I$(BASE)/libs/sofia-sip/libsofia-sip-ua/tport -I$(BASE)/libs/sofia-sip/libsofia-sip-ua/url +SOFIA_DIR=$(BASE)/libs/sofia-sip +SOFIAUA_DIR=$(SOFIA_DIR)/libsofia-sip-ua -SOFIALA=$(BASE)/libs/sofia-sip/libsofia-sip-ua/libsofia-sip-ua.la +LOCAL_CFLAGS = -I. -I$(SOFIAUA_DIR)/bnf -I$(SOFIAUA_DIR)/features +LOCAL_CFLAGS += -I$(SOFIAUA_DIR)/http -I$(SOFIAUA_DIR)/ipt +LOCAL_CFLAGS += -I$(SOFIAUA_DIR)/iptsec -I$(SOFIAUA_DIR)/msg +LOCAL_CFLAGS += -I$(SOFIAUA_DIR)/nea -I$(SOFIAUA_DIR)/nta +LOCAL_CFLAGS += -I$(SOFIAUA_DIR)/nth -I$(SOFIAUA_DIR)/nua +LOCAL_CFLAGS += -I$(SOFIAUA_DIR)/sdp -I$(SOFIAUA_DIR)/sip +LOCAL_CFLAGS += -I$(SOFIAUA_DIR)/soa -I$(SOFIAUA_DIR)/sresolv +LOCAL_CFLAGS += -I$(SOFIAUA_DIR)/stun -I$(SOFIAUA_DIR)/su +LOCAL_CFLAGS += -I$(SOFIAUA_DIR)/tport -I$(SOFIAUA_DIR)/url -LOCAL_LDFLAGS=$(SOFIALA) +SOFIALA=$(SOFIAUA_DIR)/libsofia-sip-ua.la + +LOCAL_LIBADD=$(SOFIALA) ifeq ($(OS_ARCH),Darwin) LOCAL_LDFLAGS +=-framework CoreFoundation -framework SystemConfiguration endif -include ../../../../build/modmake.rules - -local_depend: $(SOFIALA) +include $(BASE)/build/modmake.rules -$(SOFIALA): - cd $(BASE)/libs/sofia-sip && $(MAKE) +$(SOFIALA): $(SOFIA_DIR) $(SOFIA_DIR)/.update + cd $(SOFIA_DIR) && $(MAKE) + $(TOUCH_TARGET) Modified: freeswitch/trunk/src/mod/endpoints/mod_wanpipe/Makefile ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_wanpipe/Makefile (original) +++ freeswitch/trunk/src/mod/endpoints/mod_wanpipe/Makefile Sat Mar 17 04:40:10 2007 @@ -1,13 +1,9 @@ -# define these targets in your makefile if you wish -# local_all local_depend local_clean depend_install local_install local_distclean local_extraclean: - -# and define these variables to impact your build - +BASE=../../../.. LOCAL_CFLAGS =-I/usr/local/include -I/usr/src/libpri -I/usr/src/linux/include -I. -I/usr/include LOCAL_CFLAGS +=-D__LINUX__ -D_REENTRANT -D_GNU_SOURCE -DAFT_A104 -DWANPIPE_TDM_API -I$(switch_srcdir)/libs/libteletone/src LOCAL_LDFLAGS=-lsangoma $(BASE)/libs/libteletone/libteletone.la LOCAL_OBJS=ss7boost_client.o -include ../../../../build/modmake.rules +include $(BASE)/build/modmake.rules local_depend: MAKE=$(MAKE) $(BASE)/build/buildlib.sh $(BASE) install libsangoma --prefix=$(PREFIX) --with-libpri=/usr/src/libpri Modified: freeswitch/trunk/src/mod/event_handlers/mod_xmpp_event/Makefile ============================================================================== --- freeswitch/trunk/src/mod/event_handlers/mod_xmpp_event/Makefile (original) +++ freeswitch/trunk/src/mod/event_handlers/mod_xmpp_event/Makefile Sat Mar 17 04:40:10 2007 @@ -5,14 +5,14 @@ BASE=../../../.. -IKSEMELLA=$(BASE)/libs/iksemel/src/libiksemel.la +IKSEMEL_DIR=$(BASE)/libs/iksemel +IKSEMELLA=$(IKSEMEL_DIR)/src/libiksemel.la -LOCAL_CFLAGS=-I$(BASE)/libs/iksemel/include -LOCAL_LDFLAGS=$(IKSEMELA) +LOCAL_CFLAGS=-I$(IKSEMEL_DIR)/include +LOCAL_LIBADD=$(IKSEMELA) LOCAL_OBJS= include $(BASE)/build/modmake.rules -local_depend: $(IKSEMELLA) - -$(IKSEMELLA): - cd $(BASE)/libs/iksemel && $(MAKE) +$(IKSEMELLA): $(IKSEMEL_DIR) $(IKSEMEL_DIR)/.update + cd $(IKSEMEL_DIR) && $(MAKE) + $(TOUCH_TARGET) Modified: freeswitch/trunk/src/mod/event_handlers/mod_zeroconf/Makefile ============================================================================== --- freeswitch/trunk/src/mod/event_handlers/mod_zeroconf/Makefile (original) +++ freeswitch/trunk/src/mod/event_handlers/mod_zeroconf/Makefile Sat Mar 17 04:40:10 2007 @@ -1,4 +1,3 @@ - switch_srcdir=../../../.. HOWL=howl-1.0.0 @@ -12,9 +11,10 @@ include $(switch_srcdir)/build/modmake.rules -$(HOWL_DIR)/Makefile: +$(HOWL_DIR): $(GETLIB) $(HOWL).tar.gz cd $(HOWL_DIR) && ./configure $(DEFAULT_ARGS) -$(HOWLLA): $(HOWL_DIR)/Makefile +$(HOWLLA): $(HOWL_DIR) cd $(HOWL_DIR) && $(MAKE) + $(TOUCH_TARGET) Modified: freeswitch/trunk/src/mod/formats/mod_shout/Makefile ============================================================================== --- freeswitch/trunk/src/mod/formats/mod_shout/Makefile (original) +++ freeswitch/trunk/src/mod/formats/mod_shout/Makefile Sat Mar 17 04:40:10 2007 @@ -1,4 +1,3 @@ - LAME=lame-3.97 SHOUT=libshout-2.2.2 switch_srcdir=../../../.. @@ -25,20 +24,21 @@ $(LOCAL_OBJS): $(LOCAL_SOURCES) -$(LAME_DIR)/Makefile: +$(LAME_DIR): $(GETLIB) $(LAME).tar.gz cd $(LAME_DIR) && ./configure $(DEFAULT_ARGS) --disable-decoder -$(LAMELA): $(LAME_DIR)/Makefile +$(LAMELA): $(LAME_DIR) cd $(LAME_DIR) && $(MAKE) + $(TOUCH_TARGET) -$(SHOUT_DIR)/Makefile: +$(SHOUT_DIR): $(GETLIB) $(SHOUT).tar.gz cd $(SHOUT_DIR) && ./configure $(DEFAULT_ARGS) --with-speex=no -$(SHOUTLA): $(SHOUT_DIR)/Makefile +$(SHOUTLA): $(SHOUT_DIR) cd $(SHOUT_DIR) && $(MAKE) - + $(TOUCH_TARGET) Modified: freeswitch/trunk/src/mod/formats/mod_sndfile/Makefile ============================================================================== --- freeswitch/trunk/src/mod/formats/mod_sndfile/Makefile (original) +++ freeswitch/trunk/src/mod/formats/mod_sndfile/Makefile Sat Mar 17 04:40:10 2007 @@ -1,20 +1,14 @@ -# define these targets in your makefile if you wish -# local_all local_depend local_clean depend_install local_install local_distclean local_extraclean: - -# and define these variables to impact your build - - BASE=../../../.. -SNDFILELA=$(BASE)/libs/libsndfile/src/libsndfile.la +SNDFILE_DIR=$(BASE)/libs/libsndfile +SNDFILELA=$(SNDFILE_DIR)/src/libsndfile.la -LOCAL_CFLAGS=-I$(BASE)/libs/libsndfile/src -LOCAL_LDFLAGS=$(SNDFILELA) +LOCAL_CFLAGS=-I$(SNDFILE_DIR)/src +LOCAL_LIBADD=$(SNDFILELA) LOCAL_OBJS= include $(BASE)/build/modmake.rules -local_depend: $(SNDFILELA) - -$(SNDFILELA): - cd $(BASE)/libs/libsndfile && $(MAKE) +$(SNDFILELA): $(SNDFILE_DIR) $(SNDFILE_DIR)/.update + cd $(SNDFILE_DIR) && $(MAKE) + $(TOUCH_TARGET) Modified: freeswitch/trunk/src/mod/languages/mod_spidermonkey/Makefile ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_spidermonkey/Makefile (original) +++ freeswitch/trunk/src/mod/languages/mod_spidermonkey/Makefile Sat Mar 17 04:40:10 2007 @@ -1,4 +1,3 @@ - WANT_CURL=yes LOCAL_CFLAGS= @@ -9,8 +8,6 @@ depend_install: $(DESTDIR)$(PREFIX)/lib/libjs.la - - $(DESTDIR)$(PREFIX)/lib/libjs.la: $(JSLA) cd $(JS_DIR)/nsprpub/ && $(MAKE) install cd $(JS_DIR) && $(MAKE) install Modified: freeswitch/trunk/src/mod/languages/mod_spidermonkey/sm.mak ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_spidermonkey/sm.mak (original) +++ freeswitch/trunk/src/mod/languages/mod_spidermonkey/sm.mak Sat Mar 17 04:40:10 2007 @@ -8,6 +8,7 @@ include $(switch_srcdir)/build/modmake.rules -$(JSLA): +$(JSLA): $(JS_DIR) $(JS_DIR)/.update cd $(JS_DIR)/nsprpub && $(MAKE) cd $(JS_DIR) && $(MAKE) + $(TOUCH_TARGET) Modified: freeswitch/trunk/src/mod/languages/mod_spidermonkey_core_db/Makefile ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_spidermonkey_core_db/Makefile (original) +++ freeswitch/trunk/src/mod/languages/mod_spidermonkey_core_db/Makefile Sat Mar 17 04:40:10 2007 @@ -1,4 +1,3 @@ - switch_srcdir=../../../.. LOCAL_CFLAGS= LOCAL_LDFLAGS= Modified: freeswitch/trunk/src/mod/languages/mod_spidermonkey_etpan/Makefile ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_spidermonkey_etpan/Makefile (original) +++ freeswitch/trunk/src/mod/languages/mod_spidermonkey_etpan/Makefile Sat Mar 17 04:40:10 2007 @@ -1,16 +1,12 @@ - - switch_srcdir=../../../.. - ETPAN_DIR=$(switch_srcdir)/libs/libetpan ETPANLA=$(ETPAN_DIR)/src/libetpan.la LOCAL_CFLAGS=-I$(ETPAN_DIR)/include -LOCAL_LDFLAGS= LOCAL_LIBADD=$(ETPANLA) include ../mod_spidermonkey/sm.mak -$(ETPANLA): +$(ETPANLA): $(ETPAN_DIR) $(ETPAN_DIR)/.update cd $(ETPAN_DIR) && $(MAKE) - + $(TOUCH_TARGET) Modified: freeswitch/trunk/src/mod/languages/mod_spidermonkey_odbc/Makefile ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_spidermonkey_odbc/Makefile (original) +++ freeswitch/trunk/src/mod/languages/mod_spidermonkey_odbc/Makefile Sat Mar 17 04:40:10 2007 @@ -1,23 +1,25 @@ - switch_srcdir=../../../.. ODBC=unixODBC-2.2.12 ODBC_DIR=$(switch_srcdir)/libs/$(ODBC) ODBCLA=libodbc.la + UNINST_ODBCLA=$(ODBC_DIR)/DriverManager/$(ODBCLA) INST_ODBCLA=$(DESTDIR)$(PREFIX)/lib/$(ODBCLA) + LOCAL_CFLAGS=-I$(ODBC_DIR)/include LOCAL_LDFLAGS= LOCAL_LIBADD=$(UNINST_ODBCLA) include ../mod_spidermonkey/sm.mak -$(ODBC_DIR)/Makefile: +$(ODBC_DIR): $(GETLIB) $(ODBC).tar.gz cd $(ODBC_DIR) && ./configure --prefix=$(PREFIX) --disable-gui --without-x --with-pic -$(UNINST_ODBCLA): $(ODBC_DIR)/Makefile +$(UNINST_ODBCLA): $(ODBC_DIR) cd $(ODBC_DIR) && $(MAKE) + $(TOUCH_TARGET) depend_install: $(INST_ODBCLA) Modified: freeswitch/trunk/src/mod/languages/mod_spidermonkey_teletone/Makefile ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_spidermonkey_teletone/Makefile (original) +++ freeswitch/trunk/src/mod/languages/mod_spidermonkey_teletone/Makefile Sat Mar 17 04:40:10 2007 @@ -1,7 +1,5 @@ - switch_srcdir=../../../.. LOCAL_CFLAGS=-I$(switch_srcdir)/libs/libteletone/src -LOCAL_LDFLAGS= LOCAL_LIBADD=$(switch_srcdir)/libs/libteletone/libteletone.la include ../mod_spidermonkey/sm.mak Modified: freeswitch/trunk/src/mod/xml_int/mod_xml_curl/Makefile ============================================================================== --- freeswitch/trunk/src/mod/xml_int/mod_xml_curl/Makefile (original) +++ freeswitch/trunk/src/mod/xml_int/mod_xml_curl/Makefile Sat Mar 17 04:40:10 2007 @@ -1,7 +1,2 @@ -# define these targets in your makefile if you wish -# local_all local_depend local_clean depend_install local_install local_distclean local_extraclean: - -# and define these variables to impact your build - WANT_CURL=yes include ../../../../build/modmake.rules Modified: freeswitch/trunk/src/mod/xml_int/mod_xml_rpc/Makefile ============================================================================== --- freeswitch/trunk/src/mod/xml_int/mod_xml_rpc/Makefile (original) +++ freeswitch/trunk/src/mod/xml_int/mod_xml_rpc/Makefile Sat Mar 17 04:40:10 2007 @@ -1,17 +1,17 @@ - BASE=../../../.. +XMLRPC_DIR=$(BASE)/libs/xmlrpc-c -XMLRPCLAS = $(BASE)/libs/xmlrpc-c/src/libxmlrpc.la $(BASE)/libs/xmlrpc-c/src/libxmlrpc_server.la -XMLRPCLAS += $(BASE)/libs/xmlrpc-c/src/libxmlrpc_server_abyss.la $(BASE)/libs/xmlrpc-c/lib/abyss/src/libxmlrpc_abyss.la -XMLRPCLAS += $(BASE)/libs/xmlrpc-c/lib/expat/xmlparse/libxmlrpc_xmlparse.la +XMLRPCLAS = $(XMLRPC_DIR)/src/libxmlrpc.la $(XMLRPC_DIR)/src/libxmlrpc_server.la +XMLRPCLAS += $(XMLRPC_DIR)/src/libxmlrpc_server_abyss.la $(XMLRPC_DIR)/lib/abyss/src/libxmlrpc_abyss.la +XMLRPCLAS += $(XMLRPC_DIR)/lib/expat/xmlparse/libxmlrpc_xmlparse.la LOCAL_LDFLAGS = $(XMLRPCLAS) -LOCAL_CFLAGS=-I$(BASE)/libs/xmlrpc-c/include +LOCAL_CFLAGS=-I$(XMLRPC_DIR)/include -include ../../../../build/modmake.rules +include $(BASE)/build/modmake.rules local_depend: $(XMLRPCLAS) -$(XMLRPCLAS): - cd $(BASE)/libs/xmlrpc-c && $(MAKE) - +$(XMLRPCLAS): $(XMLRPC_DIR) $(XMLRPC_DIR)/.update + cd $(XMLRPC_DIR) && $(MAKE) + $(TOUCH_TARGET)

1 0

[commit] r4628 - in freeswitch/trunk: build src/mod/applications/mod_enum src/mod/asr_tts/mod_cepstral src/mod/asr_tts/mod_lumenvox src/mod/codecs/mod_amr src/mod/codecs/mod_g711 src/mod/codecs/mod_g722 src/mod/codecs/mod_g723_1 src/mod/codecs/mod_g726 src/mod/codecs/mod_g729 src/mod/codecs/mod_gsm src/mod/codecs/mod_ilbc src/mod/codecs/mod_lpc10 src/mod/codecs/mod_speex src/mod/directories/mod_ldap src/mod/endpoints/mod_dingaling src/mod/endpoints/mod_iax src/mod/endpoints/mod_portaudio sr
by Freeswitch SVN 17 Mar '07

17 Mar '07

Author: mikej Date: Sat Mar 17 01:49:57 2007 New Revision: 4628 Modified: freeswitch/trunk/build/modmake.rules.in freeswitch/trunk/src/mod/applications/mod_enum/Makefile freeswitch/trunk/src/mod/asr_tts/mod_cepstral/Makefile freeswitch/trunk/src/mod/asr_tts/mod_lumenvox/Makefile freeswitch/trunk/src/mod/codecs/mod_amr/Makefile freeswitch/trunk/src/mod/codecs/mod_g711/Makefile freeswitch/trunk/src/mod/codecs/mod_g722/Makefile freeswitch/trunk/src/mod/codecs/mod_g723_1/Makefile freeswitch/trunk/src/mod/codecs/mod_g726/Makefile freeswitch/trunk/src/mod/codecs/mod_g729/Makefile freeswitch/trunk/src/mod/codecs/mod_gsm/Makefile freeswitch/trunk/src/mod/codecs/mod_ilbc/Makefile freeswitch/trunk/src/mod/codecs/mod_lpc10/Makefile freeswitch/trunk/src/mod/codecs/mod_speex/Makefile freeswitch/trunk/src/mod/directories/mod_ldap/Makefile freeswitch/trunk/src/mod/endpoints/mod_dingaling/Makefile freeswitch/trunk/src/mod/endpoints/mod_iax/Makefile freeswitch/trunk/src/mod/endpoints/mod_portaudio/Makefile freeswitch/trunk/src/mod/endpoints/mod_sofia/Makefile freeswitch/trunk/src/mod/endpoints/mod_wanpipe/Makefile freeswitch/trunk/src/mod/event_handlers/mod_cdr/Makefile freeswitch/trunk/src/mod/event_handlers/mod_xmpp_event/Makefile freeswitch/trunk/src/mod/event_handlers/mod_zeroconf/Makefile freeswitch/trunk/src/mod/formats/mod_shout/Makefile freeswitch/trunk/src/mod/formats/mod_sndfile/Makefile freeswitch/trunk/src/mod/languages/mod_mono/Makefile freeswitch/trunk/src/mod/languages/mod_perl/Makefile freeswitch/trunk/src/mod/languages/mod_python/Makefile freeswitch/trunk/src/mod/languages/mod_spidermonkey/Makefile freeswitch/trunk/src/mod/languages/mod_spidermonkey_core_db/Makefile freeswitch/trunk/src/mod/languages/mod_spidermonkey_etpan/Makefile freeswitch/trunk/src/mod/languages/mod_spidermonkey_odbc/Makefile freeswitch/trunk/src/mod/languages/mod_spidermonkey_skel/Makefile freeswitch/trunk/src/mod/languages/mod_spidermonkey_teletone/Makefile freeswitch/trunk/src/mod/xml_int/mod_xml_curl/Makefile freeswitch/trunk/src/mod/xml_int/mod_xml_rpc/Makefile Log: Remove the requirement to define MODNAME in the module makefiles. Remove gmakeisms from the modmake.rules module makefile include Remove the MODNAME def from all the in tree Makefiles Modified: freeswitch/trunk/build/modmake.rules.in ============================================================================== --- freeswitch/trunk/build/modmake.rules.in (original) +++ freeswitch/trunk/build/modmake.rules.in Sat Mar 17 01:49:57 2007 @@ -21,21 +21,18 @@ CURL_DIR=$(switch_srcdir)/libs/curl CURLLA=$(CURL_DIR)/lib/libcurl.la -OUR_CFLAGS=$(shell test -z "$(WANT_CURL)" || echo $(LIBCURL_CPPFLAGS)) -OUR_LDFLAGS=$(shell test -z "$(WANT_CURL)" || echo $(LIBCURL)) -OUR_DEPS=$(shell test -z "$(WANT_CURL)" || if test ! -z "$(LIBCURL_DEPS)"; then echo $(CURLLA); fi) - -LDFLAGS=@SWITCH_AM_LDFLAGS@ @LDFLAGS@ $(OUR_LDFLAGS) LIBS=$(switch_builddir)/libfreeswitch.la DEFS=@DEFS@ PREFIX = @prefix@ DYLD_LIBRARY_PATH=$(PREFIX)/lib:$DYLD_LIBRARY_PATH LD_LIBRARY_PATH=$(PREFIX)/lib:$LD_LIBRARY_PATH -OSARCH=$(shell uname -s) +OSARCH=`uname -s` DYNAMIC_LIB_EXTEN = @DYNAMIC_LIB_EXTEN@ SOLINK = @SOLINK@ +LDFLAGS=@SWITCH_AM_LDFLAGS@ @LDFLAGS@ $(OUR_LDFLAGS) + ALL_CFLAGS = $(LOCAL_CFLAGS) $(MOD_CFLAGS) @SWITCH_AM_CFLAGS@ @CFLAGS@ -D_GNU_SOURCE $(OUR_CFLAGS) ALL_CXXFLAGS = $(LOCAL_CFLAGS) $(MOD_CFLAGS) @SWITCH_AM_CXXFLAGS@ @CXXFLAGS@ -D_GNU_SOURC $(OUR_CFLAGS) @@ -47,24 +44,64 @@ LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXXCOMPILE) CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(ALL_CXXFLAGS) $(LDFLAGS) -o $@ -CURDIR=$(shell pwd) -CSOURCEFILE=$(CURDIR)/$(MODNAME).c -CXXSOURCEFILE=$(CURDIR)/$(MODNAME).cpp -SOURCEFILE=$(shell if test -f $(CSOURCEFILE); then echo $(CSOURCEFILE); else echo $(CXXSOURCEFILE); fi;) - -all: local_depend local_all $(MODNAME).$(DYNAMIC_LIB_EXTEN) Makefile -depend: local_depend -clean: local_clean mod_clean -install: all depend_install local_install mod_install -uninstall: local_uninstall mod_uninstall -distclean: clean local_distclean -extraclean: distclean local_extraclean +CSOURCEFILE=$(MODNAME).c +CXXSOURCEFILE=$(MODNAME).cpp + +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` +RECURSE_OUR_CFLAGS=`test -z "$(WANT_CURL)" || echo $(LIBCURL_CPPFLAGS)` +RECURSE_OUR_LDFLAGS=`test -z "$(WANT_CURL)" || echo $(LIBCURL)` +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) ; + +all: Makefile + @$(RECURSE_CHECKS) \ + $(MAKE) MODNAME=$$modname SOURCEFILE=$$sourcefile OUR_DEPS=$$ourdefs OUR_CFLAGS=$$ourcflags OUR_LDFLAGS=$$our_ldflags all-modules || exit 1;\ + fi +depend: Makefile + @$(RECURSE_CHECKS) \ + $(MAKE) MODNAME=$$modname SOURCEFILE=$$sourcefile OUR_DEPS=$$ourdefs OUR_CFLAGS=$$ourcflags OUR_LDFLAGS=$$our_ldflags depend-modules || exit 1;\ + fi +clean: Makefile + @$(RECURSE_CHECKS) \ + $(MAKE) MODNAME=$$modname SOURCEFILE=$$sourcefile OUR_DEPS=$$ourdefs OUR_CFLAGS=$$ourcflags OUR_LDFLAGS=$$our_ldflags clean-modules || exit 1;\ + fi +install: Makefile + @$(RECURSE_CHECKS) \ + $(MAKE) MODNAME=$$modname SOURCEFILE=$$sourcefile OUR_DEPS=$$ourdefs OUR_CFLAGS=$$ourcflags OUR_LDFLAGS=$$our_ldflags install-modules || exit 1;\ + fi +uninstall: Makefile + @$(RECURSE_CHECKS) \ + $(MAKE) MODNAME=$$modname SOURCEFILE=$$sourcefile OUR_DEPS=$$ourdefs OUR_CFLAGS=$$ourcflags OUR_LDFLAGS=$$our_ldflags uninstall-modules || exit 1;\ + fi +distclean: Makefile + @$(RECURSE_CHECKS) \ + $(MAKE) MODNAME=$$modname SOURCEFILE=$$sourcefile OUR_DEPS=$$ourdefs OUR_CFLAGS=$$ourcflags OUR_LDFLAGS=$$our_ldflags distclean-modules || exit 1;\ + fi +extraclean: Makefile + @$(RECURSE_CHECKS) \ + $(MAKE) MODNAME=$$modname SOURCEFILE=$$sourcefile OUR_DEPS=$$ourdefs OUR_CFLAGS=$$ourcflags OUR_LDFLAGS=$$our_ldflags extraclean-modules || exit 1;\ + fi + + +all-modules: local_depend local_all $(MODNAME).$(DYNAMIC_LIB_EXTEN) Makefile +depend-modules: local_depend +clean-modules: local_clean mod_clean +install-modules: all depend_install local_install mod_install +uninstall-modules: local_uninstall mod_uninstall +distclean-modules: clean local_distclean +extraclean-modules: distclean local_extraclean Makefile: - if test ! -f $@; then \ - echo MODNAME=$(MODNAME) > Makefile ; \ + @if test ! -f $@; then \ if ! pwd | grep $(switch_srcdir)/src/mod ; then rulesdir=$(switch_srcdir) ; else rulesdir=../../../.. ; fi ; \ - echo include $$rulesdir/build/modmake.rules >> Makefile ; \ + echo BASE=$$rulesdir > Makefile ; \ + echo "include $(BASE)/build/modmake.rules" >> Makefile ; \ fi ; $(CURLLA): @@ -171,7 +208,8 @@ $(switch_srcdir)/src/include/switch_xml.h: -.PHONY: all depend clean local_all local_depend \ - install depend_install local_install mod_install \ - clean local_clean mod_clean distclean \ - local_distclean extraclean local_extraclean + +.PHONY: all clean depend install distclean extraclean \ + all-modules clean-modules depend-modules install-modules distclean-modules extraclean-modules \ + local_all local_clean local_depend local_install local_distclean local_extraclean \ + mod_clean mod_install mod_uninstall depend_install Modified: freeswitch/trunk/src/mod/applications/mod_enum/Makefile ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_enum/Makefile (original) +++ freeswitch/trunk/src/mod/applications/mod_enum/Makefile Sat Mar 17 01:49:57 2007 @@ -1,4 +1,4 @@ -MODNAME=mod_enum + BASE=../../../.. UDNSA=$(BASE)/libs/udns/libudns.a LOCAL_CFLAGS=-I$(BASE)/libs/udns 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 01:49:57 2007 @@ -2,7 +2,7 @@ # 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 -MODNAME=mod_cepstral + ifeq ($(OSARCH),Darwin) LOCAL_LDFLAGS += -framework swift Modified: freeswitch/trunk/src/mod/asr_tts/mod_lumenvox/Makefile ============================================================================== --- freeswitch/trunk/src/mod/asr_tts/mod_lumenvox/Makefile (original) +++ freeswitch/trunk/src/mod/asr_tts/mod_lumenvox/Makefile Sat Mar 17 01:49:57 2007 @@ -2,7 +2,7 @@ # local_all local_depend local_clean depend_install local_install local_distclean local_extraclean: # and define these variables to impact your build -MODNAME=mod_lumenvox + LOCAL_CFLAGS= -fpermissive -Wno-deprecated -Wno-conversion -fpermissive -Wno-unused -Wno-comment -Wno-sign-compare \ -Wno-conversion -Wno-reorder -I/opt/lumenvox/eng\ine_7.0/include LOCAL_LDFLAGS= -L/opt/lumenvox/engine_7.0/lib -llv_lvspeechport Modified: freeswitch/trunk/src/mod/codecs/mod_amr/Makefile ============================================================================== --- freeswitch/trunk/src/mod/codecs/mod_amr/Makefile (original) +++ freeswitch/trunk/src/mod/codecs/mod_amr/Makefile Sat Mar 17 01:49:57 2007 @@ -1,4 +1,4 @@ -MODNAME=mod_amr + BASE=../../../.. topdir=$(shell cd $(BASE) && pwd) Modified: freeswitch/trunk/src/mod/codecs/mod_g711/Makefile ============================================================================== --- freeswitch/trunk/src/mod/codecs/mod_g711/Makefile (original) +++ freeswitch/trunk/src/mod/codecs/mod_g711/Makefile Sat Mar 17 01:49:57 2007 @@ -2,7 +2,7 @@ # local_all local_depend local_clean depend_install local_install local_distclean local_extraclean: # and define these variables to impact your build -MODNAME=mod_g711 + LOCAL_CFLAGS=-I$(BASE)/libs/codec/g7xx/src/include LOCAL_LDFLAGS= LOCAL_OBJS= Modified: freeswitch/trunk/src/mod/codecs/mod_g722/Makefile ============================================================================== --- freeswitch/trunk/src/mod/codecs/mod_g722/Makefile (original) +++ freeswitch/trunk/src/mod/codecs/mod_g722/Makefile Sat Mar 17 01:49:57 2007 @@ -1,4 +1,4 @@ -MODNAME=mod_g722 + BASE=../../../.. G7XXLA=$(BASE)/libs/codec/g7xx/libg7xx.la LOCAL_CFLAGS=-I$(BASE)/libs/codec/g7xx/src/include/ Modified: freeswitch/trunk/src/mod/codecs/mod_g723_1/Makefile ============================================================================== --- freeswitch/trunk/src/mod/codecs/mod_g723_1/Makefile (original) +++ freeswitch/trunk/src/mod/codecs/mod_g723_1/Makefile Sat Mar 17 01:49:57 2007 @@ -1,4 +1,4 @@ -MODNAME=mod_g723_1 + BASE=../../../.. topdir=$(shell cd $(BASE) && pwd) ifeq ($(shell test -d $(topdir)/libs/libg723_1 && cd $(topdir)/libs/libg723_1 && pwd),$(topdir)/libs/libg723_1) Modified: freeswitch/trunk/src/mod/codecs/mod_g726/Makefile ============================================================================== --- freeswitch/trunk/src/mod/codecs/mod_g726/Makefile (original) +++ freeswitch/trunk/src/mod/codecs/mod_g726/Makefile Sat Mar 17 01:49:57 2007 @@ -1,4 +1,4 @@ -MODNAME=mod_g726 + BASE=../../../.. G726LA=$(BASE)/libs/codec/g726/libg726.la LOCAL_CFLAGS=-I$(BASE)/libs/codec/g726/src Modified: freeswitch/trunk/src/mod/codecs/mod_g729/Makefile ============================================================================== --- freeswitch/trunk/src/mod/codecs/mod_g729/Makefile (original) +++ freeswitch/trunk/src/mod/codecs/mod_g729/Makefile Sat Mar 17 01:49:57 2007 @@ -1,4 +1,4 @@ -MODNAME=mod_g729 + BASE=../../../.. topdir=$(shell cd $(BASE) && pwd) ifeq ($(shell test -d $(topdir)/libs/libg729 && cd $(topdir)/libs/libg729 && pwd),$(topdir)/libs/libg729) Modified: freeswitch/trunk/src/mod/codecs/mod_gsm/Makefile ============================================================================== --- freeswitch/trunk/src/mod/codecs/mod_gsm/Makefile (original) +++ freeswitch/trunk/src/mod/codecs/mod_gsm/Makefile Sat Mar 17 01:49:57 2007 @@ -1,4 +1,4 @@ -MODNAME=mod_gsm + BASE=../../../.. GSMLA=$(BASE)/libs/codec/gsm/libgsm.la LOCAL_CFLAGS=-I$(BASE)/libs/codec/gsm/inc Modified: freeswitch/trunk/src/mod/codecs/mod_ilbc/Makefile ============================================================================== --- freeswitch/trunk/src/mod/codecs/mod_ilbc/Makefile (original) +++ freeswitch/trunk/src/mod/codecs/mod_ilbc/Makefile Sat Mar 17 01:49:57 2007 @@ -1,4 +1,4 @@ -MODNAME=mod_ilbc + BASE=../../../.. ILBCLA=$(BASE)/libs/codec/ilbc/libilbc.la LOCAL_CFLAGS=-I$(BASE)/libs/codec/ilbc/src Modified: freeswitch/trunk/src/mod/codecs/mod_lpc10/Makefile ============================================================================== --- freeswitch/trunk/src/mod/codecs/mod_lpc10/Makefile (original) +++ freeswitch/trunk/src/mod/codecs/mod_lpc10/Makefile Sat Mar 17 01:49:57 2007 @@ -1,4 +1,4 @@ -MODNAME=mod_lpc10 + BASE=../../../.. LPC10LA=$(BASE)/libs/codec/lpc10/liblpc10.la LOCAL_CFLAGS=-I$(BASE)/libs/codec/lpc10/src Modified: freeswitch/trunk/src/mod/codecs/mod_speex/Makefile ============================================================================== --- freeswitch/trunk/src/mod/codecs/mod_speex/Makefile (original) +++ freeswitch/trunk/src/mod/codecs/mod_speex/Makefile Sat Mar 17 01:49:57 2007 @@ -2,7 +2,7 @@ # local_all local_depend local_clean depend_install local_install local_distclean local_extraclean: # and define these variables to impact your build -MODNAME=mod_speex + BASE=../../../.. Modified: freeswitch/trunk/src/mod/directories/mod_ldap/Makefile ============================================================================== --- freeswitch/trunk/src/mod/directories/mod_ldap/Makefile (original) +++ freeswitch/trunk/src/mod/directories/mod_ldap/Makefile Sat Mar 17 01:49:57 2007 @@ -1,4 +1,4 @@ -MODNAME=mod_ldap + switch_srcdir=../../../.. LDAP=openldap-2.3.19 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 01:49:57 2007 @@ -2,7 +2,7 @@ # local_all local_depend local_clean depend_install local_install local_distclean local_extraclean: # and define these variables to impact your build -MODNAME=mod_dingaling + BASE=../../../.. IKSEMELLA=$(BASE)/libs/iksemel/src/libiksemel.la Modified: freeswitch/trunk/src/mod/endpoints/mod_iax/Makefile ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_iax/Makefile (original) +++ freeswitch/trunk/src/mod/endpoints/mod_iax/Makefile Sat Mar 17 01:49:57 2007 @@ -2,7 +2,7 @@ # local_all local_depend local_clean depend_install local_install local_distclean local_extraclean: # and define these variables to impact your build -MODNAME=mod_iax + BASE=../../../.. IAXLA=$(BASE)/libs/iax/src/libiax.la LOCAL_CFLAGS=-I$(BASE)/libs/iax/src 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 01:49:57 2007 @@ -1,6 +1,6 @@ BASE=../../../.. OSARCH=$(shell uname -s) -MODNAME=mod_portaudio + BASE=../../../.. PALA=$(BASE)/libs/portaudio/lib/libportaudio.la 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 01:49:57 2007 @@ -1,4 +1,4 @@ -MODNAME=mod_sofia + BASE=../../../.. Modified: freeswitch/trunk/src/mod/endpoints/mod_wanpipe/Makefile ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_wanpipe/Makefile (original) +++ freeswitch/trunk/src/mod/endpoints/mod_wanpipe/Makefile Sat Mar 17 01:49:57 2007 @@ -2,7 +2,7 @@ # local_all local_depend local_clean depend_install local_install local_distclean local_extraclean: # and define these variables to impact your build -MODNAME=mod_wanpipe + LOCAL_CFLAGS =-I/usr/local/include -I/usr/src/libpri -I/usr/src/linux/include -I. -I/usr/include LOCAL_CFLAGS +=-D__LINUX__ -D_REENTRANT -D_GNU_SOURCE -DAFT_A104 -DWANPIPE_TDM_API -I$(switch_srcdir)/libs/libteletone/src LOCAL_LDFLAGS=-lsangoma $(BASE)/libs/libteletone/libteletone.la Modified: freeswitch/trunk/src/mod/event_handlers/mod_cdr/Makefile ============================================================================== --- freeswitch/trunk/src/mod/event_handlers/mod_cdr/Makefile (original) +++ freeswitch/trunk/src/mod/event_handlers/mod_cdr/Makefile Sat Mar 17 01:49:57 2007 @@ -2,7 +2,7 @@ # local_all local_depend local_clean depend_install local_install local_distclean local_extraclean: # and define these variables to impact your build -MODNAME=mod_cdr + LOCAL_CFLAGS= LOCAL_LDFLAGS= LOCAL_OBJS=cdrcontainer.o basecdr.o baseregistry.o pddcdr.o csvcdr.o xmlcdr.o sqlitecdr.o Modified: freeswitch/trunk/src/mod/event_handlers/mod_xmpp_event/Makefile ============================================================================== --- freeswitch/trunk/src/mod/event_handlers/mod_xmpp_event/Makefile (original) +++ freeswitch/trunk/src/mod/event_handlers/mod_xmpp_event/Makefile Sat Mar 17 01:49:57 2007 @@ -2,7 +2,7 @@ # local_all local_depend local_clean depend_install local_install local_distclean local_extraclean: # and define these variables to impact your build -MODNAME=mod_xmpp_event + BASE=../../../.. IKSEMELLA=$(BASE)/libs/iksemel/src/libiksemel.la Modified: freeswitch/trunk/src/mod/event_handlers/mod_zeroconf/Makefile ============================================================================== --- freeswitch/trunk/src/mod/event_handlers/mod_zeroconf/Makefile (original) +++ freeswitch/trunk/src/mod/event_handlers/mod_zeroconf/Makefile Sat Mar 17 01:49:57 2007 @@ -1,4 +1,4 @@ -MODNAME=mod_zeroconf + switch_srcdir=../../../.. HOWL=howl-1.0.0 Modified: freeswitch/trunk/src/mod/formats/mod_shout/Makefile ============================================================================== --- freeswitch/trunk/src/mod/formats/mod_shout/Makefile (original) +++ freeswitch/trunk/src/mod/formats/mod_shout/Makefile Sat Mar 17 01:49:57 2007 @@ -1,4 +1,4 @@ -MODNAME=mod_shout + LAME=lame-3.97 SHOUT=libshout-2.2.2 switch_srcdir=../../../.. Modified: freeswitch/trunk/src/mod/formats/mod_sndfile/Makefile ============================================================================== --- freeswitch/trunk/src/mod/formats/mod_sndfile/Makefile (original) +++ freeswitch/trunk/src/mod/formats/mod_sndfile/Makefile Sat Mar 17 01:49:57 2007 @@ -2,7 +2,7 @@ # local_all local_depend local_clean depend_install local_install local_distclean local_extraclean: # and define these variables to impact your build -MODNAME=mod_sndfile + BASE=../../../.. Modified: freeswitch/trunk/src/mod/languages/mod_mono/Makefile ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_mono/Makefile (original) +++ freeswitch/trunk/src/mod/languages/mod_mono/Makefile Sat Mar 17 01:49:57 2007 @@ -1,4 +1,4 @@ -MODNAME=mod_mono + VERSION = mono-1.1.13.8 TARBALL = mono-1.1.13.8.tar.gz GLIB_TARBALL = glib-2.12.3.tar.gz Modified: freeswitch/trunk/src/mod/languages/mod_perl/Makefile ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_perl/Makefile (original) +++ freeswitch/trunk/src/mod/languages/mod_perl/Makefile Sat Mar 17 01:49:57 2007 @@ -2,7 +2,7 @@ # local_all local_depend local_clean depend_install local_install local_distclean local_extraclean: # and define these variables to impact your build -MODNAME=mod_perl + LOCAL_CFLAGS=-DMULTIPLICITY $(shell $(PERL) -MExtUtils::Embed -e ccopts) -DEMBED_PERL LOCAL_LDFLAGS=$(shell $(PERL) -MExtUtils::Embed -e ldopts) $(shell $(PERL) -MConfig -e 'print $$Config{libs}') LOCAL_OBJS=perlxsi.o Modified: freeswitch/trunk/src/mod/languages/mod_python/Makefile ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_python/Makefile (original) +++ freeswitch/trunk/src/mod/languages/mod_python/Makefile Sat Mar 17 01:49:57 2007 @@ -2,7 +2,7 @@ # local_all local_depend local_clean depend_install local_install local_distclean local_extraclean: # and define these variables to impact your build -MODNAME=mod_python + LOCAL_CFLAGS=-I$(PREFIX)/include/python2.4/ LOCAL_LDFLAGS=-lpython2.4 -L$(PREFIX)/lib/python2.4/config/ -lutil -lstdc++ LOCAL_OBJS=freeswitch_python.o mod_python_wrap.o Modified: freeswitch/trunk/src/mod/languages/mod_spidermonkey/Makefile ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_spidermonkey/Makefile (original) +++ freeswitch/trunk/src/mod/languages/mod_spidermonkey/Makefile Sat Mar 17 01:49:57 2007 @@ -1,4 +1,4 @@ -MODNAME=mod_spidermonkey + WANT_CURL=yes LOCAL_CFLAGS= Modified: freeswitch/trunk/src/mod/languages/mod_spidermonkey_core_db/Makefile ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_spidermonkey_core_db/Makefile (original) +++ freeswitch/trunk/src/mod/languages/mod_spidermonkey_core_db/Makefile Sat Mar 17 01:49:57 2007 @@ -1,4 +1,4 @@ -MODNAME=mod_spidermonkey_core_db + switch_srcdir=../../../.. LOCAL_CFLAGS= LOCAL_LDFLAGS= Modified: freeswitch/trunk/src/mod/languages/mod_spidermonkey_etpan/Makefile ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_spidermonkey_etpan/Makefile (original) +++ freeswitch/trunk/src/mod/languages/mod_spidermonkey_etpan/Makefile Sat Mar 17 01:49:57 2007 @@ -1,4 +1,4 @@ -MODNAME=mod_spidermonkey_etpan + switch_srcdir=../../../.. Modified: freeswitch/trunk/src/mod/languages/mod_spidermonkey_odbc/Makefile ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_spidermonkey_odbc/Makefile (original) +++ freeswitch/trunk/src/mod/languages/mod_spidermonkey_odbc/Makefile Sat Mar 17 01:49:57 2007 @@ -1,4 +1,4 @@ -MODNAME=mod_spidermonkey_odbc + switch_srcdir=../../../.. ODBC=unixODBC-2.2.12 Modified: freeswitch/trunk/src/mod/languages/mod_spidermonkey_skel/Makefile ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_spidermonkey_skel/Makefile (original) +++ freeswitch/trunk/src/mod/languages/mod_spidermonkey_skel/Makefile Sat Mar 17 01:49:57 2007 @@ -1,4 +1,4 @@ -MODNAME=mod_spidermonkey_skel + switch_srcdir=../../../.. LOCAL_CFLAGS= LOCAL_LDFLAGS= Modified: freeswitch/trunk/src/mod/languages/mod_spidermonkey_teletone/Makefile ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_spidermonkey_teletone/Makefile (original) +++ freeswitch/trunk/src/mod/languages/mod_spidermonkey_teletone/Makefile Sat Mar 17 01:49:57 2007 @@ -1,4 +1,4 @@ -MODNAME=mod_spidermonkey_teletone + switch_srcdir=../../../.. LOCAL_CFLAGS=-I$(switch_srcdir)/libs/libteletone/src LOCAL_LDFLAGS= Modified: freeswitch/trunk/src/mod/xml_int/mod_xml_curl/Makefile ============================================================================== --- freeswitch/trunk/src/mod/xml_int/mod_xml_curl/Makefile (original) +++ freeswitch/trunk/src/mod/xml_int/mod_xml_curl/Makefile Sat Mar 17 01:49:57 2007 @@ -2,6 +2,6 @@ # local_all local_depend local_clean depend_install local_install local_distclean local_extraclean: # and define these variables to impact your build -MODNAME=mod_xml_curl + WANT_CURL=yes include ../../../../build/modmake.rules Modified: freeswitch/trunk/src/mod/xml_int/mod_xml_rpc/Makefile ============================================================================== --- freeswitch/trunk/src/mod/xml_int/mod_xml_rpc/Makefile (original) +++ freeswitch/trunk/src/mod/xml_int/mod_xml_rpc/Makefile Sat Mar 17 01:49:57 2007 @@ -1,4 +1,4 @@ -MODNAME=mod_xml_rpc + BASE=../../../.. XMLRPCLAS = $(BASE)/libs/xmlrpc-c/src/libxmlrpc.la $(BASE)/libs/xmlrpc-c/src/libxmlrpc_server.la

1 0

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

17 Mar '07

Author: mikej Date: Fri Mar 16 23:06:50 2007 New Revision: 4627 Modified: freeswitch/trunk/Makefile.am freeswitch/trunk/Makefile.in Log: we don't need to be so noisy Modified: freeswitch/trunk/Makefile.am ============================================================================== --- freeswitch/trunk/Makefile.am (original) +++ freeswitch/trunk/Makefile.am Fri Mar 16 23:06:50 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 Modified: freeswitch/trunk/Makefile.in ============================================================================== --- freeswitch/trunk/Makefile.in (original) +++ freeswitch/trunk/Makefile.in Fri Mar 16 23:06:50 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 \

1 0

[commit] r4626 - freeswitch/trunk/libs/pcre
by Freeswitch SVN 17 Mar '07

17 Mar '07

Author: mikej Date: Fri Mar 16 23:04:51 2007 New Revision: 4626 Modified: freeswitch/trunk/libs/pcre/INSTALL Log: ignore this commit.. for testing lib rebuilds. Modified: freeswitch/trunk/libs/pcre/INSTALL ============================================================================== --- freeswitch/trunk/libs/pcre/INSTALL (original) +++ freeswitch/trunk/libs/pcre/INSTALL Fri Mar 16 23:04:51 2007 @@ -183,3 +183,4 @@ script, and exit. `configure' also accepts some other, not widely useful, options. + \ No newline at end of file

1 0