March 2007 - Freeswitch-svn - FreeSWITCH Mailing Lists

[commit] r4586 - in freeswitch/trunk/src/mod: applications/mod_enum asr_tts/mod_cepstral asr_tts/mod_lumenvox codecs/mod_amr codecs/mod_g711 codecs/mod_g722 codecs/mod_g723_1 codecs/mod_g726 codecs/mod_g729 codecs/mod_gsm codecs/mod_ilbc codecs/mod_lpc10 codecs/mod_speex directories/mod_ldap endpoints/mod_dingaling endpoints/mod_iax endpoints/mod_portaudio endpoints/mod_sofia endpoints/mod_wanpipe event_handlers/mod_cdr event_handlers/mod_xmpp_event event_handlers/mod_zeroconf formats/mod_s
by Freeswitch SVN 13 Mar '07

13 Mar '07

Author: mikej Date: Tue Mar 13 14:23:49 2007 New Revision: 4586 Modified: 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: add support for doing make from the module directory of the in tree modules. 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 Tue Mar 13 14:23:49 2007 @@ -2,10 +2,11 @@ # local_all local_depend local_clean depend_install local_install local_distclean local_extraclean: # and define these variables to impact your build +MODNAME=mod_enum LOCAL_CFLAGS=-I$(BASE)/libs/udns LOCAL_LDFLAGS= LOCAL_OBJS=$(BASE)/libs/udns/libudns.a -include $(BASE)/build/modmake.rules +include ../../../../build/modmake.rules local_depend: cd $(BASE)/libs/udns && $(MAKE) staticlib 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 Tue Mar 13 14:23:49 2007 @@ -2,6 +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 @@ -10,5 +11,5 @@ LOCAL_CFLAGS += -I/opt/swift/include endif LOCAL_OBJS= -include $(BASE)/build/modmake.rules +include ../../../../build/modmake.rules 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 Tue Mar 13 14:23:49 2007 @@ -2,9 +2,10 @@ # 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 LOCAL_OBJS= -include $(BASE)/build/modmake.rules +include ../../../../build/modmake.rules 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 Tue Mar 13 14:23:49 2007 @@ -1,3 +1,4 @@ +MODNAME=mod_amr ifeq ($(shell ls -d $(BASE)/libs/amr),$(BASE)/libs/amr) LOCAL_CFLAGS += -I$(PREFIX)/include/amr @@ -9,4 +10,4 @@ endif -include $(BASE)/build/modmake.rules +include ../../../../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 Tue Mar 13 14:23:49 2007 @@ -2,9 +2,10 @@ # 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= -include $(BASE)/build/modmake.rules +include ../../../../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 Tue Mar 13 14:23:49 2007 @@ -2,10 +2,11 @@ # local_all local_depend local_clean depend_install local_install local_distclean local_extraclean: # and define these variables to impact your build +MODNAME=mod_g722 LOCAL_CFLAGS=-I$(BASE)/libs/codec/g7xx/src/include/ LOCAL_LDFLAGS=$(BASE)/libs/codec/g7xx/libg7xx.la LOCAL_OBJS= -include $(BASE)/build/modmake.rules +include ../../../../build/modmake.rules local_depend: cd $(BASE)/libs/codec/g7xx && $(MAKE) 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 Tue Mar 13 14:23:49 2007 @@ -1,7 +1,8 @@ +MODNAME=mod_g723_1 ifeq ($(shell ls -d $(BASE)/libs/libg723_1),$(BASE)/libs/libg723_1) LOCAL_CFLAGS += -I$(PREFIX)/include/g723 LOCAL_LDFLAGS +=-lg723 else LOCAL_CFLAGS += -DG723_PASSTHROUGH endif -include $(BASE)/build/modmake.rules +include ../../../../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 Tue Mar 13 14:23:49 2007 @@ -2,10 +2,11 @@ # local_all local_depend local_clean depend_install local_install local_distclean local_extraclean: # and define these variables to impact your build +MODNAME=mod_g726 LOCAL_CFLAGS=-I$(BASE)/libs/codec/g726/src LOCAL_LDFLAGS= LOCAL_OBJS=$(BASE)/libs/codec/g726/libg726.la -include $(BASE)/build/modmake.rules +include ../../../../build/modmake.rules local_depend: cd $(BASE)/libs/codec/g726 && $(MAKE) 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 Tue Mar 13 14:23:49 2007 @@ -1,3 +1,4 @@ +MODNAME=mod_g729 ifeq ($(shell ls -d $(BASE)/libs/libg729),$(BASE)/libs/libg729) LOCAL_CFLAGS += -I$(PREFIX)/include/libg729 LOCAL_LDFLAGS +=-lg729 @@ -5,4 +6,4 @@ LOCAL_CFLAGS += -DG729_PASSTHROUGH endif -include $(BASE)/build/modmake.rules +include ../../../../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 Tue Mar 13 14:23:49 2007 @@ -2,10 +2,11 @@ # local_all local_depend local_clean depend_install local_install local_distclean local_extraclean: # and define these variables to impact your build +MODNAME=mod_gsm LOCAL_CFLAGS=-I$(BASE)/libs/codec/gsm/inc LOCAL_LDFLAGS=$(BASE)/libs/codec/gsm/libgsm.la LOCAL_OBJS= -include $(BASE)/build/modmake.rules +include ../../../../build/modmake.rules local_depend: cd $(BASE)/libs/codec/gsm && $(MAKE) 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 Tue Mar 13 14:23:49 2007 @@ -2,10 +2,11 @@ # local_all local_depend local_clean depend_install local_install local_distclean local_extraclean: # and define these variables to impact your build +MODNAME=mod_ilbc LOCAL_CFLAGS=-I$(BASE)/libs/codec/ilbc/src LOCAL_LDFLAGS=$(BASE)/libs/codec/ilbc/libilbc.la LOCAL_OBJS= -include $(BASE)/build/modmake.rules +include ../../../../build/modmake.rules local_depend: cd $(BASE)/libs/codec/ilbc && $(MAKE) 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 Tue Mar 13 14:23:49 2007 @@ -2,10 +2,11 @@ # local_all local_depend local_clean depend_install local_install local_distclean local_extraclean: # and define these variables to impact your build +MODNAME=mod_lpc10 LOCAL_CFLAGS=-I$(BASE)/libs/codec/lpc10/src LOCAL_LDFLAGS=$(BASE)/libs/codec/lpc10/liblpc10.la LOCAL_OBJS= -include $(BASE)/build/modmake.rules +include ../../../../build/modmake.rules local_depend: cd $(BASE)/libs/codec/lpc10 && $(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 Tue Mar 13 14:23:49 2007 @@ -2,10 +2,11 @@ # 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 LOCAL_CFLAGS=-I$(BASE)/libs/speex/include LOCAL_LDFLAGS=$(BASE)/libs/speex/libspeex/libspeex.la LOCAL_OBJS= -include $(BASE)/build/modmake.rules +include ../../../../build/modmake.rules local_depend: cd $(BASE)/libs/speex && $(MAKE) 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 Tue Mar 13 14:23:49 2007 @@ -2,10 +2,11 @@ # local_all local_depend local_clean depend_install local_install local_distclean local_extraclean: # and define these variables to impact your build +MODNAME=mod_ldap LOCAL_CFLAGS=-DWITH_OPENLDAP -DLDAP_DEPRECATED LOCAL_LDFLAGS=-lldap_r -llber LOCAL_OBJS= -include $(BASE)/build/modmake.rules +include ../../../../build/modmake.rules local_depend: MAKE=$(MAKE) $(BASE)/build/buildlib.sh $(BASE) install openldap-2.3.19.tgz --prefix=$(PREFIX) --disable-bdb --disable-hdb 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 Tue Mar 13 14:23:49 2007 @@ -2,10 +2,11 @@ # 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 LOCAL_CFLAGS=-I$(BASE)/libs/libdingaling/src LOCAL_LDFLAGS=$(BASE)/libs/libdingaling/libdingaling.la LOCAL_OBJS= -include $(BASE)/build/modmake.rules +include ../../../../build/modmake.rules local_depend: cd $(BASE)/libs/iksemel && $(MAKE) 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 Tue Mar 13 14:23:49 2007 @@ -2,10 +2,11 @@ # 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 LOCAL_CFLAGS=-I$(BASE)/libs/iax/src LOCAL_LDFLAGS=$(BASE)/libs/iax/src/libiax.la LOCAL_OBJS= -include $(BASE)/build/modmake.rules +include ../../../../build/modmake.rules local_depend: cd $(BASE)/libs/iax && $(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 Tue Mar 13 14:23:49 2007 @@ -2,6 +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_portaudio LOCAL_CFLAGS=-I. -I$(BASE)/libs/portaudio/include LOCAL_LDFLAGS=$(BASE)/libs/portaudio/lib/libportaudio.la ifeq ($(OSARCH),Darwin) @@ -9,7 +10,7 @@ endif LOCAL_OBJS=pablio.o pa_ringbuffer.o -include $(BASE)/build/modmake.rules +include ../../../../build/modmake.rules local_depend: cd $(BASE)/libs/portaudio && $(MAKE) 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 Tue Mar 13 14:23:49 2007 @@ -1,3 +1,4 @@ +MODNAME=mod_sofia 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 @@ -16,7 +17,7 @@ LOCAL_LDFLAGS +=-framework CoreFoundation -framework SystemConfiguration endif -include $(BASE)/build/modmake.rules +include ../../../../build/modmake.rules local_depend: cd $(BASE)/libs/sofia-sip && $(MAKE) 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 Tue Mar 13 14:23:49 2007 @@ -2,11 +2,12 @@ # 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 LOCAL_OBJS=ss7boost_client.o -include $(BASE)/build/modmake.rules +include ../../../../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_cdr/Makefile ============================================================================== --- freeswitch/trunk/src/mod/event_handlers/mod_cdr/Makefile (original) +++ freeswitch/trunk/src/mod/event_handlers/mod_cdr/Makefile Tue Mar 13 14:23:49 2007 @@ -2,6 +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 @@ -15,4 +16,4 @@ LOCAL_OBJS += mysqlcdr.o endif -include $(BASE)/build/modmake.rules +include ../../../../build/modmake.rules 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 Tue Mar 13 14:23:49 2007 @@ -2,10 +2,11 @@ # 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 LOCAL_CFLAGS=-I$(BASE)/libs/iksemel/include LOCAL_LDFLAGS=$(BASE)/libs/iksemel/src/libiksemel.la LOCAL_OBJS= -include $(BASE)/build/modmake.rules +include ../../../../build/modmake.rules local_depend: cd $(BASE)/libs/iksemel && $(MAKE) 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 Tue Mar 13 14:23:49 2007 @@ -2,10 +2,11 @@ # local_all local_depend local_clean depend_install local_install local_distclean local_extraclean: # and define these variables to impact your build +MODNAME=mod_zeroconf LOCAL_CFLAGS=-I$(PREFIX)/include/howl LOCAL_LDFLAGS=-lhowl LOCAL_OBJS= -include $(BASE)/build/modmake.rules +include ../../../../build/modmake.rules local_depend: $(BASE)/build/buildlib.sh $(BASE) install howl-1.0.0.tar.gz --prefix=$(PREFIX) 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 Tue Mar 13 14:23:49 2007 @@ -2,6 +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_shout LAME=lame-3.97 SHOUT=libshout-2.2.2 LAMELA=$(BASE)/libs/$(LAME)/libmp3lame/libmp3lame.la @@ -13,7 +14,7 @@ LOCAL_OBJS=$(MP3OBJS) DEFAULT_ARGS=--prefix=$(PREFIX) --disable-shared --with-pic -include $(BASE)/build/modmake.rules +include ../../../../build/modmake.rules $(LAMELA): MAKE="$(MAKE)" $(BASE)/build/buildlib.sh $(BASE) $(LAME).tar.gz $(DEFAULT_ARGS) --disable-decoder 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 Tue Mar 13 14:23:49 2007 @@ -2,10 +2,11 @@ # local_all local_depend local_clean depend_install local_install local_distclean local_extraclean: # and define these variables to impact your build +MONAME=mod_sndfile LOCAL_CFLAGS=-I$(BASE)/libs/libsndfile/src LOCAL_LDFLAGS=$(BASE)/libs/libsndfile/src/libsndfile.la LOCAL_OBJS= -include $(BASE)/build/modmake.rules +include ../../../../build/modmake.rules local_depend: cd $(BASE)/libs/libsndfile && $(MAKE) 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 Tue Mar 13 14:23:49 2007 @@ -1,3 +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 @@ -6,7 +7,7 @@ LOCAL_CFLAGS=`$(PREFIX)/bin/pkg-config --cflags mono` LOCAL_LDFLAGS=`$(PREFIX)/bin/pkg-config --libs mono` -include $(BASE)/build/modmake.rules +include ../../../../build/modmake.rules local_depend: MAKE=$(MAKE) $(BASE)/build/buildlib.sh $(BASE) configure install $(GETTEXT_TARBALL) --prefix=$(PREFIX) --with-pic 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 Tue Mar 13 14:23:49 2007 @@ -2,10 +2,11 @@ # 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 -include $(BASE)/build/modmake.rules +include ../../../../build/modmake.rules PERL = $(shell which perl) PERL_LIBDIR =-L$(shell perl -MConfig -e 'print $$Config{archlib}')/CORE 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 Tue Mar 13 14:23:49 2007 @@ -2,10 +2,11 @@ # 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 -include $(BASE)/build/modmake.rules +include ../../../../build/modmake.rules PYMOD=freeswitch 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 Tue Mar 13 14:23:49 2007 @@ -1,9 +1,9 @@ - +MODNAME=mod_spidermonkey include sm.mak LOCAL_CFLAGS += -I$(BASE)/libs/curl/include LOCAL_LDFLAGS += $(BASE)/libs/curl/lib/libcurl.la -include $(BASE)/build/modmake.rules +include ../../../../build/modmake.rules local_depend: cd $(BASE)/libs/curl && $(MAKE) 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 Tue Mar 13 14:23:49 2007 @@ -1,2 +1,3 @@ include ../mod_spidermonkey/sm.mak -include $(BASE)/build/modmake.rules +MODNAME=mod_spidermonkey_core_db +include ../../../../build/modmake.rules 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 Tue Mar 13 14:23:49 2007 @@ -3,10 +3,11 @@ # local_all local_depend local_clean depend_install local_install local_distclean local_extraclean: # and define these variables to impact your build +MODNAME=mod_spidermonkey_etpan #LOCAL_CFLAGS= LOCAL_LDFLAGS+=-letpan #LOCAL_OBJS= -include $(BASE)/build/modmake.rules +include ../../../../build/modmake.rules local_depend: MAKE=$(MAKE) $(BASE)/build/buildlib.sh $(BASE) install libetpan --prefix=$(PREFIX) 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 Tue Mar 13 14:23:49 2007 @@ -3,10 +3,11 @@ # local_all local_depend local_clean depend_install local_install local_distclean local_extraclean: # and define these variables to impact your build +MODNAME=mod_spidermonkey_odbc #LOCAL_CFLAGS= LOCAL_LDFLAGS+=-lodbc #LOCAL_OBJS= -include $(BASE)/build/modmake.rules +include ../../../../build/modmake.rules local_depend: MAKE=$(MAKE) $(BASE)/build/buildlib.sh $(BASE) install unixODBC-2.2.12.tar.gz --prefix=$(PREFIX) --disable-gui --without-x --with-pic 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 Tue Mar 13 14:23:49 2007 @@ -1,3 +1,4 @@ include ../mod_spidermonkey/sm.mak -include $(BASE)/build/modmake.rules +MODNAME=mod_spidermonkey_skel +include ../../../../build/modmake.rules 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 Tue Mar 13 14:23:49 2007 @@ -1,5 +1,5 @@ - +MODNAME=mod_spidermonkey_teletone include ../mod_spidermonkey/sm.mak LOCAL_CFLAGS+=-I$(BASE)/libs/libteletone/src LOCAL_LDFLAGS+=$(BASE)/libs/libteletone/libteletone.la -include $(BASE)/build/modmake.rules +include ../../../../build/modmake.rules 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 Tue Mar 13 14:23:49 2007 @@ -2,10 +2,11 @@ # 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 LOCAL_CFLAGS=-I$(BASE)/libs/curl/include LOCAL_LDFLAGS=$(BASE)/libs/curl/lib/libcurl.la LOCAL_OBJS= -include $(BASE)/build/modmake.rules +include ../../../../build/modmake.rules local_depend: cd $(BASE)/libs/curl && $(MAKE) 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 Tue Mar 13 14:23:49 2007 @@ -1,11 +1,11 @@ - +MODNAME=mod_xml_rpc LOCAL_LDFLAGS = $(BASE)/libs/xmlrpc-c/src/libxmlrpc.la $(BASE)/libs/xmlrpc-c/src/libxmlrpc_server.la LOCAL_LDFLAGS += $(BASE)/libs/xmlrpc-c/src/libxmlrpc_server_abyss.la $(BASE)/libs/xmlrpc-c/lib/abyss/src/libxmlrpc_abyss.la LOCAL_LDFLAGS += $(BASE)/libs/xmlrpc-c/lib/expat/xmlparse/libxmlrpc_xmlparse.la LOCAL_CFLAGS=-I$(BASE)/libs/xmlrpc-c/include -include $(BASE)/build/modmake.rules +include ../../../../build/modmake.rules local_depend: cd $(BASE)/libs/xmlrpc-c && $(MAKE)

1 0

[commit] r4585 - freeswitch/trunk/src/mod/endpoints/mod_wanpipe
by Freeswitch SVN 13 Mar '07

13 Mar '07

Author: anthm Date: Tue Mar 13 13:58:55 2007 New Revision: 4585 Modified: freeswitch/trunk/src/mod/endpoints/mod_wanpipe/Makefile Log: oops forgot to commit 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 Tue Mar 13 13:58:55 2007 @@ -3,8 +3,8 @@ # and define these variables to impact your build 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 -LOCAL_LDFLAGS=-lsangoma +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 $(BASE)/build/modmake.rules

1 0

[commit] r4584 - freeswitch/trunk/build
by Freeswitch SVN 13 Mar '07

13 Mar '07

Author: mikej Date: Tue Mar 13 13:46:44 2007 New Revision: 4584 Modified: freeswitch/trunk/build/modmake.rules.in Log: get the include directory right in generated makefiles for both in tree and out of tree modules Modified: freeswitch/trunk/build/modmake.rules.in ============================================================================== --- freeswitch/trunk/build/modmake.rules.in (original) +++ freeswitch/trunk/build/modmake.rules.in Tue Mar 13 13:46:44 2007 @@ -48,9 +48,10 @@ extraclean: distclean local_extraclean Makefile: - @if test ! -f $@; then \ + if test ! -f $@; then \ echo MODNAME=$(MODNAME) > Makefile ; \ - echo include $(switch_srcdir)/build/modmake.rules >> Makefile ; \ + if ! pwd | grep $(switch_srcdir)/src/mod ; then rulesdir=$(switch_srcdir) ; else rulesdir=../../../.. ; fi ; \ + echo include $$rulesdir/build/modmake.rules >> Makefile ; \ fi ; $(MODNAME).$(DYNAMIC_LIB_EXTEN): $(MODNAME).o $(LOCAL_OBJS) $(SOURCEFILE)

1 0

[commit] r4583 - in freeswitch/trunk: build src/mod
by Freeswitch SVN 13 Mar '07

13 Mar '07

Author: mikej Date: Tue Mar 13 12:49:15 2007 New Revision: 4583 Modified: freeswitch/trunk/build/modmake.rules.in freeswitch/trunk/src/mod/Makefile.am freeswitch/trunk/src/mod/Makefile.in Log: allow you to export var MODULES that will override what is in modules.conf for that build. work a little harder to try to make it so you can do make in a module directory. More on that later Modified: freeswitch/trunk/build/modmake.rules.in ============================================================================== --- freeswitch/trunk/build/modmake.rules.in (original) +++ freeswitch/trunk/build/modmake.rules.in Tue Mar 13 12:49:15 2007 @@ -49,7 +49,8 @@ Makefile: @if test ! -f $@; then \ - echo include $(switch_srcdir)/build/modmake.rules > Makefile ; \ + echo MODNAME=$(MODNAME) > Makefile ; \ + echo include $(switch_srcdir)/build/modmake.rules >> Makefile ; \ fi ; $(MODNAME).$(DYNAMIC_LIB_EXTEN): $(MODNAME).o $(LOCAL_OBJS) $(SOURCEFILE) Modified: freeswitch/trunk/src/mod/Makefile.am ============================================================================== --- freeswitch/trunk/src/mod/Makefile.am (original) +++ freeswitch/trunk/src/mod/Makefile.am Tue Mar 13 12:49:15 2007 @@ -1,41 +1,42 @@ -MODULES = `grep -v "\#" $(switch_builddir)/modules.conf` +CONF_MODULES=$(shell grep -v "\#" $(switch_builddir)/modules.conf) +FOUND_MODULES=$(shell find . -type d -name mod_\*) +OUR_MODULES=`if test -z $(MODULES) ; then echo $(CONF_MODULES) ; else echo $(MODULES) ; fi ;` +OUR_CLEAN_MODULES=`if test -z $(MODULES) ; then echo $(CONF_MODULES) $(FOUND_MODULES) ; else echo $(MODULES) ; fi ;` +MOD_NAME=`echo $$i | sed -e 's|^.*/||'` +MOD_DIR=`if test -d $(switch_srcdir)/src/mod/$$i ; then echo $(switch_srcdir)/src/mod/$$i ; else echo $$i ; fi;` + all: @if [ ! -f $(switch_builddir)/modules.conf ] ; then cp $(switch_builddir)/modules.conf.in $(switch_builddir)/modules.conf ; fi @echo making modules - @for i in $(MODULES) ; do \ + @for i in $(OUR_MODULES) ; do \ echo making $$i ; \ - modname=`echo $$i | sed "s/^.*\///g"`; \ - if test -z $$modname ; then modname=$$i ; fi; \ - if test -d $(switch_srcdir)/src/mod/$$i ; then moddir=$(switch_srcdir)/src/mod/$$i ; else moddir=$$i ; fi; \ + moddir=$(MOD_DIR); \ + echo $(MOD_NAME); \ if test -f $$moddir/Makefile ; then \ - cd $$moddir && MODNAME=$$modname BASE=$(switch_builddir) $(MAKE) ; else \ - cd $$moddir && MODNAME=$$modname BASE=$(switch_builddir) $(MAKE) -f $(switch_builddir)/build/modmake.rules ; \ + cd $$moddir && MODNAME=$(MOD_NAME) BASE=$(switch_builddir) $(MAKE) ; else \ + cd $$moddir && MODNAME=$(MOD_NAME) BASE=$(switch_builddir) $(MAKE) -f $(switch_builddir)/build/modmake.rules ; \ fi; \ done clean: - @for i in `find . -type d -name mod_\*` ; do \ + @for i in $(OUR_CLEAN_MODULES) ; do \ echo making clean $$i ; \ - modname=`echo $$i | sed "s/^.*\///g"`; \ - if test -z $$modname ; then modname=$$i ; fi; \ - if test -d $(switch_srcdir)/src/mod/$$i ; then moddir=$(switch_srcdir)/src/mod/$$i ; else moddir=$$i ; fi; \ + moddir=$(MOD_DIR); \ if test -f $$moddir/Makefile ; then \ - cd $$moddir && MODNAME=$$modname BASE=$(switch_builddir) $(MAKE) clean ; else \ - cd $$moddir && MODNAME=$$modname BASE=$(switch_builddir) $(MAKE) -f $(switch_builddir)/build/modmake.rules clean ; \ + cd $$moddir && MODNAME=$(MOD_NAME) BASE=$(switch_builddir) $(MAKE) clean ; else \ + cd $$moddir && MODNAME=$(MOD_NAME) BASE=$(switch_builddir) $(MAKE) -f $(switch_builddir)/build/modmake.rules clean ; \ fi; \ done install: @echo Installing Modules - @for i in $(MODULES) ; do \ + @for i in $(OUR_MODULES) ; do \ echo making install $$i ; \ - modname=`echo $$i | sed "s/^.*\///g"`; \ - if test -z $$modname ; then modname=$$i ; fi; \ - if test -d $(switch_srcdir)/src/mod/$$i ; then moddir=$(switch_srcdir)/src/mod/$$i ; else moddir=$$i ; fi; \ + moddir=$(MOD_DIR); \ if test -f $$moddir/Makefile ; then \ - cd $$moddir && MODNAME=$$modname BASE=$(switch_builddir) $(MAKE) install ; else \ - cd $$moddir && MODNAME=$$modname BASE=$(switch_builddir) $(MAKE) -f $(switch_builddir)/build/modmake.rules clean ; \ + cd $$moddir && MODNAME=$(MOD_NAME) BASE=$(switch_builddir) $(MAKE) install ; else \ + cd $$moddir && MODNAME=$(MOD_NAME) BASE=$(switch_builddir) $(MAKE) -f $(switch_builddir)/build/modmake.rules clean ; \ fi; \ done @echo done Modified: freeswitch/trunk/src/mod/Makefile.in ============================================================================== --- freeswitch/trunk/src/mod/Makefile.in (original) +++ freeswitch/trunk/src/mod/Makefile.in Tue Mar 13 12:49:15 2007 @@ -182,7 +182,12 @@ target_alias = @target_alias@ uint64_t_fmt = @uint64_t_fmt@ voidp_size = @voidp_size@ -MODULES = `grep -v "\#" $(switch_builddir)/modules.conf` +CONF_MODULES = $(shell grep -v "\#" $(switch_builddir)/modules.conf) +FOUND_MODULES = $(shell find . -type d -name mod_\*) +OUR_MODULES = `if test -z $(MODULES) ; then echo $(CONF_MODULES) ; else echo $(MODULES) ; fi ;` +OUR_CLEAN_MODULES = `if test -z $(MODULES) ; then echo $(CONF_MODULES) $(FOUND_MODULES) ; else echo $(MODULES) ; fi ;` +MOD_NAME = `echo $$i | sed -e 's|^.*/||'` +MOD_DIR = `if test -d $(switch_srcdir)/src/mod/$$i ; then echo $(switch_srcdir)/src/mod/$$i ; else echo $$i ; fi;` all: all-am .SUFFIXES: @@ -344,39 +349,34 @@ all: @if [ ! -f $(switch_builddir)/modules.conf ] ; then cp $(switch_builddir)/modules.conf.in $(switch_builddir)/modules.conf ; fi @echo making modules - @for i in $(MODULES) ; do \ + @for i in $(OUR_MODULES) ; do \ echo making $$i ; \ - modname=`echo $$i | sed "s/^.*\///g"`; \ - if test -z $$modname ; then modname=$$i ; fi; \ - if test -d $(switch_srcdir)/src/mod/$$i ; then moddir=$(switch_srcdir)/src/mod/$$i ; else moddir=$$i ; fi; \ + moddir=$(MOD_DIR); \ + echo $(MOD_NAME); \ if test -f $$moddir/Makefile ; then \ - cd $$moddir && MODNAME=$$modname BASE=$(switch_builddir) $(MAKE) ; else \ - cd $$moddir && MODNAME=$$modname BASE=$(switch_builddir) $(MAKE) -f $(switch_builddir)/build/modmake.rules ; \ + cd $$moddir && MODNAME=$(MOD_NAME) BASE=$(switch_builddir) $(MAKE) ; else \ + cd $$moddir && MODNAME=$(MOD_NAME) BASE=$(switch_builddir) $(MAKE) -f $(switch_builddir)/build/modmake.rules ; \ fi; \ done clean: - @for i in `find . -type d -name mod_\*` ; do \ + @for i in $(OUR_CLEAN_MODULES) ; do \ echo making clean $$i ; \ - modname=`echo $$i | sed "s/^.*\///g"`; \ - if test -z $$modname ; then modname=$$i ; fi; \ - if test -d $(switch_srcdir)/src/mod/$$i ; then moddir=$(switch_srcdir)/src/mod/$$i ; else moddir=$$i ; fi; \ + moddir=$(MOD_DIR); \ if test -f $$moddir/Makefile ; then \ - cd $$moddir && MODNAME=$$modname BASE=$(switch_builddir) $(MAKE) clean ; else \ - cd $$moddir && MODNAME=$$modname BASE=$(switch_builddir) $(MAKE) -f $(switch_builddir)/build/modmake.rules clean ; \ + cd $$moddir && MODNAME=$(MOD_NAME) BASE=$(switch_builddir) $(MAKE) clean ; else \ + cd $$moddir && MODNAME=$(MOD_NAME) BASE=$(switch_builddir) $(MAKE) -f $(switch_builddir)/build/modmake.rules clean ; \ fi; \ done install: @echo Installing Modules - @for i in $(MODULES) ; do \ + @for i in $(OUR_MODULES) ; do \ echo making install $$i ; \ - modname=`echo $$i | sed "s/^.*\///g"`; \ - if test -z $$modname ; then modname=$$i ; fi; \ - if test -d $(switch_srcdir)/src/mod/$$i ; then moddir=$(switch_srcdir)/src/mod/$$i ; else moddir=$$i ; fi; \ + moddir=$(MOD_DIR); \ if test -f $$moddir/Makefile ; then \ - cd $$moddir && MODNAME=$$modname BASE=$(switch_builddir) $(MAKE) install ; else \ - cd $$moddir && MODNAME=$$modname BASE=$(switch_builddir) $(MAKE) -f $(switch_builddir)/build/modmake.rules clean ; \ + cd $$moddir && MODNAME=$(MOD_NAME) BASE=$(switch_builddir) $(MAKE) install ; else \ + cd $$moddir && MODNAME=$(MOD_NAME) BASE=$(switch_builddir) $(MAKE) -f $(switch_builddir)/build/modmake.rules clean ; \ fi; \ done @echo done

1 0

[commit] r4582 - freeswitch/trunk/src/mod/languages/mod_spidermonkey
by Freeswitch SVN 13 Mar '07

13 Mar '07

Author: brian Date: Tue Mar 13 12:39:30 2007 New Revision: 4582 Modified: freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c Log: fix type Modified: freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c (original) +++ freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c Tue Mar 13 12:39:30 2007 @@ -1301,7 +1301,7 @@ JS_ValueToInt32(cx, argv[0], &digits); if (digits > sizeof(buf) - 1) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Exceeded max digits of %d\n", sizeof(buf) - 1); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Exceeded max digits of %ld\n", sizeof(buf) - 1); return JS_FALSE; }

1 0

[commit] r4581 - freeswitch/trunk/src/mod/formats/mod_shout
by Freeswitch SVN 13 Mar '07

13 Mar '07

Author: anthm Date: Tue Mar 13 12:19:39 2007 New Revision: 4581 Modified: freeswitch/trunk/src/mod/formats/mod_shout/Makefile freeswitch/trunk/src/mod/formats/mod_shout/mod_shout.c Log: build update 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 Tue Mar 13 12:19:39 2007 @@ -2,16 +2,32 @@ # local_all local_depend local_clean depend_install local_install local_distclean local_extraclean: # and define these variables to impact your build -LOCAL_CFLAGS=-I$(BASE)/libs/curl/include -LOCAL_LDFLAGS=-lshout -lmp3lame $(BASE)/libs/curl/lib/libcurl.la -LOCAL_OBJS= -include $(BASE)/build/modmake.rules +LAME=lame-3.97 +SHOUT=libshout-2.2.2 +LAMELA=$(BASE)/libs/$(LAME)/libmp3lame/libmp3lame.la +SHOUTLA=$(BASE)/libs/$(SHOUT)/src/libshout.la +CURLLA=$(BASE)/libs/curl/lib/libcurl.la +LOCAL_CFLAGS=-I$(BASE)/libs/curl/include -I$(BASE)/libs/$(SHOUT)/include -I$(BASE)/libs/$(LAME)/include +LOCAL_LDFLAGS=$(LAMELA) $(SHOUTLA) $(CURLLA) MP3OBJS=common.o dct64_i386.o decode_ntom.o layer3.o tabinit.o interface.o +LOCAL_OBJS=$(MP3OBJS) +DEFAULT_ARGS=--prefix=$(PREFIX) --disable-shared --with-pic -%.o: %.c - $(CC) $(ALL_CFLAGS) -c -o $@ $< +include $(BASE)/build/modmake.rules -local_depend: $(MP3OBJS) - MAKE=$(MAKE) $(BASE)/build/buildlib.sh $(BASE) install lame-3.97.tar.gz --prefix=$(PREFIX) --disable-shared --with-pic - MOD_CFLAGS="${ALL_CFLAGS}" MOD_LDFLAGS="${LD_CFLAGS}" MAKE=$(MAKE) $(BASE)/build/buildlib.sh $(BASE) install libshout-2.2.2.tar.gz --disable-shared --with-pic --prefix=$(PREFIX) +$(LAMELA): + MAKE="$(MAKE)" $(BASE)/build/buildlib.sh $(BASE) $(LAME).tar.gz $(DEFAULT_ARGS) --disable-decoder + +$(SHOUTLA): + MAKE="$(MAKE)" MOD_CFLAGS="${ALL_CFLAGS}" MOD_LDFLAGS="${LD_CFLAGS}" $(BASE)/build/buildlib.sh $(BASE) $(SHOUT).tar.gz $(DEFAULT_ARGS) + +$(CURLLA): cd $(BASE)/libs/curl && $(MAKE) + +%.o: %.c + $(CC) $(ALL_CFLAGS) -c -o $@ $< + +local_depend: $(LAMELA) $(SHOUTLA) $(MP3OBJS) + + + Modified: freeswitch/trunk/src/mod/formats/mod_shout/mod_shout.c ============================================================================== --- freeswitch/trunk/src/mod/formats/mod_shout/mod_shout.c (original) +++ freeswitch/trunk/src/mod/formats/mod_shout/mod_shout.c Tue Mar 13 12:19:39 2007 @@ -34,7 +34,7 @@ #include "mpglib.h" #include <switch.h> #include <shout/shout.h> -#include <lame/lame.h> +#include <lame.h> #include <curl/curl.h>

1 0

[commit] r4580 - freeswitch/trunk/build
by Freeswitch SVN 13 Mar '07

13 Mar '07

Author: mikej Date: Tue Mar 13 10:43:40 2007 New Revision: 4580 Modified: freeswitch/trunk/build/modmake.rules.in Log: fix module builds to not have to rebuild every time you run make Modified: freeswitch/trunk/build/modmake.rules.in ============================================================================== --- freeswitch/trunk/build/modmake.rules.in (original) +++ freeswitch/trunk/build/modmake.rules.in Tue Mar 13 10:43:40 2007 @@ -38,18 +38,21 @@ CURDIR=$(shell pwd) CSOURCEFILE=$(CURDIR)/$(MODNAME).c CXXSOURCEFILE=$(CURDIR)/$(MODNAME).cpp -#LINK_TYPE=$(shell if test -f $(CSOURCEFILE); then echo "clink"; else echo "cxxlink"; fi;) +SOURCEFILE=$(shell if test -f $(CSOURCEFILE); then echo $(CSOURCEFILE); else echo $(CXXSOURCEFILE); fi;) -all: depend $(MODNAME).$(DYNAMIC_LIB_EXTEN) local_all +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 distclean: clean local_distclean extraclean: distclean local_extraclean -$(MODNAME).o: depend +Makefile: + @if test ! -f $@; then \ + echo include $(switch_srcdir)/build/modmake.rules > Makefile ; \ + fi ; -$(MODNAME).$(DYNAMIC_LIB_EXTEN): $(MODNAME).o $(LOCAL_OBJS) +$(MODNAME).$(DYNAMIC_LIB_EXTEN): $(MODNAME).o $(LOCAL_OBJS) $(SOURCEFILE) @if test -f $(CSOURCEFILE); then \ echo $(LINK) $(SOLINK) $(MODNAME).o -o $(MODNAME).$(DYNAMIC_LIB_EXTEN) $(LIBS) $(LOCAL_LDFLAGS) $(LOCAL_OBJS); \ $(LINK) $(SOLINK) $(MODNAME).o -o $(MODNAME).$(DYNAMIC_LIB_EXTEN) $(LIBS) $(LOCAL_LDFLAGS) $(LOCAL_OBJS); \

1 0

[commit] r4579 - freeswitch/trunk
by Freeswitch SVN 13 Mar '07

13 Mar '07

Author: mikej Date: Tue Mar 13 02:44:30 2007 New Revision: 4579 Modified: freeswitch/trunk/Makefile.am freeswitch/trunk/Makefile.in Log: add 'make update' target Modified: freeswitch/trunk/Makefile.am ============================================================================== --- freeswitch/trunk/Makefile.am (original) +++ freeswitch/trunk/Makefile.am Tue Mar 13 02:44:30 2007 @@ -127,6 +127,15 @@ fi ; \ fi ; +update: + @if test -d .svn ; then \ + test ! -f .version || rm -f .version ; \ + echo Updating... ; \ + svn update ; \ + else \ + echo "This source directory is not an svn working copy" ; \ + fi + .nodepends: touch .nodepends Modified: freeswitch/trunk/Makefile.in ============================================================================== --- freeswitch/trunk/Makefile.in (original) +++ freeswitch/trunk/Makefile.in Tue Mar 13 02:44:30 2007 @@ -1103,6 +1103,15 @@ fi ; \ fi ; +update: + @if test -d .svn ; then \ + test ! -f .version || rm -f .version ; \ + echo Updating... ; \ + svn update ; \ + else \ + echo "This source directory is not an svn working copy" ; \ + fi + .nodepends: touch .nodepends

1 0

[commit] r4578 - in freeswitch/trunk: . build
by Freeswitch SVN 13 Mar '07

13 Mar '07

Author: mikej Date: Tue Mar 13 02:17:58 2007 New Revision: 4578 Removed: freeswitch/trunk/build/addenv.sh freeswitch/trunk/build/build.sh freeswitch/trunk/build/checkversion.sh Modified: freeswitch/trunk/Makefile.am freeswitch/trunk/Makefile.in freeswitch/trunk/configure freeswitch/trunk/configure.in Log: Fix re-generation of switch_version.h remove some un-used and un-necessary shell scripts Modified: freeswitch/trunk/Makefile.am ============================================================================== --- freeswitch/trunk/Makefile.am (original) +++ freeswitch/trunk/Makefile.am Tue Mar 13 02:17:58 2007 @@ -61,7 +61,6 @@ src/include/switch_types.h\ src/include/switch_utils.h\ src/include/switch_rtp.h\ -src/include/switch_version.h\ src/include/switch_stun.h\ src/include/switch_log.h\ src/include/switch_xml.h @@ -91,10 +90,11 @@ MOD_LINK = $(BASE)/libfreeswitch.la CLEANFILES = src/include/switch_version.h +BUILT_SOURCES = src/include/switch_version.h bin_PROGRAMS = freeswitch -freeswitch_SOURCES = src/switch.c\ - src/include/switch_version.h +freeswitch_SOURCES = src/switch.c +nodist_freeswitch_SOURCES = src/include/switch_version.h freeswitch_CFLAGS = $(AM_CFLAGS) freeswitch_LDADD = ${MOD_LINK} @@ -112,12 +112,20 @@ $(INSTALL) ./$(NAME) $(DESTDIR)$(PREFIX)/bin/$(NAME) ;\ fi -version: Makefile src/include/switch_version.h - MAKE=$(MAKE) ./build/checkversion.sh +.version: + touch .version -newversion: Makefile - MAKE=$(MAKE) ./build/checkversion.sh force - $(MAKE) +src/include/switch_version.h: $(top_srcdir)/src/include/switch_version.h.in .version $(libfreeswitch_la_SOURCES) $(library_include_HEADERS) + @if test ! -f .noversion ; then \ + force=0 ; \ + version=`svnversion . -n || echo hacked` ; \ + oldversion=`cat .version 2>/dev/null || echo "0"` ; \ + test ! -f src/include/switch_version.h || grep "@SVN_VERSION@" src/include/switch_version.h && force=1 ; \ + if test "$$oldversion" != "$$version" || test $$force = 1 ; then \ + cat src/include/switch_version.h.in | sed "s/@SVN_VERSION@/$$version/g" > src/include/switch_version.h ; \ + echo $$version > .version ; \ + fi ; \ + fi ; .nodepends: touch .nodepends @@ -148,7 +156,7 @@ teletone: cd libs/libteletone && $(MAKE) -deps: version sqlite apr apr-util pcre srtp resample teletone +deps: sqlite apr apr-util pcre srtp resample teletone core: deps libfreeswitch.la Modified: freeswitch/trunk/Makefile.in ============================================================================== --- freeswitch/trunk/Makefile.in (original) +++ freeswitch/trunk/Makefile.in Tue Mar 13 02:17:58 2007 @@ -16,7 +16,7 @@ -SOURCES = $(libfreeswitch_la_SOURCES) $(nodist_libfreeswitch_la_SOURCES) $(freeswitch_SOURCES) +SOURCES = $(libfreeswitch_la_SOURCES) $(nodist_libfreeswitch_la_SOURCES) $(freeswitch_SOURCES) $(nodist_freeswitch_SOURCES) srcdir = @srcdir@ top_srcdir = @top_srcdir@ @@ -46,8 +46,7 @@ $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ $(top_srcdir)/build/modmake.rules.in $(top_srcdir)/configure \ $(top_srcdir)/src/include/switch_am_config.h.in \ - $(top_srcdir)/src/include/switch_private.h.in \ - $(top_srcdir)/src/include/switch_version.h.in AUTHORS COPYING \ + $(top_srcdir)/src/include/switch_private.h.in AUTHORS COPYING \ ChangeLog INSTALL NEWS build/config/compile \ build/config/config.guess build/config/config.sub \ build/config/depcomp build/config/install-sh \ @@ -70,7 +69,7 @@ mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/src/include/switch_private.h CONFIG_CLEAN_FILES = src/include/switch_am_config.h \ - build/modmake.rules src/include/switch_version.h + build/modmake.rules am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; am__vpath_adj = case $$p in \ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ @@ -109,7 +108,9 @@ binPROGRAMS_INSTALL = $(INSTALL_PROGRAM) PROGRAMS = $(bin_PROGRAMS) am_freeswitch_OBJECTS = freeswitch-switch.$(OBJEXT) -freeswitch_OBJECTS = $(am_freeswitch_OBJECTS) +nodist_freeswitch_OBJECTS = +freeswitch_OBJECTS = $(am_freeswitch_OBJECTS) \ + $(nodist_freeswitch_OBJECTS) am__DEPENDENCIES_2 = $(BASE)/libfreeswitch.la freeswitch_DEPENDENCIES = $(am__DEPENDENCIES_2) DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)/src/include @@ -124,7 +125,8 @@ LINK = $(LIBTOOL) --mode=link --tag=CC $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(AM_LDFLAGS) $(LDFLAGS) -o $@ SOURCES = $(libfreeswitch_la_SOURCES) \ - $(nodist_libfreeswitch_la_SOURCES) $(freeswitch_SOURCES) + $(nodist_libfreeswitch_la_SOURCES) $(freeswitch_SOURCES) \ + $(nodist_freeswitch_SOURCES) DIST_SOURCES = $(libfreeswitch_la_SOURCES) $(freeswitch_SOURCES) RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ html-recursive info-recursive install-data-recursive \ @@ -329,7 +331,6 @@ src/include/switch_types.h\ src/include/switch_utils.h\ src/include/switch_rtp.h\ -src/include/switch_version.h\ src/include/switch_stun.h\ src/include/switch_log.h\ src/include/switch_xml.h @@ -353,12 +354,13 @@ nodist_libfreeswitch_la_SOURCES = src/include/switch_version.h MOD_LINK = $(BASE)/libfreeswitch.la CLEANFILES = src/include/switch_version.h -freeswitch_SOURCES = src/switch.c\ - src/include/switch_version.h - +BUILT_SOURCES = src/include/switch_version.h +freeswitch_SOURCES = src/switch.c +nodist_freeswitch_SOURCES = src/include/switch_version.h freeswitch_CFLAGS = $(AM_CFLAGS) freeswitch_LDADD = ${MOD_LINK} -all: all-recursive +all: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) all-recursive .SUFFIXES: .SUFFIXES: .c .lo .o .obj @@ -416,8 +418,6 @@ cd $(top_builddir) && $(SHELL) ./config.status $@ build/modmake.rules: $(top_builddir)/config.status $(top_srcdir)/build/modmake.rules.in cd $(top_builddir) && $(SHELL) ./config.status $@ -src/include/switch_version.h: $(top_builddir)/config.status $(top_srcdir)/src/include/switch_version.h.in - cd $(top_builddir) && $(SHELL) ./config.status $@ install-libLTLIBRARIES: $(lib_LTLIBRARIES) @$(NORMAL_INSTALL) test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)" @@ -956,7 +956,8 @@ $(distcleancheck_listfiles) ; \ exit 1; } >&2 check-am: all-am -check: check-recursive +check: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) check-recursive all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(HEADERS) install-binPROGRAMS: install-libLTLIBRARIES @@ -965,7 +966,8 @@ for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(library_includedir)"; do \ test -z "$$dir" || $(mkdir_p) "$$dir"; \ done -install: install-recursive +install: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) install-recursive install-exec: install-exec-recursive install-data: install-data-recursive uninstall: uninstall-recursive @@ -990,6 +992,7 @@ maintainer-clean-generic: @echo "This command is intended for maintainers to use" @echo "it deletes files that may require special tools to rebuild." + -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES) clean: clean-recursive clean-am: clean-binPROGRAMS clean-generic clean-libLTLIBRARIES \ @@ -1085,12 +1088,20 @@ $(INSTALL) ./$(NAME) $(DESTDIR)$(PREFIX)/bin/$(NAME) ;\ fi -version: Makefile src/include/switch_version.h - MAKE=$(MAKE) ./build/checkversion.sh +.version: + touch .version -newversion: Makefile - MAKE=$(MAKE) ./build/checkversion.sh force - $(MAKE) +src/include/switch_version.h: $(top_srcdir)/src/include/switch_version.h.in .version $(libfreeswitch_la_SOURCES) $(library_include_HEADERS) + @if test ! -f .noversion ; then \ + force=0 ; \ + version=`svnversion . -n || echo hacked` ; \ + oldversion=`cat .version 2>/dev/null || echo "0"` ; \ + test ! -f src/include/switch_version.h || grep "@SVN_VERSION@" src/include/switch_version.h && force=1 ; \ + if test "$$oldversion" != "$$version" || test $$force = 1 ; then \ + cat src/include/switch_version.h.in | sed "s/@SVN_VERSION@/$$version/g" > src/include/switch_version.h ; \ + echo $$version > .version ; \ + fi ; \ + fi ; .nodepends: touch .nodepends @@ -1121,7 +1132,7 @@ teletone: cd libs/libteletone && $(MAKE) -deps: version sqlite apr apr-util pcre srtp resample teletone +deps: sqlite apr apr-util pcre srtp resample teletone core: deps libfreeswitch.la Modified: freeswitch/trunk/configure ============================================================================== --- freeswitch/trunk/configure (original) +++ freeswitch/trunk/configure Tue Mar 13 02:17:58 2007 @@ -25211,8 +25211,6 @@ subdirs="$subdirs libs/portaudio" - - ac_config_files="$ac_config_files src/include/switch_version.h" cat >confcache <<\_ACEOF # This file is a shell script that caches the results of configure # tests run on this system so they can be shared between configure @@ -25808,7 +25806,6 @@ "src/mod/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/mod/Makefile" ;; "src/include/switch_am_config.h" ) CONFIG_FILES="$CONFIG_FILES src/include/switch_am_config.h" ;; "build/modmake.rules" ) CONFIG_FILES="$CONFIG_FILES build/modmake.rules" ;; - "src/include/switch_version.h" ) CONFIG_FILES="$CONFIG_FILES src/include/switch_version.h" ;; "depfiles" ) CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;; "src/include/switch_private.h" ) CONFIG_HEADERS="$CONFIG_HEADERS src/include/switch_private.h" ;; *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5 Modified: freeswitch/trunk/configure.in ============================================================================== --- freeswitch/trunk/configure.in (original) +++ freeswitch/trunk/configure.in Tue Mar 13 02:17:58 2007 @@ -314,5 +314,4 @@ AC_CONFIG_SUBDIRS(libs/xmlrpc-c) AC_CONFIG_SUBDIRS(libs/portaudio) - -AC_OUTPUT([src/include/switch_version.h]) +AC_OUTPUT

1 0

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

13 Mar '07

Author: mikej Date: Mon Mar 12 22:26:00 2007 New Revision: 4577 Added: freeswitch/trunk/src/mod/Makefile.am freeswitch/trunk/src/mod/Makefile.in Removed: freeswitch/trunk/build/modmake.sh freeswitch/trunk/generic_mod.mk Modified: freeswitch/trunk/Makefile.am freeswitch/trunk/Makefile.in freeswitch/trunk/build/buildlib.sh freeswitch/trunk/build/checkversion.sh freeswitch/trunk/build/modmake.rules.in freeswitch/trunk/configure freeswitch/trunk/configure.in Log: move module make to it's own makefile remove need for modmake.sh (its use is now fully adressed within src/mod/Makefile.am) remove need for generic_mod.mk (it uses the generated build/modmake.rules now instead) add support for building out of tree modules as part of the freeswitch build simply by adding the full path to the module dir to your modules.conf remove the need for special tragets to build. make will now do a make through the core AND all the modules. make install will now install the core and all the modules. most or all of the old targets are still there, plus the new target "core" that will do more or less what make used to do. make should now be able to be done without write permissions to the prefix directory (make install of course will still need them) whith the exception of modules that use buildlib.sh to download and install thier dependencies. This will be fixed in a future revision. checkversion.sh no longer will clean the modules on a change. The need for this should be gone with the correct include paths to have the src directory included first. Some steps in this commit to move us closer to being able to build with non gnu make (gmake). Still some more work to do in this regard as well. buildlib.sh no longer exports CFLAGS, just passes them to the confiure. Move a little closer to supporting install directories in the "automake way" where all the dirs will be acutally determined in configure, and follow the standard install targets in Makefile.am no longer build the modules twice on make install Additional fixes still on the way for proper dependency tracking for the module builds, so they don't build every time. any input on how to reach some of the goals stated above of supporting non gnu make, and more properly handling the install directories is appretiated. Drop me an e-mail if you are intersted in helping. Mike Modified: freeswitch/trunk/Makefile.am ============================================================================== --- freeswitch/trunk/Makefile.am (original) +++ freeswitch/trunk/Makefile.am Mon Mar 12 22:26:00 2007 @@ -1,6 +1,6 @@ EXTRA_DIST = -SUBDIRS = -AUTOMAKE_OPTS = gnu foreign +SUBDIRS = . src/mod +AUTOMAKE_OPTS = foreign NAME=freeswitch PREFIX=$(prefix) @@ -98,6 +98,20 @@ freeswitch_CFLAGS = $(AM_CFLAGS) freeswitch_LDADD = ${MOD_LINK} +install-data-local: + @echo Installing $(NAME) + @for x in conf mod db log log/xml_cdr bin scripts htdocs grammar ; do \ + $(mkinstalldirs) $(DESTDIR)$(prefix)/$$x ; \ + done + @if [ ! -f $(DESTDIR)$(PREFIX)/conf/freeswitch.xml ] ; then \ + $(INSTALL) conf/*.xml $(DESTDIR)$(PREFIX)/conf ; \ + fi + @if [ -f .libs/$(NAME) ] ; then \ + $(INSTALL) .libs/$(NAME) $(DESTDIR)$(PREFIX)/bin/$(NAME) ; \ + else \ + $(INSTALL) ./$(NAME) $(DESTDIR)$(PREFIX)/bin/$(NAME) ;\ + fi + version: Makefile src/include/switch_version.h MAKE=$(MAKE) ./build/checkversion.sh @@ -138,82 +152,24 @@ core: deps libfreeswitch.la -modules: libfreeswitch.la - @if [ ! -f $(PWD)/modules.conf ] ; then cp $(PWD)/modules.conf.in $(PWD)/modules.conf ; fi - @echo making modules - @rm -f build/freeswitch.env - @./build/addenv.sh build/freeswitch.env MAKE "$(MAKE)" - @./build/addenv.sh build/freeswitch.env DYLD_LIBRARY_PATH "$(PREFIX)/lib:$DYLD_LIBRARY_PATH" - @./build/addenv.sh build/freeswitch.env LD_LIBRARY_PATH "$(PREFIX)/lib:$LD_LIBRARY_PATH" - @./build/addenv.sh build/freeswitch.env PREFIX "$(PREFIX)" - @./build/addenv.sh build/freeswitch.env BASE "$(switch_srcdir)" - @./build/addenv.sh build/freeswitch.env OSARCH "$(OSARCH)" - @./build/addenv.sh build/freeswitch.env DYNAMIC_LIB_EXTEN "$(DYNAMIC_LIB_EXTEN)" - @./build/addenv.sh build/freeswitch.env SOLINK "$(SOLINK)" - @./build/addenv.sh build/freeswitch.env LDFLAGS "$(AM_LDFLAGS) $(MOD_LINK)" - @./build/addenv.sh build/freeswitch.env CFLAGS "$(AM_CFLAGS)" - @./build/addenv.sh build/freeswitch.env CC "$(CC)" - @./build/addenv.sh build/freeswitch.env CFGARGS "$(AM_CFGARGS)" - @./build/addenv.sh build/freeswitch.env LINK "$(LINK)" - @./build/addenv.sh build/freeswitch.env LTCOMPILE "$(LTCOMPILE)" - @./build/addenv.sh build/freeswitch.env LIBTOOL "$(LIBTOOL)" - @./build/addenv.sh build/freeswitch.env LTINSTALL "$(LTINSTALL)" - @cd src/mod && for i in `cat ../../modules.conf | grep -v \#` ; do echo making $$i ; $(PWD)/build/modmake.sh $(MAKE) $(PWD) $$i || exit 1; done - @rm -f build/freeswitch.env - -modclean: - @rm -f build/freeswitch.env - @./build/addenv.sh build/freeswitch.env MAKE "$(MAKE)" - @./build/addenv.sh build/freeswitch.env CC "$(CC)" - @./build/addenv.sh build/freeswitch.env DYNAMIC_LIB_EXTEN "$(DYNAMIC_LIB_EXTEN)" - @cd src/mod && for i in `find . -type d -name mod_\*` ; do echo making clean $$i ; $(PWD)/build/modmake.sh $(MAKE) $(PWD) $$i clean || exit 1; done - @rm -f build/freeswitch.env +everything: install -everything: install install_mod +installall: install -installall: install install_mod +sure: clean modwipe uninstall installall -sure: clean modclean modwipe uninstall installall +wayclean: clean -wayclean: clean modclean +modules: libfreeswitch.la + $(MAKE) -C src/mod +install_mod: libfreeswitch.la + $(MAKE) -C src/mod install +modclean: + $(MAKE) -C src/mod clean modwipe: rm -f $(PREFIX)/mod/*.${DYNAMIC_LIB_EXTEN} -install_mod: modules - @echo Installing $(NAME) - @for x in conf mod db log log/xml_cdr bin scripts htdocs grammar ; do \ - $(mkinstalldirs) $(DESTDIR)$(prefix)/$$x ; \ - done - @if [ ! -f $(DESTDIR)$(PREFIX)/conf/freeswitch.xml ] ; then \ - $(INSTALL) conf/*.xml $(DESTDIR)$(PREFIX)/conf ; \ - fi - @if [ -f .libs/$(NAME) ] ; then \ - $(INSTALL) .libs/$(NAME) $(DESTDIR)$(PREFIX)/bin/$(NAME) ; \ - else \ - $(INSTALL) ./$(NAME) $(DESTDIR)$(PREFIX)/bin/$(NAME) ;\ - fi - @echo Installing Modules - @rm -f build/freeswitch.env - @./build/addenv.sh build/freeswitch.env PREFIX "$(PREFIX)" - @./build/addenv.sh build/freeswitch.env MAKE "$(MAKE)" - @./build/addenv.sh build/freeswitch.env DYLD_LIBRARY_PATH "$(PREFIX)/lib:$DYLD_LIBRARY_PATH" - @./build/addenv.sh build/freeswitch.env LD_LIBRARY_PATH "$(PREFIX)/lib:$LD_LIBRARY_PATH" - @./build/addenv.sh build/freeswitch.env DYNAMIC_LIB_EXTEN "$(DYNAMIC_LIB_EXTEN)" - @./build/addenv.sh build/freeswitch.env BASE "$(switch_srcdir)" - @./build/addenv.sh build/freeswitch.env OSARCH "$(OSARCH)" - @./build/addenv.sh build/freeswitch.env SOLINK "$(SOLINK)" - @./build/addenv.sh build/freeswitch.env LDFLAGS "$(AM_LDFLAGS) $(MOD_LINK)" - @./build/addenv.sh build/freeswitch.env CFLAGS "$(AM_CFLAGS)" - @./build/addenv.sh build/freeswitch.env CC "$(CC)" - @./build/addenv.sh build/freeswitch.env LINK "$(LINK)" - @./build/addenv.sh build/freeswitch.env LTCOMPILE "$(LTCOMPILE)" - @./build/addenv.sh build/freeswitch.env LTINSTALL "$(LTINSTALL)" - @./build/addenv.sh build/freeswitch.env LIBTOOL "$(LIBTOOL)" - @cd src/mod && for i in `cat ../../modules.conf | grep -v \#` ; do echo making install $$i ; $(PWD)/build/modmake.sh $(MAKE) $(PWD) $$i install || exit 1; done - @rm -f build/freeswitch.env - @echo done - dox: cd docs && doxygen $(PWD)/docs/Doxygen.conf Modified: freeswitch/trunk/Makefile.in ============================================================================== --- freeswitch/trunk/Makefile.in (original) +++ freeswitch/trunk/Makefile.in Mon Mar 12 22:26:00 2007 @@ -257,6 +257,7 @@ long_value = @long_value@ mandir = @mandir@ mkdir_p = @mkdir_p@ +moddir = @moddir@ oldincludedir = @oldincludedir@ prefix = @prefix@ program_transform_name = @program_transform_name@ @@ -275,8 +276,8 @@ uint64_t_fmt = @uint64_t_fmt@ voidp_size = @voidp_size@ EXTRA_DIST = -SUBDIRS = -AUTOMAKE_OPTS = gnu foreign +SUBDIRS = . src/mod +AUTOMAKE_OPTS = foreign NAME = freeswitch PREFIX = $(prefix) AM_CFLAGS = $(SWITCH_AM_CFLAGS) $(am__append_1) @@ -1011,7 +1012,7 @@ info-am: -install-data-am: install-library_includeHEADERS +install-data-am: install-data-local install-library_includeHEADERS install-exec-am: install-binPROGRAMS install-libLTLIBRARIES @@ -1055,20 +1056,35 @@ distclean-recursive distclean-tags distcleancheck distdir \ distuninstallcheck dvi dvi-am html html-am info info-am \ install install-am install-binPROGRAMS install-data \ - install-data-am install-exec install-exec-am install-info \ - install-info-am install-libLTLIBRARIES \ - install-library_includeHEADERS install-man install-strip \ - installcheck installcheck-am installdirs installdirs-am \ - maintainer-clean maintainer-clean-generic \ - maintainer-clean-recursive mostlyclean mostlyclean-compile \ - mostlyclean-generic mostlyclean-libtool mostlyclean-recursive \ - pdf pdf-am ps ps-am tags tags-recursive uninstall uninstall-am \ + install-data-am install-data-local install-exec \ + install-exec-am install-info install-info-am \ + install-libLTLIBRARIES install-library_includeHEADERS \ + install-man install-strip installcheck installcheck-am \ + installdirs installdirs-am maintainer-clean \ + maintainer-clean-generic maintainer-clean-recursive \ + mostlyclean mostlyclean-compile mostlyclean-generic \ + mostlyclean-libtool mostlyclean-recursive pdf pdf-am ps ps-am \ + tags tags-recursive uninstall uninstall-am \ uninstall-binPROGRAMS uninstall-info-am \ uninstall-libLTLIBRARIES uninstall-library_includeHEADERS $(libfreeswitch_la_SOURCES): deps +install-data-local: + @echo Installing $(NAME) + @for x in conf mod db log log/xml_cdr bin scripts htdocs grammar ; do \ + $(mkinstalldirs) $(DESTDIR)$(prefix)/$$x ; \ + done + @if [ ! -f $(DESTDIR)$(PREFIX)/conf/freeswitch.xml ] ; then \ + $(INSTALL) conf/*.xml $(DESTDIR)$(PREFIX)/conf ; \ + fi + @if [ -f .libs/$(NAME) ] ; then \ + $(INSTALL) .libs/$(NAME) $(DESTDIR)$(PREFIX)/bin/$(NAME) ; \ + else \ + $(INSTALL) ./$(NAME) $(DESTDIR)$(PREFIX)/bin/$(NAME) ;\ + fi + version: Makefile src/include/switch_version.h MAKE=$(MAKE) ./build/checkversion.sh @@ -1109,82 +1125,24 @@ core: deps libfreeswitch.la -modules: libfreeswitch.la - @if [ ! -f $(PWD)/modules.conf ] ; then cp $(PWD)/modules.conf.in $(PWD)/modules.conf ; fi - @echo making modules - @rm -f build/freeswitch.env - @./build/addenv.sh build/freeswitch.env MAKE "$(MAKE)" - @./build/addenv.sh build/freeswitch.env DYLD_LIBRARY_PATH "$(PREFIX)/lib:$DYLD_LIBRARY_PATH" - @./build/addenv.sh build/freeswitch.env LD_LIBRARY_PATH "$(PREFIX)/lib:$LD_LIBRARY_PATH" - @./build/addenv.sh build/freeswitch.env PREFIX "$(PREFIX)" - @./build/addenv.sh build/freeswitch.env BASE "$(switch_srcdir)" - @./build/addenv.sh build/freeswitch.env OSARCH "$(OSARCH)" - @./build/addenv.sh build/freeswitch.env DYNAMIC_LIB_EXTEN "$(DYNAMIC_LIB_EXTEN)" - @./build/addenv.sh build/freeswitch.env SOLINK "$(SOLINK)" - @./build/addenv.sh build/freeswitch.env LDFLAGS "$(AM_LDFLAGS) $(MOD_LINK)" - @./build/addenv.sh build/freeswitch.env CFLAGS "$(AM_CFLAGS)" - @./build/addenv.sh build/freeswitch.env CC "$(CC)" - @./build/addenv.sh build/freeswitch.env CFGARGS "$(AM_CFGARGS)" - @./build/addenv.sh build/freeswitch.env LINK "$(LINK)" - @./build/addenv.sh build/freeswitch.env LTCOMPILE "$(LTCOMPILE)" - @./build/addenv.sh build/freeswitch.env LIBTOOL "$(LIBTOOL)" - @./build/addenv.sh build/freeswitch.env LTINSTALL "$(LTINSTALL)" - @cd src/mod && for i in `cat ../../modules.conf | grep -v \#` ; do echo making $$i ; $(PWD)/build/modmake.sh $(MAKE) $(PWD) $$i || exit 1; done - @rm -f build/freeswitch.env - -modclean: - @rm -f build/freeswitch.env - @./build/addenv.sh build/freeswitch.env MAKE "$(MAKE)" - @./build/addenv.sh build/freeswitch.env CC "$(CC)" - @./build/addenv.sh build/freeswitch.env DYNAMIC_LIB_EXTEN "$(DYNAMIC_LIB_EXTEN)" - @cd src/mod && for i in `find . -type d -name mod_\*` ; do echo making clean $$i ; $(PWD)/build/modmake.sh $(MAKE) $(PWD) $$i clean || exit 1; done - @rm -f build/freeswitch.env +everything: install -everything: install install_mod +installall: install -installall: install install_mod +sure: clean modwipe uninstall installall -sure: clean modclean modwipe uninstall installall +wayclean: clean -wayclean: clean modclean +modules: libfreeswitch.la + $(MAKE) -C src/mod +install_mod: libfreeswitch.la + $(MAKE) -C src/mod install +modclean: + $(MAKE) -C src/mod clean modwipe: rm -f $(PREFIX)/mod/*.${DYNAMIC_LIB_EXTEN} -install_mod: modules - @echo Installing $(NAME) - @for x in conf mod db log log/xml_cdr bin scripts htdocs grammar ; do \ - $(mkinstalldirs) $(DESTDIR)$(prefix)/$$x ; \ - done - @if [ ! -f $(DESTDIR)$(PREFIX)/conf/freeswitch.xml ] ; then \ - $(INSTALL) conf/*.xml $(DESTDIR)$(PREFIX)/conf ; \ - fi - @if [ -f .libs/$(NAME) ] ; then \ - $(INSTALL) .libs/$(NAME) $(DESTDIR)$(PREFIX)/bin/$(NAME) ; \ - else \ - $(INSTALL) ./$(NAME) $(DESTDIR)$(PREFIX)/bin/$(NAME) ;\ - fi - @echo Installing Modules - @rm -f build/freeswitch.env - @./build/addenv.sh build/freeswitch.env PREFIX "$(PREFIX)" - @./build/addenv.sh build/freeswitch.env MAKE "$(MAKE)" - @./build/addenv.sh build/freeswitch.env DYLD_LIBRARY_PATH "$(PREFIX)/lib:$DYLD_LIBRARY_PATH" - @./build/addenv.sh build/freeswitch.env LD_LIBRARY_PATH "$(PREFIX)/lib:$LD_LIBRARY_PATH" - @./build/addenv.sh build/freeswitch.env DYNAMIC_LIB_EXTEN "$(DYNAMIC_LIB_EXTEN)" - @./build/addenv.sh build/freeswitch.env BASE "$(switch_srcdir)" - @./build/addenv.sh build/freeswitch.env OSARCH "$(OSARCH)" - @./build/addenv.sh build/freeswitch.env SOLINK "$(SOLINK)" - @./build/addenv.sh build/freeswitch.env LDFLAGS "$(AM_LDFLAGS) $(MOD_LINK)" - @./build/addenv.sh build/freeswitch.env CFLAGS "$(AM_CFLAGS)" - @./build/addenv.sh build/freeswitch.env CC "$(CC)" - @./build/addenv.sh build/freeswitch.env LINK "$(LINK)" - @./build/addenv.sh build/freeswitch.env LTCOMPILE "$(LTCOMPILE)" - @./build/addenv.sh build/freeswitch.env LTINSTALL "$(LTINSTALL)" - @./build/addenv.sh build/freeswitch.env LIBTOOL "$(LIBTOOL)" - @cd src/mod && for i in `cat ../../modules.conf | grep -v \#` ; do echo making install $$i ; $(PWD)/build/modmake.sh $(MAKE) $(PWD) $$i install || exit 1; done - @rm -f build/freeswitch.env - @echo done - dox: cd docs && doxygen $(PWD)/docs/Doxygen.conf Modified: freeswitch/trunk/build/buildlib.sh ============================================================================== --- freeswitch/trunk/build/buildlib.sh (original) +++ freeswitch/trunk/build/buildlib.sh Mon Mar 12 22:26:00 2007 @@ -9,10 +9,6 @@ exit 0 fi -if [ -f $root/build/freeswitch.env ] ; then - . $root/build/freeswitch.env -fi - if [ -z "$MAKE" ] ; then make=`which gmake 2>/dev/null` if [ -z "$MAKE" ] ; then Modified: freeswitch/trunk/build/checkversion.sh ============================================================================== --- freeswitch/trunk/build/checkversion.sh (original) +++ freeswitch/trunk/build/checkversion.sh Mon Mar 12 22:26:00 2007 @@ -16,12 +16,4 @@ if [ $oldversion != $version ] || [ $force = 1 ] ; then cat src/include/switch_version.h.in | sed "s/@SVN_VERSION@/$version/g" > src/include/switch_version.h echo $version > .version - if [ -z "$MAKE" ] ; then - make=`which gmake 2>/dev/null` - if [ -z "$MAKE" ] ; then - make=make - fi - fi - - $MAKE modclean fi Modified: freeswitch/trunk/build/modmake.rules.in ============================================================================== --- freeswitch/trunk/build/modmake.rules.in (original) +++ freeswitch/trunk/build/modmake.rules.in Mon Mar 12 22:26:00 2007 @@ -43,7 +43,7 @@ all: depend $(MODNAME).$(DYNAMIC_LIB_EXTEN) local_all depend: local_depend clean: local_clean mod_clean -install: depend_install local_install mod_install +install: all depend_install local_install mod_install distclean: clean local_distclean extraclean: distclean local_extraclean Modified: freeswitch/trunk/configure ============================================================================== --- freeswitch/trunk/configure (original) +++ freeswitch/trunk/configure Mon Mar 12 22:26:00 2007 @@ -490,7 +490,7 @@ ac_subdirs_all="$ac_subdirs_all libs/speex" ac_subdirs_all="$ac_subdirs_all libs/xmlrpc-c" ac_subdirs_all="$ac_subdirs_all libs/portaudio" -ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar switch_srcdir switch_builddir CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE build build_cpu build_vendor build_os host host_cpu host_vendor host_os EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CPP CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL PRTDIAG WANT_DEBUG_TRUE WANT_DEBUG_FALSE SWITCH_AM_CFLAGS SWITCH_AM_CXXFLAGS SWITCH_AM_LDFLAGS SOLINK DYNAMIC_LIB_EXTEN LIBOBJS voidp_size short_value int_value long_value int64_value size_t_value ssize_t_value int64_t_fmt uint64_t_fmt ssize_t_fmt size_t_fmt CRASHPROT_TRUE CRASHPROT_FALSE ISLINUX_TRUE ISLINUX_FALSE ISMAC_TRUE ISMAC_FALSE IS64BITLINUX_TRUE IS64BITLINUX_FALSE subdirs LTLIBOBJS' +ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar switch_srcdir switch_builddir moddir CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE build build_cpu build_vendor build_os host host_cpu host_vendor host_os EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CPP CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL PRTDIAG WANT_DEBUG_TRUE WANT_DEBUG_FALSE SWITCH_AM_CFLAGS SWITCH_AM_CXXFLAGS SWITCH_AM_LDFLAGS SOLINK DYNAMIC_LIB_EXTEN LIBOBJS voidp_size short_value int_value long_value int64_value size_t_value ssize_t_value int64_t_fmt uint64_t_fmt ssize_t_fmt size_t_fmt CRASHPROT_TRUE CRASHPROT_FALSE ISLINUX_TRUE ISLINUX_FALSE ISMAC_TRUE ISMAC_FALSE IS64BITLINUX_TRUE IS64BITLINUX_FALSE subdirs LTLIBOBJS' ac_subst_files='' # Initialize some variables set by options. @@ -1996,6 +1996,9 @@ +moddir=$prefix/mod + + #Set default language ac_ext=c ac_cpp='$CPP $CPPFLAGS' @@ -3876,7 +3879,7 @@ ;; *-*-irix6*) # Find out which ABI we are using. - echo '#line 3879 "configure"' > conftest.$ac_ext + echo '#line 3882 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -5475,7 +5478,7 @@ # Provide some information about the compiler. -echo "$as_me:5478:" \ +echo "$as_me:5481:" \ "checking for Fortran 77 compiler version" >&5 ac_compiler=`set X $ac_compile; echo $2` { (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5 @@ -6538,11 +6541,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:6541: $lt_compile\"" >&5) + (eval echo "\"\$as_me:6544: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:6545: \$? = $ac_status" >&5 + echo "$as_me:6548: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -6806,11 +6809,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:6809: $lt_compile\"" >&5) + (eval echo "\"\$as_me:6812: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:6813: \$? = $ac_status" >&5 + echo "$as_me:6816: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -6910,11 +6913,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:6913: $lt_compile\"" >&5) + (eval echo "\"\$as_me:6916: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:6917: \$? = $ac_status" >&5 + echo "$as_me:6920: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -9255,7 +9258,7 @@ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<EOF -#line 9258 "configure" +#line 9261 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -9355,7 +9358,7 @@ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<EOF -#line 9358 "configure" +#line 9361 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -11695,11 +11698,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:11698: $lt_compile\"" >&5) + (eval echo "\"\$as_me:11701: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:11702: \$? = $ac_status" >&5 + echo "$as_me:11705: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -11799,11 +11802,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:11802: $lt_compile\"" >&5) + (eval echo "\"\$as_me:11805: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:11806: \$? = $ac_status" >&5 + echo "$as_me:11809: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -13369,11 +13372,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:13372: $lt_compile\"" >&5) + (eval echo "\"\$as_me:13375: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:13376: \$? = $ac_status" >&5 + echo "$as_me:13379: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -13473,11 +13476,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:13476: $lt_compile\"" >&5) + (eval echo "\"\$as_me:13479: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:13480: \$? = $ac_status" >&5 + echo "$as_me:13483: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -15676,11 +15679,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:15679: $lt_compile\"" >&5) + (eval echo "\"\$as_me:15682: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:15683: \$? = $ac_status" >&5 + echo "$as_me:15686: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -15944,11 +15947,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:15947: $lt_compile\"" >&5) + (eval echo "\"\$as_me:15950: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:15951: \$? = $ac_status" >&5 + echo "$as_me:15954: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -16048,11 +16051,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:16051: $lt_compile\"" >&5) + (eval echo "\"\$as_me:16054: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:16055: \$? = $ac_status" >&5 + echo "$as_me:16058: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -25076,7 +25079,7 @@ fi - ac_config_files="$ac_config_files Makefile src/include/switch_am_config.h build/modmake.rules" + ac_config_files="$ac_config_files Makefile src/mod/Makefile src/include/switch_am_config.h build/modmake.rules" @@ -25802,6 +25805,7 @@ case "$ac_config_target" in # Handling of arguments. "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;; + "src/mod/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/mod/Makefile" ;; "src/include/switch_am_config.h" ) CONFIG_FILES="$CONFIG_FILES src/include/switch_am_config.h" ;; "build/modmake.rules" ) CONFIG_FILES="$CONFIG_FILES build/modmake.rules" ;; "src/include/switch_version.h" ) CONFIG_FILES="$CONFIG_FILES src/include/switch_version.h" ;; @@ -25916,6 +25920,7 @@ s,@am__untar@,$am__untar,;t t s,@switch_srcdir@,$switch_srcdir,;t t s,@switch_builddir@,$switch_builddir,;t t +s,@moddir@,$moddir,;t t s,@CC@,$CC,;t t s,@CFLAGS@,$CFLAGS,;t t s,@LDFLAGS@,$LDFLAGS,;t t Modified: freeswitch/trunk/configure.in ============================================================================== --- freeswitch/trunk/configure.in (original) +++ freeswitch/trunk/configure.in Mon Mar 12 22:26:00 2007 @@ -20,6 +20,9 @@ AC_SUBST(switch_srcdir) AC_SUBST(switch_builddir) +moddir=$prefix/mod +AC_SUBST(moddir) + #Set default language AC_LANG_C # Checks for programs. @@ -277,6 +280,7 @@ AM_CONDITIONAL([CRASHPROT],[test "x$enable_crash_prot" != "xno"]) AC_CONFIG_FILES([Makefile + src/mod/Makefile src/include/switch_am_config.h build/modmake.rules]) Added: freeswitch/trunk/src/mod/Makefile.am ============================================================================== --- (empty file) +++ freeswitch/trunk/src/mod/Makefile.am Mon Mar 12 22:26:00 2007 @@ -0,0 +1,42 @@ +MODULES = `grep -v "\#" $(switch_builddir)/modules.conf` + +all: + @if [ ! -f $(switch_builddir)/modules.conf ] ; then cp $(switch_builddir)/modules.conf.in $(switch_builddir)/modules.conf ; fi + @echo making modules + @for i in $(MODULES) ; do \ + echo making $$i ; \ + modname=`echo $$i | sed "s/^.*\///g"`; \ + if test -z $$modname ; then modname=$$i ; fi; \ + if test -d $(switch_srcdir)/src/mod/$$i ; then moddir=$(switch_srcdir)/src/mod/$$i ; else moddir=$$i ; fi; \ + if test -f $$moddir/Makefile ; then \ + cd $$moddir && MODNAME=$$modname BASE=$(switch_builddir) $(MAKE) ; else \ + cd $$moddir && MODNAME=$$modname BASE=$(switch_builddir) $(MAKE) -f $(switch_builddir)/build/modmake.rules ; \ + fi; \ + done + +clean: + @for i in `find . -type d -name mod_\*` ; do \ + echo making clean $$i ; \ + modname=`echo $$i | sed "s/^.*\///g"`; \ + if test -z $$modname ; then modname=$$i ; fi; \ + if test -d $(switch_srcdir)/src/mod/$$i ; then moddir=$(switch_srcdir)/src/mod/$$i ; else moddir=$$i ; fi; \ + if test -f $$moddir/Makefile ; then \ + cd $$moddir && MODNAME=$$modname BASE=$(switch_builddir) $(MAKE) clean ; else \ + cd $$moddir && MODNAME=$$modname BASE=$(switch_builddir) $(MAKE) -f $(switch_builddir)/build/modmake.rules clean ; \ + fi; \ + done + +install: + @echo Installing Modules + @for i in $(MODULES) ; do \ + echo making install $$i ; \ + modname=`echo $$i | sed "s/^.*\///g"`; \ + if test -z $$modname ; then modname=$$i ; fi; \ + if test -d $(switch_srcdir)/src/mod/$$i ; then moddir=$(switch_srcdir)/src/mod/$$i ; else moddir=$$i ; fi; \ + if test -f $$moddir/Makefile ; then \ + cd $$moddir && MODNAME=$$modname BASE=$(switch_builddir) $(MAKE) install ; else \ + cd $$moddir && MODNAME=$$modname BASE=$(switch_builddir) $(MAKE) -f $(switch_builddir)/build/modmake.rules clean ; \ + fi; \ + done + @echo done + Added: freeswitch/trunk/src/mod/Makefile.in ============================================================================== --- (empty file) +++ freeswitch/trunk/src/mod/Makefile.in Mon Mar 12 22:26:00 2007 @@ -0,0 +1,385 @@ +# Makefile.in generated by automake 1.9.2 from Makefile.am. +# @configure_input@ + +# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +# 2003, 2004 Free Software Foundation, Inc. +# This Makefile.in is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY, to the extent permitted by law; without +# even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. + +@SET_MAKE@ +srcdir = @srcdir@ +top_srcdir = @top_srcdir@ +VPATH = @srcdir@ +pkgdatadir = $(datadir)/@PACKAGE@ +pkglibdir = $(libdir)/@PACKAGE@ +pkgincludedir = $(includedir)/@PACKAGE@ +top_builddir = ../.. +am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +INSTALL = @INSTALL@ +install_sh_DATA = $(install_sh) -c -m 644 +install_sh_PROGRAM = $(install_sh) -c +install_sh_SCRIPT = $(install_sh) -c +INSTALL_HEADER = $(INSTALL_DATA) +transform = $(program_transform_name) +NORMAL_INSTALL = : +PRE_INSTALL = : +POST_INSTALL = : +NORMAL_UNINSTALL = : +PRE_UNINSTALL = : +POST_UNINSTALL = : +build_triplet = @build@ +host_triplet = @host@ +subdir = src/mod +DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +am__aclocal_m4_deps = \ + $(top_srcdir)/build/config/ax_compiler_vendor.m4 \ + $(top_srcdir)/build/config/ax_cflags_warn_all_ansi.m4 \ + $(top_srcdir)/build/config/ax_cc_maxopt.m4 \ + $(top_srcdir)/build/config/ax_check_compiler_flags.m4 \ + $(top_srcdir)/build/config/ac_gcc_archflag.m4 \ + $(top_srcdir)/build/config/ac_gcc_x86_cpuid.m4 \ + $(top_srcdir)/libs/apr/build/apr_common.m4 \ + $(top_srcdir)/configure.in +am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) +mkinstalldirs = $(install_sh) -d +CONFIG_HEADER = $(top_builddir)/src/include/switch_private.h +CONFIG_CLEAN_FILES = +SOURCES = +DIST_SOURCES = +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +ACLOCAL = @ACLOCAL@ +AMDEP_FALSE = @AMDEP_FALSE@ +AMDEP_TRUE = @AMDEP_TRUE@ +AMTAR = @AMTAR@ +AR = @AR@ +AUTOCONF = @AUTOCONF@ +AUTOHEADER = @AUTOHEADER@ +AUTOMAKE = @AUTOMAKE@ +AWK = @AWK@ +CC = @CC@ +CCDEPMODE = @CCDEPMODE@ +CFLAGS = @CFLAGS@ +CPP = @CPP@ +CPPFLAGS = @CPPFLAGS@ +CRASHPROT_FALSE = @CRASHPROT_FALSE@ +CRASHPROT_TRUE = @CRASHPROT_TRUE@ +CXX = @CXX@ +CXXCPP = @CXXCPP@ +CXXDEPMODE = @CXXDEPMODE@ +CXXFLAGS = @CXXFLAGS@ +CYGPATH_W = @CYGPATH_W@ +DEFS = @DEFS@ +DEPDIR = @DEPDIR@ +DYNAMIC_LIB_EXTEN = @DYNAMIC_LIB_EXTEN@ +ECHO = @ECHO@ +ECHO_C = @ECHO_C@ +ECHO_N = @ECHO_N@ +ECHO_T = @ECHO_T@ +EGREP = @EGREP@ +EXEEXT = @EXEEXT@ +F77 = @F77@ +FFLAGS = @FFLAGS@ +INSTALL_DATA = @INSTALL_DATA@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_SCRIPT = @INSTALL_SCRIPT@ +INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +IS64BITLINUX_FALSE = @IS64BITLINUX_FALSE@ +IS64BITLINUX_TRUE = @IS64BITLINUX_TRUE@ +ISLINUX_FALSE = @ISLINUX_FALSE@ +ISLINUX_TRUE = @ISLINUX_TRUE@ +ISMAC_FALSE = @ISMAC_FALSE@ +ISMAC_TRUE = @ISMAC_TRUE@ +LDFLAGS = @LDFLAGS@ +LIBOBJS = @LIBOBJS@ +LIBS = @LIBS@ +LIBTOOL = @LIBTOOL@ +LN_S = @LN_S@ +LTLIBOBJS = @LTLIBOBJS@ +MAKEINFO = @MAKEINFO@ +OBJEXT = @OBJEXT@ +PACKAGE = @PACKAGE@ +PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ +PACKAGE_NAME = @PACKAGE_NAME@ +PACKAGE_STRING = @PACKAGE_STRING@ +PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_VERSION = @PACKAGE_VERSION@ +PATH_SEPARATOR = @PATH_SEPARATOR@ +PRTDIAG = @PRTDIAG@ +RANLIB = @RANLIB@ +SET_MAKE = @SET_MAKE@ +SHELL = @SHELL@ +SOLINK = @SOLINK@ +STRIP = @STRIP@ +SWITCH_AM_CFLAGS = @SWITCH_AM_CFLAGS@ +SWITCH_AM_CXXFLAGS = @SWITCH_AM_CXXFLAGS@ +SWITCH_AM_LDFLAGS = @SWITCH_AM_LDFLAGS@ +VERSION = @VERSION@ +WANT_DEBUG_FALSE = @WANT_DEBUG_FALSE@ +WANT_DEBUG_TRUE = @WANT_DEBUG_TRUE@ +ac_ct_AR = @ac_ct_AR@ +ac_ct_CC = @ac_ct_CC@ +ac_ct_CXX = @ac_ct_CXX@ +ac_ct_F77 = @ac_ct_F77@ +ac_ct_RANLIB = @ac_ct_RANLIB@ +ac_ct_STRIP = @ac_ct_STRIP@ +am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ +am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ +am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ +am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ +am__include = @am__include@ +am__leading_dot = @am__leading_dot@ +am__quote = @am__quote@ +am__tar = @am__tar@ +am__untar = @am__untar@ +bindir = @bindir@ +build = @build@ +build_alias = @build_alias@ +build_cpu = @build_cpu@ +build_os = @build_os@ +build_vendor = @build_vendor@ +datadir = @datadir@ +exec_prefix = @exec_prefix@ +host = @host@ +host_alias = @host_alias@ +host_cpu = @host_cpu@ +host_os = @host_os@ +host_vendor = @host_vendor@ +includedir = @includedir@ +infodir = @infodir@ +install_sh = @install_sh@ +int64_t_fmt = @int64_t_fmt@ +int64_value = @int64_value@ +int_value = @int_value@ +libdir = @libdir@ +libexecdir = @libexecdir@ +localstatedir = @localstatedir@ +long_value = @long_value@ +mandir = @mandir@ +mkdir_p = @mkdir_p@ +moddir = @moddir@ +oldincludedir = @oldincludedir@ +prefix = @prefix@ +program_transform_name = @program_transform_name@ +sbindir = @sbindir@ +sharedstatedir = @sharedstatedir@ +short_value = @short_value@ +size_t_fmt = @size_t_fmt@ +size_t_value = @size_t_value@ +ssize_t_fmt = @ssize_t_fmt@ +ssize_t_value = @ssize_t_value@ +subdirs = @subdirs@ +switch_builddir = @switch_builddir@ +switch_srcdir = @switch_srcdir@ +sysconfdir = @sysconfdir@ +target_alias = @target_alias@ +uint64_t_fmt = @uint64_t_fmt@ +voidp_size = @voidp_size@ +MODULES = `grep -v "\#" $(switch_builddir)/modules.conf` +all: all-am + +.SUFFIXES: +$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ + && exit 0; \ + exit 1;; \ + esac; \ + done; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/mod/Makefile'; \ + cd $(top_srcdir) && \ + $(AUTOMAKE) --gnu src/mod/Makefile +.PRECIOUS: Makefile +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ + *config.status*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ + *) \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + esac; + +$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + +$(top_srcdir)/configure: $(am__configure_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(ACLOCAL_M4): $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + +mostlyclean-libtool: + -rm -f *.lo + +clean-libtool: + -rm -rf .libs _libs + +distclean-libtool: + -rm -f libtool +uninstall-info-am: +tags: TAGS +TAGS: + +ctags: CTAGS +CTAGS: + + +distdir: $(DISTFILES) + @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ + list='$(DISTFILES)'; for file in $$list; do \ + case $$file in \ + $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ + $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ + esac; \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ + dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test "$$dir" != "$$file" && test "$$dir" != "."; then \ + dir="/$$dir"; \ + $(mkdir_p) "$(distdir)$$dir"; \ + else \ + dir=''; \ + fi; \ + if test -d $$d/$$file; then \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + fi; \ + cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ + else \ + test -f $(distdir)/$$file \ + || cp -p $$d/$$file $(distdir)/$$file \ + || exit 1; \ + fi; \ + done +check-am: all-am +check: check-am +all-am: Makefile +installdirs: +install-exec: install-exec-am +install-data: install-data-am +uninstall: uninstall-am + +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am + +installcheck: installcheck-am +install-strip: + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + `test -z '$(STRIP)' || \ + echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install +mostlyclean-generic: + +clean-generic: + +distclean-generic: + -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + +maintainer-clean-generic: + @echo "This command is intended for maintainers to use" + @echo "it deletes files that may require special tools to rebuild." +clean-am: clean-generic clean-libtool mostlyclean-am + +distclean: distclean-am + -rm -f Makefile +distclean-am: clean-am distclean-generic distclean-libtool + +dvi: dvi-am + +dvi-am: + +html: html-am + +info: info-am + +info-am: + +install-data-am: + +install-exec-am: + +install-info: install-info-am + +install-man: + +installcheck-am: + +maintainer-clean: maintainer-clean-am + -rm -f Makefile +maintainer-clean-am: distclean-am maintainer-clean-generic + +mostlyclean: mostlyclean-am + +mostlyclean-am: mostlyclean-generic mostlyclean-libtool + +pdf: pdf-am + +pdf-am: + +ps: ps-am + +ps-am: + +uninstall-am: uninstall-info-am + +.PHONY: all all-am check check-am clean clean-generic clean-libtool \ + distclean distclean-generic distclean-libtool distdir dvi \ + dvi-am html html-am info info-am install install-am \ + install-data install-data-am install-exec install-exec-am \ + install-info install-info-am install-man install-strip \ + installcheck installcheck-am installdirs maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-generic \ + mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \ + uninstall-info-am + + +all: + @if [ ! -f $(switch_builddir)/modules.conf ] ; then cp $(switch_builddir)/modules.conf.in $(switch_builddir)/modules.conf ; fi + @echo making modules + @for i in $(MODULES) ; do \ + echo making $$i ; \ + modname=`echo $$i | sed "s/^.*\///g"`; \ + if test -z $$modname ; then modname=$$i ; fi; \ + if test -d $(switch_srcdir)/src/mod/$$i ; then moddir=$(switch_srcdir)/src/mod/$$i ; else moddir=$$i ; fi; \ + if test -f $$moddir/Makefile ; then \ + cd $$moddir && MODNAME=$$modname BASE=$(switch_builddir) $(MAKE) ; else \ + cd $$moddir && MODNAME=$$modname BASE=$(switch_builddir) $(MAKE) -f $(switch_builddir)/build/modmake.rules ; \ + fi; \ + done + +clean: + @for i in `find . -type d -name mod_\*` ; do \ + echo making clean $$i ; \ + modname=`echo $$i | sed "s/^.*\///g"`; \ + if test -z $$modname ; then modname=$$i ; fi; \ + if test -d $(switch_srcdir)/src/mod/$$i ; then moddir=$(switch_srcdir)/src/mod/$$i ; else moddir=$$i ; fi; \ + if test -f $$moddir/Makefile ; then \ + cd $$moddir && MODNAME=$$modname BASE=$(switch_builddir) $(MAKE) clean ; else \ + cd $$moddir && MODNAME=$$modname BASE=$(switch_builddir) $(MAKE) -f $(switch_builddir)/build/modmake.rules clean ; \ + fi; \ + done + +install: + @echo Installing Modules + @for i in $(MODULES) ; do \ + echo making install $$i ; \ + modname=`echo $$i | sed "s/^.*\///g"`; \ + if test -z $$modname ; then modname=$$i ; fi; \ + if test -d $(switch_srcdir)/src/mod/$$i ; then moddir=$(switch_srcdir)/src/mod/$$i ; else moddir=$$i ; fi; \ + if test -f $$moddir/Makefile ; then \ + cd $$moddir && MODNAME=$$modname BASE=$(switch_builddir) $(MAKE) install ; else \ + cd $$moddir && MODNAME=$$modname BASE=$(switch_builddir) $(MAKE) -f $(switch_builddir)/build/modmake.rules clean ; \ + fi; \ + done + @echo done +# Tell versions [3.59,3.63) of GNU make to not export all variables. +# Otherwise a system limit (for SysV at least) may be exceeded. +.NOEXPORT:

1 0