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