- Freeswitch-svn - FreeSWITCH Mailing Lists

[commit] r4564 - in freeswitch/trunk/src/mod: applications/mod_enum asr_tts/mod_cepstral asr_tts/mod_lumenvox codecs/mod_g711 codecs/mod_g722 codecs/mod_g726 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_wanpipe event_handlers/mod_cdr event_handlers/mod_xmpp_event event_handlers/mod_zeroconf formats/mod_shout formats/mod_sndfile languages/mod_perl languages/mod_python lang
by Freeswitch SVN 12 Mar '07

12 Mar '07

Author: brian Date: Mon Mar 12 01:17:17 2007 New Revision: 4564 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_g711/Makefile freeswitch/trunk/src/mod/codecs/mod_g722/Makefile freeswitch/trunk/src/mod/codecs/mod_g726/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_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_perl/Makefile freeswitch/trunk/src/mod/languages/mod_python/Makefile freeswitch/trunk/src/mod/languages/mod_spidermonkey_etpan/Makefile freeswitch/trunk/src/mod/languages/mod_spidermonkey_odbc/Makefile freeswitch/trunk/src/mod/xml_int/mod_xml_curl/Makefile Log: fix spelling, Everyone do not forget to thank Mike for all his hard work.. he need sleep now. ;) ./applications/mod_enum/Makefile ./asr_tts/mod_cepstral/Makefile ./asr_tts/mod_lumenvox/Makefile ./codecs/mod_amr/Makefile ./codecs/mod_g711/Makefile ./codecs/mod_g722/Makefile ./codecs/mod_g723_1/Makefile ./codecs/mod_g726/Makefile ./codecs/mod_g729/Makefile ./codecs/mod_gsm/Makefile ./codecs/mod_ilbc/Makefile ./codecs/mod_lpc10/Makefile ./codecs/mod_speex/Makefile ./directories/mod_ldap/Makefile ./endpoints/mod_dingaling/Makefile ./endpoints/mod_iax/Makefile ./endpoints/mod_portaudio/Makefile ./endpoints/mod_sofia/Makefile ./endpoints/mod_wanpipe/Makefile ./event_handlers/mod_cdr/Makefile ./event_handlers/mod_xmpp_event/Makefile ./event_handlers/mod_zeroconf/Makefile ./formats/mod_shout/Makefile ./formats/mod_sndfile/Makefile ./languages/mod_mono/Makefile ./languages/mod_perl/Makefile ./languages/mod_python/Makefile ./languages/mod_spidermonkey/Makefile ./languages/mod_spidermonkey_core_db/Makefile ./languages/mod_spidermonkey_etpan/Makefile ./languages/mod_spidermonkey_odbc/Makefile ./languages/mod_spidermonkey_skel/Makefile ./languages/mod_spidermonkey_teletone/Makefile ./xml_int/mod_xml_curl/Makefile ./xml_int/mod_xml_rpc/Makefile Modified: freeswitch/trunk/src/mod/applications/mod_enum/Makefile ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_enum/Makefile (original) +++ freeswitch/trunk/src/mod/applications/mod_enum/Makefile Mon Mar 12 01:17:17 2007 @@ -1,7 +1,7 @@ # define these targets in your makefile if you wish # local_all local_depend local_clean depend_install local_install local_distclean local_extraclean: -# and define these variables to imapact your build +# and define these variables to impact your build LOCAL_CFLAGS=-I$(BASE)/libs/udns LOCAL_LDFLAGS= LOCAL_OBJS=$(BASE)/libs/udns/libudns.a 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 Mon Mar 12 01:17:17 2007 @@ -1,7 +1,7 @@ # define these targets in your makefile if you wish # local_all local_depend local_clean depend_install local_install local_distclean local_extraclean: OSARCH=$(shell uname -s) -# and define these variables to imapact your build +# and define these variables to impact your build ifeq ($(OSARCH),Darwin) LOCAL_LDFLAGS += -framework swift Modified: freeswitch/trunk/src/mod/asr_tts/mod_lumenvox/Makefile ============================================================================== --- freeswitch/trunk/src/mod/asr_tts/mod_lumenvox/Makefile (original) +++ freeswitch/trunk/src/mod/asr_tts/mod_lumenvox/Makefile Mon Mar 12 01:17:17 2007 @@ -1,7 +1,7 @@ # define these targets in your makefile if you wish # local_all local_depend local_clean depend_install local_install local_distclean local_extraclean: -# and define these variables to imapact your build +# and define these variables to impact your build LOCAL_CFLAGS= -fpermissive -Wno-deprecated -Wno-conversion -fpermissive -Wno-unused -Wno-comment -Wno-sign-compare \ -Wno-conversion -Wno-reorder -I/opt/lumenvox/eng\ine_7.0/include LOCAL_LDFLAGS= -L/opt/lumenvox/engine_7.0/lib -llv_lvspeechport Modified: freeswitch/trunk/src/mod/codecs/mod_g711/Makefile ============================================================================== --- freeswitch/trunk/src/mod/codecs/mod_g711/Makefile (original) +++ freeswitch/trunk/src/mod/codecs/mod_g711/Makefile Mon Mar 12 01:17:17 2007 @@ -1,7 +1,7 @@ # define these targets in your makefile if you wish # local_all local_depend local_clean depend_install local_install local_distclean local_extraclean: -# and define these variables to imapact your build +# and define these variables to impact your build LOCAL_CFLAGS=-I$(BASE)/libs/codec/g7xx/src/include LOCAL_LDFLAGS= LOCAL_OBJS= Modified: freeswitch/trunk/src/mod/codecs/mod_g722/Makefile ============================================================================== --- freeswitch/trunk/src/mod/codecs/mod_g722/Makefile (original) +++ freeswitch/trunk/src/mod/codecs/mod_g722/Makefile Mon Mar 12 01:17:17 2007 @@ -1,7 +1,7 @@ # define these targets in your makefile if you wish # local_all local_depend local_clean depend_install local_install local_distclean local_extraclean: -# and define these variables to imapact your build +# and define these variables to impact your build LOCAL_CFLAGS=-I$(BASE)/libs/codec/g7xx/src/include/ LOCAL_LDFLAGS=$(BASE)/libs/codec/g7xx/libg7xx.la LOCAL_OBJS= 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 Mon Mar 12 01:17:17 2007 @@ -1,7 +1,7 @@ # define these targets in your makefile if you wish # local_all local_depend local_clean depend_install local_install local_distclean local_extraclean: -# and define these variables to imapact your build +# and define these variables to impact your build LOCAL_CFLAGS=-I$(BASE)/libs/codec/g726/src LOCAL_LDFLAGS= LOCAL_OBJS=$(BASE)/libs/codec/g726/libg726.la 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 Mon Mar 12 01:17:17 2007 @@ -1,7 +1,7 @@ # define these targets in your makefile if you wish # local_all local_depend local_clean depend_install local_install local_distclean local_extraclean: -# and define these variables to imapact your build +# and define these variables to impact your build LOCAL_CFLAGS=-I$(BASE)/libs/codec/gsm/inc LOCAL_LDFLAGS=$(BASE)/libs/codec/gsm/libgsm.la LOCAL_OBJS= 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 Mon Mar 12 01:17:17 2007 @@ -1,7 +1,7 @@ # define these targets in your makefile if you wish # local_all local_depend local_clean depend_install local_install local_distclean local_extraclean: -# and define these variables to imapact your build +# and define these variables to impact your build LOCAL_CFLAGS=-I$(BASE)/libs/codec/ilbc/src LOCAL_LDFLAGS=$(BASE)/libs/codec/ilbc/libilbc.la LOCAL_OBJS= 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 Mon Mar 12 01:17:17 2007 @@ -1,7 +1,7 @@ # define these targets in your makefile if you wish # local_all local_depend local_clean depend_install local_install local_distclean local_extraclean: -# and define these variables to imapact your build +# and define these variables to impact your build LOCAL_CFLAGS=-I$(BASE)/libs/codec/lpc10/src LOCAL_LDFLAGS=$(BASE)/libs/codec/lpc10/liblpc10.la LOCAL_OBJS= 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 Mon Mar 12 01:17:17 2007 @@ -1,7 +1,7 @@ # define these targets in your makefile if you wish # local_all local_depend local_clean depend_install local_install local_distclean local_extraclean: -# and define these variables to imapact your build +# and define these variables to impact your build LOCAL_CFLAGS=-I$(BASE)/libs/speex/include LOCAL_LDFLAGS=$(BASE)/libs/speex/libspeex/libspeex.la LOCAL_OBJS= 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 Mon Mar 12 01:17:17 2007 @@ -1,7 +1,7 @@ # define these targets in your makefile if you wish # local_all local_depend local_clean depend_install local_install local_distclean local_extraclean: -# and define these variables to imapact your build +# and define these variables to impact your build LOCAL_CFLAGS=-DWITH_OPENLDAP -DLDAP_DEPRECATED LOCAL_LDFLAGS=-lldap_r -llber LOCAL_OBJS= 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 Mon Mar 12 01:17:17 2007 @@ -1,7 +1,7 @@ # define these targets in your makefile if you wish # local_all local_depend local_clean depend_install local_install local_distclean local_extraclean: -# and define these variables to imapact your build +# and define these variables to impact your build LOCAL_CFLAGS=-I$(BASE)/libs/libdingaling/src LOCAL_LDFLAGS=$(BASE)/libs/libdingaling/libdingaling.la LOCAL_OBJS= 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 Mon Mar 12 01:17:17 2007 @@ -1,7 +1,7 @@ # define these targets in your makefile if you wish # local_all local_depend local_clean depend_install local_install local_distclean local_extraclean: -# and define these variables to imapact your build +# and define these variables to impact your build LOCAL_CFLAGS=-I$(BASE)/libs/iax/src LOCAL_LDFLAGS=$(BASE)/libs/iax/src/libiax.la LOCAL_OBJS= 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 Mon Mar 12 01:17:17 2007 @@ -1,7 +1,7 @@ # define these targets in your makefile if you wish # local_all local_depend local_clean depend_install local_install local_distclean local_extraclean: OSARCH=$(shell uname -s) -# and define these variables to imapact your build +# and define these variables to impact your build LOCAL_CFLAGS=-I. -I$(BASE)/libs/portaudio/include LOCAL_LDFLAGS=$(BASE)/libs/portaudio/lib/libportaudio.la ifeq ($(OSARCH),Darwin) 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 Mon Mar 12 01:17:17 2007 @@ -1,7 +1,7 @@ # define these targets in your makefile if you wish # local_all local_depend local_clean depend_install local_install local_distclean local_extraclean: -# and define these variables to imapact your build +# 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 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 Mon Mar 12 01:17:17 2007 @@ -1,7 +1,7 @@ # define these targets in your makefile if you wish # local_all local_depend local_clean depend_install local_install local_distclean local_extraclean: -# and define these variables to imapact your build +# and define these variables to impact your build LOCAL_CFLAGS= LOCAL_LDFLAGS= LOCAL_OBJS=cdrcontainer.o basecdr.o baseregistry.o pddcdr.o csvcdr.o xmlcdr.o sqlitecdr.o Modified: freeswitch/trunk/src/mod/event_handlers/mod_xmpp_event/Makefile ============================================================================== --- freeswitch/trunk/src/mod/event_handlers/mod_xmpp_event/Makefile (original) +++ freeswitch/trunk/src/mod/event_handlers/mod_xmpp_event/Makefile Mon Mar 12 01:17:17 2007 @@ -1,7 +1,7 @@ # define these targets in your makefile if you wish # local_all local_depend local_clean depend_install local_install local_distclean local_extraclean: -# and define these variables to imapact your build +# and define these variables to impact your build LOCAL_CFLAGS=-I$(BASE)/libs/iksemel/include LOCAL_LDFLAGS=$(BASE)/libs/iksemel/src/libiksemel.la LOCAL_OBJS= 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 Mon Mar 12 01:17:17 2007 @@ -1,7 +1,7 @@ # define these targets in your makefile if you wish # local_all local_depend local_clean depend_install local_install local_distclean local_extraclean: -# and define these variables to imapact your build +# and define these variables to impact your build LOCAL_CFLAGS=-I$(PREFIX)/include/howl LOCAL_LDFLAGS=-lhowl LOCAL_OBJS= 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 Mon Mar 12 01:17:17 2007 @@ -1,7 +1,7 @@ # define these targets in your makefile if you wish # local_all local_depend local_clean depend_install local_install local_distclean local_extraclean: -# and define these variables to imapact your build +# and define these variables to impact your build LOCAL_CFLAGS= LOCAL_LDFLAGS=-lshout -lmp3lame LOCAL_OBJS= 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 Mon Mar 12 01:17:17 2007 @@ -1,7 +1,7 @@ # define these targets in your makefile if you wish # local_all local_depend local_clean depend_install local_install local_distclean local_extraclean: -# and define these variables to imapact your build +# and define these variables to impact your build LOCAL_CFLAGS=-I$(BASE)/libs/libsndfile/src LOCAL_LDFLAGS=$(BASE)/libs/libsndfile/src/libsndfile.la LOCAL_OBJS= 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 Mon Mar 12 01:17:17 2007 @@ -1,7 +1,7 @@ # define these targets in your makefile if you wish # local_all local_depend local_clean depend_install local_install local_distclean local_extraclean: -# and define these variables to imapact your build +# and define these variables to impact your build LOCAL_CFLAGS=-DMULTIPLICITY $(shell $(PERL) -MExtUtils::Embed -e ccopts) -DEMBED_PERL LOCAL_LDFLAGS=$(shell $(PERL) -MExtUtils::Embed -e ldopts) $(shell $(PERL) -MConfig -e 'print $$Config{libs}') LOCAL_OBJS=perlxsi.o Modified: freeswitch/trunk/src/mod/languages/mod_python/Makefile ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_python/Makefile (original) +++ freeswitch/trunk/src/mod/languages/mod_python/Makefile Mon Mar 12 01:17:17 2007 @@ -1,7 +1,7 @@ # define these targets in your makefile if you wish # local_all local_depend local_clean depend_install local_install local_distclean local_extraclean: -# and define these variables to imapact your build +# and define these variables to impact your build LOCAL_CFLAGS=-I$(PREFIX)/include/python2.4/ LOCAL_LDFLAGS=-lpython2.4 -L$(PREFIX)/lib/python2.4/config/ -lutil -lstdc++ LOCAL_OBJS=freeswitch_python.o mod_python_wrap.o Modified: freeswitch/trunk/src/mod/languages/mod_spidermonkey_etpan/Makefile ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_spidermonkey_etpan/Makefile (original) +++ freeswitch/trunk/src/mod/languages/mod_spidermonkey_etpan/Makefile Mon Mar 12 01:17:17 2007 @@ -2,7 +2,7 @@ # define these targets in your makefile if you wish # local_all local_depend local_clean depend_install local_install local_distclean local_extraclean: -# and define these variables to imapact your build +# and define these variables to impact your build #LOCAL_CFLAGS= LOCAL_LDFLAGS+=-letpan #LOCAL_OBJS= 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 Mon Mar 12 01:17:17 2007 @@ -2,7 +2,7 @@ # define these targets in your makefile if you wish # local_all local_depend local_clean depend_install local_install local_distclean local_extraclean: -# and define these variables to imapact your build +# and define these variables to impact your build #LOCAL_CFLAGS= LOCAL_LDFLAGS+=-lodbc #LOCAL_OBJS= 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 Mon Mar 12 01:17:17 2007 @@ -1,7 +1,7 @@ # define these targets in your makefile if you wish # local_all local_depend local_clean depend_install local_install local_distclean local_extraclean: -# and define these variables to imapact your build +# and define these variables to impact your build LOCAL_CFLAGS=-I$(BASE)/libs/curl/include LOCAL_LDFLAGS=$(BASE)/libs/curl/lib/libcurl.la LOCAL_OBJS=

1 0

[commit] r4563 - in freeswitch/trunk/src/mod: asr_tts/mod_cepstral endpoints/mod_portaudio
by Freeswitch SVN 12 Mar '07

12 Mar '07

Author: brian Date: Mon Mar 12 01:13:43 2007 New Revision: 4563 Modified: freeswitch/trunk/src/mod/asr_tts/mod_cepstral/Makefile freeswitch/trunk/src/mod/asr_tts/mod_cepstral/mod_cepstral.c freeswitch/trunk/src/mod/endpoints/mod_portaudio/Makefile Log: OSARCH isn't set right but this will build now. 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 Mon Mar 12 01:13:43 2007 @@ -1,10 +1,9 @@ # define these targets in your makefile if you wish # local_all local_depend local_clean depend_install local_install local_distclean local_extraclean: - +OSARCH=$(shell uname -s) # and define these variables to imapact your build ifeq ($(OSARCH),Darwin) -LOCAL_CFLAGS += -I/Library/Frameworks/swift.framework/Versions/4/Headers LOCAL_LDFLAGS += -framework swift else LOCAL_LDFLAGS += -L/opt/swift/lib -lswift -lceplex_us -lceplang_en -lm Modified: freeswitch/trunk/src/mod/asr_tts/mod_cepstral/mod_cepstral.c ============================================================================== --- freeswitch/trunk/src/mod/asr_tts/mod_cepstral/mod_cepstral.c (original) +++ freeswitch/trunk/src/mod/asr_tts/mod_cepstral/mod_cepstral.c Mon Mar 12 01:13:43 2007 @@ -38,8 +38,11 @@ #ifdef __ICC #pragma warning (disable:188) #endif - +#ifdef MACOSX +#include <swift/swift.h> +#else #include <swift.h> +#endif #include <switch.h> #define MY_BUF_LEN 1024 * 32 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 Mon Mar 12 01:13:43 2007 @@ -1,6 +1,6 @@ # define these targets in your makefile if you wish # local_all local_depend local_clean depend_install local_install local_distclean local_extraclean: - +OSARCH=$(shell uname -s) # and define these variables to imapact your build LOCAL_CFLAGS=-I. -I$(BASE)/libs/portaudio/include LOCAL_LDFLAGS=$(BASE)/libs/portaudio/lib/libportaudio.la

1 0

12 Mar '07

Author: mikej Date: Mon Mar 12 00:21:54 2007 New Revision: 4562 Modified: freeswitch/trunk/Makefile.am freeswitch/trunk/Makefile.in freeswitch/trunk/build/buildlib.sh freeswitch/trunk/build/modmake.rules.in freeswitch/trunk/build/modmake.sh freeswitch/trunk/configure freeswitch/trunk/configure.in freeswitch/trunk/generic_mod.mk 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_portaudio/pa_ringbuffer.c 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/sm.mak freeswitch/trunk/src/mod/languages/mod_spidermonkey_core_db/Makefile freeswitch/trunk/src/mod/languages/mod_spidermonkey_etpan/Makefile freeswitch/trunk/src/mod/languages/mod_spidermonkey_odbc/Makefile freeswitch/trunk/src/mod/languages/mod_spidermonkey_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: an attempt to simplify the module make files. More changes to come on the modules building soon Modified: freeswitch/trunk/Makefile.am ============================================================================== --- freeswitch/trunk/Makefile.am (original) +++ freeswitch/trunk/Makefile.am Mon Mar 12 00:21:54 2007 @@ -5,7 +5,7 @@ PREFIX=$(prefix) AM_CFLAGS = $(SWITCH_AM_CFLAGS) -AM_CPPFLAGS = $(AM_CFLAGS) +AM_CPPFLAGS = $(SWITCH_AM_CXXFLAGS) AM_LDFLAGS = $(SWITCH_AM_LDFLAGS) BASE = $(switch_srcdir) OSARCH=$(shell uname -s) Modified: freeswitch/trunk/Makefile.in ============================================================================== --- freeswitch/trunk/Makefile.in (original) +++ freeswitch/trunk/Makefile.in Mon Mar 12 00:21:54 2007 @@ -44,7 +44,7 @@ bin_PROGRAMS = freeswitch$(EXEEXT) DIST_COMMON = README $(am__configure_deps) $(library_include_HEADERS) \ $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(top_srcdir)/configure \ + $(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 \ @@ -70,7 +70,7 @@ mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/src/include/switch_private.h CONFIG_CLEAN_FILES = src/include/switch_am_config.h \ - src/include/switch_version.h + build/modmake.rules src/include/switch_version.h am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; am__vpath_adj = case $$p in \ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ @@ -212,6 +212,7 @@ 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@ @@ -279,7 +280,7 @@ NAME = freeswitch PREFIX = $(prefix) AM_CFLAGS = $(SWITCH_AM_CFLAGS) $(am__append_1) -AM_CPPFLAGS = $(AM_CFLAGS) +AM_CPPFLAGS = $(SWITCH_AM_CXXFLAGS) AM_LDFLAGS = $(SWITCH_AM_LDFLAGS) BASE = $(switch_srcdir) OSARCH = $(shell uname -s) @@ -412,6 +413,8 @@ -rm -f src/include/switch_private.h src/include/stamp-h1 src/include/switch_am_config.h: $(top_builddir)/config.status $(top_srcdir)/src/include/switch_am_config.h.in 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) @@ -812,7 +815,7 @@ distdir: $(DISTFILES) $(am__remove_distdir) mkdir $(distdir) - $(mkdir_p) $(distdir)/build/config $(distdir)/libs/apr/build $(distdir)/src/include + $(mkdir_p) $(distdir)/build $(distdir)/build/config $(distdir)/libs/apr/build $(distdir)/src/include @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ list='$(DISTFILES)'; for file in $$list; do \ Modified: freeswitch/trunk/build/buildlib.sh ============================================================================== --- freeswitch/trunk/build/buildlib.sh (original) +++ freeswitch/trunk/build/buildlib.sh Mon Mar 12 00:21:54 2007 @@ -81,7 +81,7 @@ MAKE=$MAKE ../$uncompressed.build.sh $@ else $MAKE clean 2>&1 - CFLAGS="$MOD_CFLAGS" ; export CFLAGS; sh ./configure $@ + CFLAGS="$MOD_CFLAGS" sh ./configure $@ if [ $? = 0 ] ; then $MAKE Modified: freeswitch/trunk/build/modmake.rules.in ============================================================================== --- freeswitch/trunk/build/modmake.rules.in (original) +++ freeswitch/trunk/build/modmake.rules.in Mon Mar 12 00:21:54 2007 @@ -2,18 +2,17 @@ switch_builddir=@switch_builddir@ switch_srcdir=@switch_srcdir@ -BASE=$(switch_srcdir) CC=@CC@ -RM=@RM@ +CXX=@CXX@ AWK=@AWK@ SHELL=@SHELL@ INSTALL=@INSTALL@ LIBTOOL=$(switch_builddir)/libtool LTINSTALL = $(LIBTOOL) --mode=install $(INSTALL) +CCLD = $(CC) +CXXLD = $(CXX) -CFLAGS=@SWITCH_AM_CFLAGS@ @CFLAGS@ -CPPFLAGS=$(CFLAGS) @CPPFLAGS@ LDFLAGS=@SWITCH_AM_LDFLAGS@ @LDFLAGS@ LIBS=$(switch_builddir)/libfreeswitch.la DEFS=@DEFS@ @@ -25,33 +24,67 @@ DYNAMIC_LIB_EXTEN = @DYNAMIC_LIB_EXTEN@ SOLINK = @SOLINK@ -COMPILE = $(CC) $(MOD_CFLAGS) $(MOD_CPPFLAGS) $(MOD_INCLUDES) -LT_COMPILE = @lt_compile@ +ALL_CFLAGS = $(LOCAL_CFLAGS) $(MOD_CFLAGS) @SWITCH_AM_CFLAGS@ @CFLAGS@ -D_GNU_SOURCE +ALL_CXXFLAGS = $(LOCAL_CFLAGS) $(MOD_CFLAGS) @SWITCH_AM_CXXFLAGS@ @CXXFLAGS@ -D_GNU_SOURC -LINK = @link@ +COMPILE = $(CC) $(ALL_CFLAGS) $(DEFS) +LTCOMPILE = $(LIBTOOL) --mode=compile --tag=CC $(COMPILE) +LINK = $(LIBTOOL) --mode=link --tag=CC $(CCLD) $(ALL_CFLAGS) $(LDFLAGS) -o $@ + +CXXCOMPILE = $(CXX) $(ALL_CXXFLAGS) $(DEFS) +LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXXCOMPILE) +CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(ALL_CXXFLAGS) $(LDFLAGS) -o $@ + +CURDIR=$(shell pwd) +CSOURCEFILE=$(CURDIR)/$(MODNAME).c +CXXSOURCEFILE=$(CURDIR)/$(MODNAME).cpp +LINK_TYPE=$(shell if test -f $(CSOURCEFILE); then echo "clink"; else echo "cxxlink"; fi;) + +all: depend $(MODNAME).$(DYNAMIC_LIB_EXTEN) local_all +depend: local_depend +clean: local_clean mod_clean +install: depend_install local_install mod_install +distclean: clean local_distclean +extraclean: distclean local_extraclean + +$(MODNAME).$(DYNAMIC_LIB_EXTEN): $(MODNAME).o $(LOCAL_OBJS) depend $(LINK_TYPE) -all: $(MODNAME).$(DYNAMIC_LIB_EXTEN) +clink: $(MODNAME).o $(LOCAL_OBJS) + $(LINK) $(SOLINK) $(MODNAME).o -o $(MODNAME).$(DYNAMIC_LIB_EXTEN) $(LIBS) $(LOCAL_LDFLAGS) $(LOCAL_OBJS) -$(MODNAME).$(DYNAMIC_LIB_EXTEN): $(MODNAME).c - $(CC) $(CFLAGS) -c $(MODNAME).c -o $(MODNAME).o - $(LINK) $(SOLINK) $(MODNAME).o -o $(MODNAME).$(DYNAMIC_LIB_EXTEN) $(LDFLAGS) $(OBJS) +cxxlink: $(MODNAME).o $(LOCAL_OBJS) + $(CXXLINK) $(SOLINK) $(MODNAME).o -o $(MODNAME).$(DYNAMIC_LIB_EXTEN) $(LIBS) $(LOCAL_LDFLAGS) $(LOCAL_OBJS) -clean: +mod_clean: rm -fr *.$(DYNAMIC_LIB_EXTEN) *.o *~ .libs -install: +mod_install: $(LTINSTALL) $(MODNAME).$(DYNAMIC_LIB_EXTEN) $(DESTDIR)$(PREFIX)/mod +# define these in your makefile if you wish +local_all local_depend local_clean depend_install local_install local_distclean local_extraclean: # # Implicit rules for creating outputs from input files # .SUFFIXES: -.SUFFIXES: .c .lo .o +.SUFFIXES: .c .lo .o .cpp .c.o: - $(COMPILE) -c $< + $(COMPILE) -c -o $@ $< .c.lo: - $(LT_COMPILE) + $(LTCOMPILE) -c -o $@ $< +.cpp.o: + $(CXXCOMPILE) -c -o $@ $< + +.cpp.lo: + $(LTCXXCOMPILE) -c -o $@ $< + + +.PHONY: all depend clean local_all local_depend \ + install depend_install local_install mod_install \ + clean local_clean mod_clean distclean \ + local_distclean extraclean local_extraclean \ + clink cxxlink Modified: freeswitch/trunk/build/modmake.sh ============================================================================== --- freeswitch/trunk/build/modmake.sh (original) +++ freeswitch/trunk/build/modmake.sh Mon Mar 12 00:21:54 2007 @@ -7,9 +7,6 @@ mod=$1 shift -if [ -f $pwd/build/freeswitch.env ] ; then - . $pwd/build/freeswitch.env -fi end=`echo $mod | sed "s/^.*\///g"` if [ -z "$end" ] ; then @@ -17,8 +14,8 @@ fi if [ -f $mod/Makefile ] ; then - CFLAGS="$MOD_CFLAGS $CFLAGS " MODNAME=$end $make -C $mod $@ + MOD_CFLAGS="$MOD_CFLAGS" MODNAME=$end BASE=$pwd $make -C $mod $@ else - CFLAGS="$MOD_CFLAGS $CFLAGS" MODNAME=$end $make -f $pwd/generic_mod.mk -C $mod $@ + MOD_CFLAGS="$MOD_CFLAGS" MODNAME=$end BASE=$pwd $make -f $pwd/generic_mod.mk -C $mod $@ fi Modified: freeswitch/trunk/configure ============================================================================== --- freeswitch/trunk/configure (original) +++ freeswitch/trunk/configure Mon Mar 12 00:21:54 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_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 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. @@ -20028,7 +20028,8 @@ # set defaults for use on all platforms -SWITCH_AM_CFLAGS="-I${switch_srcdir}/src/include -I${switch_srcdir} -I${prefix}/include" +SWITCH_AM_CFLAGS="-I${switch_srcdir}/src/include -I${prefix}/include" +SWITCH_AM_CXXFLAGS="-I${switch_srcdir}/src/include -I${prefix}/include" SWITCH_AM_LDFLAGS="-L${prefix}/lib -lm -L/usr/local/lib/db42 -L/usr/local/lib" #set SOLINK variable based on compiler and host @@ -20108,6 +20109,48 @@ fi + if test "x$SWITCH_AM_CXXFLAGS" = "x"; then + test "x$silent" != "xyes" && echo " setting SWITCH_AM_CXXFLAGS to \"-KPIC\"" + SWITCH_AM_CXXFLAGS="-KPIC" + else + apr_addto_bugger="-KPIC" + for i in $apr_addto_bugger; do + apr_addto_duplicate="0" + for j in $SWITCH_AM_CXXFLAGS; do + if test "x$i" = "x$j"; then + apr_addto_duplicate="1" + break + fi + done + if test $apr_addto_duplicate = "0"; then + test "x$silent" != "xyes" && echo " adding \"$i\" to SWITCH_AM_CXXFLAGS" + SWITCH_AM_CXXFLAGS="$SWITCH_AM_CXXFLAGS $i" + fi + done + fi + + + if test "x$SWITCH_AM_CXXFLAGS" = "x"; then + test "x$silent" != "xyes" && echo " setting SWITCH_AM_CXXFLAGS to \"-DPIC\"" + SWITCH_AM_CXXFLAGS="-DPIC" + else + apr_addto_bugger="-DPIC" + for i in $apr_addto_bugger; do + apr_addto_duplicate="0" + for j in $SWITCH_AM_CXXFLAGS; do + if test "x$i" = "x$j"; then + apr_addto_duplicate="1" + break + fi + done + if test $apr_addto_duplicate = "0"; then + test "x$silent" != "xyes" && echo " adding \"$i\" to SWITCH_AM_CXXFLAGS" + SWITCH_AM_CXXFLAGS="$SWITCH_AM_CXXFLAGS $i" + fi + done + fi + + if test "x$SWITCH_AM_LDFLAGS" = "x"; then test "x$silent" != "xyes" && echo " setting SWITCH_AM_LDFLAGS to \"-R${prefix}/lib\"" SWITCH_AM_LDFLAGS="-R${prefix}/lib" @@ -20150,6 +20193,27 @@ done fi + + if test "x$SWITCH_AM_CXXFLAGS" = "x"; then + test "x$silent" != "xyes" && echo " setting SWITCH_AM_CXXFLAGS to \"-fPIC\"" + SWITCH_AM_CXXFLAGS="-fPIC" + else + apr_addto_bugger="-fPIC" + for i in $apr_addto_bugger; do + apr_addto_duplicate="0" + for j in $SWITCH_AM_CXXFLAGS; do + if test "x$i" = "x$j"; then + apr_addto_duplicate="1" + break + fi + done + if test $apr_addto_duplicate = "0"; then + test "x$silent" != "xyes" && echo " adding \"$i\" to SWITCH_AM_CXXFLAGS" + SWITCH_AM_CXXFLAGS="$SWITCH_AM_CXXFLAGS $i" + fi + done + fi + fi # tweak platform specific flags @@ -20223,6 +20287,28 @@ esac + if test "x$SWITCH_AM_CXXFLAGS" = "x-std=c99"; then + test "x$silent" != "xyes" && echo " nulling SWITCH_AM_CXXFLAGS" + SWITCH_AM_CXXFLAGS="" + else + apr_new_bugger="" + apr_removed=0 + for i in $SWITCH_AM_CXXFLAGS; do + if test "x$i" != "x-std=c99"; then + apr_new_bugger="$apr_new_bugger $i" + else + apr_removed=1 + fi + done + if test $apr_removed = "1"; then + test "x$silent" != "xyes" && echo " removed \"-std=c99\" from SWITCH_AM_CXXFLAGS" + SWITCH_AM_CXXFLAGS=$apr_new_bugger + fi + fi + + + + @@ -24990,7 +25076,7 @@ fi - ac_config_files="$ac_config_files Makefile src/include/switch_am_config.h" + ac_config_files="$ac_config_files Makefile src/include/switch_am_config.h build/modmake.rules" @@ -25717,6 +25803,7 @@ # Handling of arguments. "Makefile" ) CONFIG_FILES="$CONFIG_FILES 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" ;; @@ -25876,6 +25963,7 @@ s,@WANT_DEBUG_TRUE@,$WANT_DEBUG_TRUE,;t t s,@WANT_DEBUG_FALSE@,$WANT_DEBUG_FALSE,;t t s,@SWITCH_AM_CFLAGS@,$SWITCH_AM_CFLAGS,;t t +s,@SWITCH_AM_CXXFLAGS@,$SWITCH_AM_CXXFLAGS,;t t s,@SWITCH_AM_LDFLAGS@,$SWITCH_AM_LDFLAGS,;t t s,@SOLINK@,$SOLINK,;t t s,@DYNAMIC_LIB_EXTEN@,$DYNAMIC_LIB_EXTEN,;t t Modified: freeswitch/trunk/configure.in ============================================================================== --- freeswitch/trunk/configure.in (original) +++ freeswitch/trunk/configure.in Mon Mar 12 00:21:54 2007 @@ -53,7 +53,8 @@ AM_CONDITIONAL([WANT_DEBUG],[test "${enable_debug}" = "yes"]) # set defaults for use on all platforms -SWITCH_AM_CFLAGS="-I${switch_srcdir}/src/include -I${switch_srcdir} -I${prefix}/include" +SWITCH_AM_CFLAGS="-I${switch_srcdir}/src/include -I${prefix}/include" +SWITCH_AM_CXXFLAGS="-I${switch_srcdir}/src/include -I${prefix}/include" SWITCH_AM_LDFLAGS="-L${prefix}/lib -lm -L/usr/local/lib/db42 -L/usr/local/lib" #set SOLINK variable based on compiler and host @@ -90,9 +91,12 @@ if test "x${ax_cv_c_compiler_vendor}" = "xsun" ; then APR_ADDTO(SWITCH_AM_CFLAGS, -KPIC) APR_ADDTO(SWITCH_AM_CFLAGS, -DPIC) + APR_ADDTO(SWITCH_AM_CXXFLAGS, -KPIC) + APR_ADDTO(SWITCH_AM_CXXFLAGS, -DPIC) APR_ADDTO(SWITCH_AM_LDFLAGS, -R${prefix}/lib) elif test "x${ax_cv_c_compiler_vendor}" = "xgnu" ; then APR_ADDTO(SWITCH_AM_CFLAGS, -fPIC) + APR_ADDTO(SWITCH_AM_CXXFLAGS, -fPIC) fi # tweak platform specific flags @@ -106,7 +110,10 @@ ;; esac +APR_REMOVEFROM(SWITCH_AM_CXXFLAGS, -std=c99) + AC_SUBST(SWITCH_AM_CFLAGS) +AC_SUBST(SWITCH_AM_CXXFLAGS) AC_SUBST(SWITCH_AM_LDFLAGS) AC_SUBST(SOLINK) AC_SUBST(DYNAMIC_LIB_EXTEN) @@ -270,7 +277,8 @@ AM_CONDITIONAL([CRASHPROT],[test "x$enable_crash_prot" != "xno"]) AC_CONFIG_FILES([Makefile - src/include/switch_am_config.h]) + src/include/switch_am_config.h + build/modmake.rules]) AM_CONDITIONAL(ISLINUX, [test `uname -s` = Linux]) AM_CONDITIONAL(ISMAC, [test `uname -s` = Darwin]) Modified: freeswitch/trunk/generic_mod.mk ============================================================================== --- freeswitch/trunk/generic_mod.mk (original) +++ freeswitch/trunk/generic_mod.mk Mon Mar 12 00:21:54 2007 @@ -1,11 +1,9 @@ -all: $(MODNAME).$(DYNAMIC_LIB_EXTEN) +# define these targets in your makefile if you wish +# local_all local_depend local_clean depend_install local_install local_distclean local_extraclean: -$(MODNAME).$(DYNAMIC_LIB_EXTEN): $(MODNAME).c - $(CC) $(CFLAGS) -c $(MODNAME).c -o $(MODNAME).o - $(LINK) $(SOLINK) $(MODNAME).o -o $(MODNAME).$(DYNAMIC_LIB_EXTEN) $(LDFLAGS) +# and define these variables to imapact your build +LOCAL_CFLAGS= +LOCAL_LDFLAGS= +LOCAL_OBJS= +include $(BASE)/build/modmake.rules -clean: - rm -fr *.$(DYNAMIC_LIB_EXTEN) *.o *~ .libs - -install: - $(LTINSTALL) $(MODNAME).$(DYNAMIC_LIB_EXTEN) $(DESTDIR)$(PREFIX)/mod 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 Mon Mar 12 00:21:54 2007 @@ -1,20 +1,13 @@ -CFLAGS += -I$(BASE)/libs/udns -LINKER=$(CC) +# define these targets in your makefile if you wish +# local_all local_depend local_clean depend_install local_install local_distclean local_extraclean: -all: depends $(MODNAME).$(DYNAMIC_LIB_EXTEN) +# and define these variables to imapact your build +LOCAL_CFLAGS=-I$(BASE)/libs/udns +LOCAL_LDFLAGS= +LOCAL_OBJS=$(BASE)/libs/udns/libudns.a +include $(BASE)/build/modmake.rules -depends: +local_depend: cd $(BASE)/libs/udns && $(MAKE) staticlib -%.o: %.c - $(CC) -fPIC $(CFLAGS) -c -o $@ $< -$(MODNAME).$(DYNAMIC_LIB_EXTEN): $(MODNAME).c - $(CC) $(CFLAGS) -c $(MODNAME).c -o $(MODNAME).o - $(LINK) $(SOLINK) -o $(MODNAME).$(DYNAMIC_LIB_EXTEN) $(MODNAME).o $(LDFLAGS) $(BASE)/libs/udns/libudns.a - -clean: - rm -fr *.$(DYNAMIC_LIB_EXTEN) *.o *~ - -install: - $(LTINSTALL) $(MODNAME).$(DYNAMIC_LIB_EXTEN) $(DESTDIR)$(PREFIX)/mod 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 Mon Mar 12 00:21:54 2007 @@ -1,23 +1,15 @@ +# define these targets in your makefile if you wish +# local_all local_depend local_clean depend_install local_install local_distclean local_extraclean: + +# and define these variables to imapact your build + ifeq ($(OSARCH),Darwin) -CFLAGS += -I/Library/Frameworks/swift.framework/Versions/4/Headers -LDFLAGS += -framework swift +LOCAL_CFLAGS += -I/Library/Frameworks/swift.framework/Versions/4/Headers +LOCAL_LDFLAGS += -framework swift else -LDFLAGS += -L/opt/swift/lib -lswift -lceplex_us -lceplang_en -lm -CFLAGS += -I/opt/swift/include +LOCAL_LDFLAGS += -L/opt/swift/lib -lswift -lceplex_us -lceplang_en -lm +LOCAL_CFLAGS += -I/opt/swift/include endif +LOCAL_OBJS= +include $(BASE)/build/modmake.rules -LINKER=$(CC) - -all: depends $(MODNAME).$(DYNAMIC_LIB_EXTEN) - -depends: - -$(MODNAME).$(DYNAMIC_LIB_EXTEN): $(MODNAME).c - $(CC) $(CFLAGS) -c $(MODNAME).c -o $(MODNAME).o - $(LINK) $(SOLINK) -o $(MODNAME).$(DYNAMIC_LIB_EXTEN) $(MODNAME).o $(LDFLAGS) - -clean: - rm -fr *.$(DYNAMIC_LIB_EXTEN) *.o *~ .libs - -install: - $(LTINSTALL) $(MODNAME).$(DYNAMIC_LIB_EXTEN) $(DESTDIR)$(PREFIX)/mod 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 Mon Mar 12 00:21:54 2007 @@ -1,18 +1,10 @@ -LDFLAGS += -L/opt/lumenvox/engine_7.0/lib -llv_lvspeechport -CFLAGS += -fpermissive -Wno-deprecated -Wno-conversion -fpermissive -Wno-unused -Wno-comment -Wno-sign-compare -Wno-conversion -Wno-reorder -I/opt/lumenvox/engine_7.0/include -LINKER=g++ -CC=g++ +# define these targets in your makefile if you wish +# local_all local_depend local_clean depend_install local_install local_distclean local_extraclean: -all: depends $(MODNAME).$(DYNAMIC_LIB_EXTEN) +# and define these variables to imapact your build +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 -depends: - -$(MODNAME).$(DYNAMIC_LIB_EXTEN): $(MODNAME).cpp - $(CC) $(CFLAGS) -fPIC -c $(MODNAME).cpp -o $(MODNAME).o - $(LINKER) $(SOLINK) -o $(MODNAME).$(DYNAMIC_LIB_EXTEN) $(MODNAME).o $(LDFLAGS) - -clean: - rm -fr *.$(DYNAMIC_LIB_EXTEN) *.o *~ - -install: - cp -f $(MODNAME).$(DYNAMIC_LIB_EXTEN) $(PREFIX)/mod 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 Mon Mar 12 00:21:54 2007 @@ -1,24 +1,12 @@ ifeq ($(shell ls -d $(BASE)/libs/amr),$(BASE)/libs/amr) -CFLAGS += -I$(PREFIX)/include/amr -LDFLAGS +=-lamr +LOCAL_CFLAGS += -I$(PREFIX)/include/amr +LOCAL_LDFLAGS +=-lamr else -CFLAGS += -DAMR_PASSTHROUGH +LOCAL_CFLAGS += -DAMR_PASSTHROUGH endif -all: $(MODNAME).$(DYNAMIC_LIB_EXTEN) - -depends: - -$(MODNAME).$(DYNAMIC_LIB_EXTEN): $(MODNAME).c - $(CC) $(CFLAGS) -fPIC -c $(MODNAME).c -o $(MODNAME).o - $(LINK) $(SOLINK) -o $(MODNAME).$(DYNAMIC_LIB_EXTEN) $(MODNAME).o $(LDFLAGS) - -clean: - rm -fr *.$(DYNAMIC_LIB_EXTEN) *.o *~ .libs - -install: - $(LTINSTALL) $(MODNAME).$(DYNAMIC_LIB_EXTEN) $(DESTDIR)$(PREFIX)/mod +include $(BASE)/build/modmake.rules Modified: freeswitch/trunk/src/mod/codecs/mod_g711/Makefile ============================================================================== --- freeswitch/trunk/src/mod/codecs/mod_g711/Makefile (original) +++ freeswitch/trunk/src/mod/codecs/mod_g711/Makefile Mon Mar 12 00:21:54 2007 @@ -1,13 +1,10 @@ -CFLAGS += -I$(BASE)/libs/codec/g7xx/src/include -all: $(MODNAME).$(DYNAMIC_LIB_EXTEN) +# define these targets in your makefile if you wish +# local_all local_depend local_clean depend_install local_install local_distclean local_extraclean: -$(MODNAME).$(DYNAMIC_LIB_EXTEN): $(MODNAME).c - $(CC) $(CFLAGS) -c $(MODNAME).c -o $(MODNAME).o - $(LINK) $(SOLINK) -o $(MODNAME).$(DYNAMIC_LIB_EXTEN) $(MODNAME).o $(LDFLAGS) +# and define these variables to imapact your build +LOCAL_CFLAGS=-I$(BASE)/libs/codec/g7xx/src/include +LOCAL_LDFLAGS= +LOCAL_OBJS= +include $(BASE)/build/modmake.rules -clean: - rm -fr *.$(DYNAMIC_LIB_EXTEN) *.o *~ .libs - -install: - $(LTINSTALL) $(MODNAME).$(DYNAMIC_LIB_EXTEN) $(DESTDIR)$(PREFIX)/mod 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 Mon Mar 12 00:21:54 2007 @@ -1,16 +1,12 @@ -CFLAGS +=-I$(BASE)/libs/codec/g7xx/src/include/ +# define these targets in your makefile if you wish +# local_all local_depend local_clean depend_install local_install local_distclean local_extraclean: -all: depends $(MODNAME).$(DYNAMIC_LIB_EXTEN) +# and define these variables to imapact your build +LOCAL_CFLAGS=-I$(BASE)/libs/codec/g7xx/src/include/ +LOCAL_LDFLAGS=$(BASE)/libs/codec/g7xx/libg7xx.la +LOCAL_OBJS= +include $(BASE)/build/modmake.rules -depends: +local_depend: cd $(BASE)/libs/codec/g7xx && $(MAKE) -$(MODNAME).$(DYNAMIC_LIB_EXTEN): $(MODNAME).c - $(CC) $(CFLAGS) -c $(MODNAME).c -o $(MODNAME).o - $(LINK) $(SOLINK) $(MODNAME).o -o $(MODNAME).$(DYNAMIC_LIB_EXTEN) $(LDFLAGS) $(BASE)/libs/codec/g7xx/libg7xx.la - -clean: - rm -fr *.$(DYNAMIC_LIB_EXTEN) *.o *~ .libs - -install: - $(LTINSTALL) $(MODNAME).$(DYNAMIC_LIB_EXTEN) $(DESTDIR)$(PREFIX)/mod 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 Mon Mar 12 00:21:54 2007 @@ -1,23 +1,7 @@ ifeq ($(shell ls -d $(BASE)/libs/libg723_1),$(BASE)/libs/libg723_1) - -CFLAGS += -I$(PREFIX)/include/g723 -LDFLAGS +=-lg723 - +LOCAL_CFLAGS += -I$(PREFIX)/include/g723 +LOCAL_LDFLAGS +=-lg723 else - -CFLAGS += -DG723_PASSTHROUGH +LOCAL_CFLAGS += -DG723_PASSTHROUGH endif - -all: $(MODNAME).$(DYNAMIC_LIB_EXTEN) - -depends: - -$(MODNAME).$(DYNAMIC_LIB_EXTEN): $(MODNAME).c - $(CC) $(CFLAGS) -fPIC -c $(MODNAME).c -o $(MODNAME).o - $(LINK) $(SOLINK) -o $(MODNAME).$(DYNAMIC_LIB_EXTEN) $(MODNAME).o $(LDFLAGS) - -clean: - rm -fr *.$(DYNAMIC_LIB_EXTEN) *.o *~ .libs - -install: - $(LTINSTALL) $(MODNAME).$(DYNAMIC_LIB_EXTEN) $(DESTDIR)$(PREFIX)/mod +include $(BASE)/build/modmake.rules Modified: freeswitch/trunk/src/mod/codecs/mod_g726/Makefile ============================================================================== --- freeswitch/trunk/src/mod/codecs/mod_g726/Makefile (original) +++ freeswitch/trunk/src/mod/codecs/mod_g726/Makefile Mon Mar 12 00:21:54 2007 @@ -1,16 +1,12 @@ -CFLAGS += -I$(BASE)/libs/codec/g726/src +# define these targets in your makefile if you wish +# local_all local_depend local_clean depend_install local_install local_distclean local_extraclean: -all: depends $(MODNAME).$(DYNAMIC_LIB_EXTEN) +# and define these variables to imapact your build +LOCAL_CFLAGS=-I$(BASE)/libs/codec/g726/src +LOCAL_LDFLAGS= +LOCAL_OBJS=$(BASE)/libs/codec/g726/libg726.la +include $(BASE)/build/modmake.rules -depends: +local_depend: cd $(BASE)/libs/codec/g726 && $(MAKE) -$(MODNAME).$(DYNAMIC_LIB_EXTEN): $(MODNAME).c ../../../include/switch_bitpack.h - $(CC) $(CFLAGS) -fPIC -c $(MODNAME).c -o $(MODNAME).o - $(LINK) $(SOLINK) $(MODNAME).o -o $(MODNAME).$(DYNAMIC_LIB_EXTEN) $(LDFLAGS) $(BASE)/libs/codec/g726/libg726.la - -clean: - rm -fr *.$(DYNAMIC_LIB_EXTEN) *.o *~ .libs - -install: - $(LTINSTALL) $(MODNAME).$(DYNAMIC_LIB_EXTEN) $(DESTDIR)$(PREFIX)/mod 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 Mon Mar 12 00:21:54 2007 @@ -1,24 +1,8 @@ ifeq ($(shell ls -d $(BASE)/libs/libg729),$(BASE)/libs/libg729) - -CFLAGS += -I$(PREFIX)/include/libg729 -LDFLAGS +=-lg729 - +LOCAL_CFLAGS += -I$(PREFIX)/include/libg729 +LOCAL_LDFLAGS +=-lg729 else - -CFLAGS += -DG729_PASSTHROUGH - +LOCAL_CFLAGS += -DG729_PASSTHROUGH endif -all: $(MODNAME).$(DYNAMIC_LIB_EXTEN) - -depends: - -$(MODNAME).$(DYNAMIC_LIB_EXTEN): $(MODNAME).c - $(CC) $(CFLAGS) -fPIC -c $(MODNAME).c -o $(MODNAME).o - $(LINK) $(SOLINK) -o $(MODNAME).$(DYNAMIC_LIB_EXTEN) $(MODNAME).o $(LDFLAGS) - -clean: - rm -fr *.$(DYNAMIC_LIB_EXTEN) *.o *~ .libs - -install: - $(LTINSTALL) $(MODNAME).$(DYNAMIC_LIB_EXTEN) $(DESTDIR)$(PREFIX)/mod +include $(BASE)/build/modmake.rules Modified: freeswitch/trunk/src/mod/codecs/mod_gsm/Makefile ============================================================================== --- freeswitch/trunk/src/mod/codecs/mod_gsm/Makefile (original) +++ freeswitch/trunk/src/mod/codecs/mod_gsm/Makefile Mon Mar 12 00:21:54 2007 @@ -1,17 +1,11 @@ -LDFLAGS += $(BASE)/libs/codec/gsm/libgsm.la -CFLAGS += -I$(BASE)/libs/codec/gsm/inc +# define these targets in your makefile if you wish +# local_all local_depend local_clean depend_install local_install local_distclean local_extraclean: -all: depends $(MODNAME).$(DYNAMIC_LIB_EXTEN) +# and define these variables to imapact your build +LOCAL_CFLAGS=-I$(BASE)/libs/codec/gsm/inc +LOCAL_LDFLAGS=$(BASE)/libs/codec/gsm/libgsm.la +LOCAL_OBJS= +include $(BASE)/build/modmake.rules -depends: +local_depend: cd $(BASE)/libs/codec/gsm && $(MAKE) - -$(MODNAME).$(DYNAMIC_LIB_EXTEN): $(MODNAME).c - $(CC) $(CFLAGS) -c $(MODNAME).c -o $(MODNAME).o - $(LINK) $(SOLINK) -o $(MODNAME).$(DYNAMIC_LIB_EXTEN) $(MODNAME).o $(LDFLAGS) - -clean: - rm -fr *.$(DYNAMIC_LIB_EXTEN) *.o *~ .libs - -install: - $(LTINSTALL) $(MODNAME).$(DYNAMIC_LIB_EXTEN) $(DESTDIR)$(PREFIX)/mod 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 Mon Mar 12 00:21:54 2007 @@ -1,16 +1,11 @@ -CFLAGS += -I$(BASE)/libs/codec/ilbc/src +# define these targets in your makefile if you wish +# local_all local_depend local_clean depend_install local_install local_distclean local_extraclean: -all: depends $(MODNAME).$(DYNAMIC_LIB_EXTEN) +# and define these variables to imapact your build +LOCAL_CFLAGS=-I$(BASE)/libs/codec/ilbc/src +LOCAL_LDFLAGS=$(BASE)/libs/codec/ilbc/libilbc.la +LOCAL_OBJS= +include $(BASE)/build/modmake.rules -depends: +local_depend: cd $(BASE)/libs/codec/ilbc && $(MAKE) - -$(MODNAME).$(DYNAMIC_LIB_EXTEN): $(MODNAME).c - $(CC) $(CFLAGS) -c $(MODNAME).c -o $(MODNAME).o - $(LINK) $(SOLINK) $(MODNAME).o -o $(MODNAME).$(DYNAMIC_LIB_EXTEN) $(LDFLAGS) $(BASE)/libs/codec/ilbc/libilbc.la - -clean: - rm -fr *.$(DYNAMIC_LIB_EXTEN) *.o *~ .libs - -install: - $(LTINSTALL) $(MODNAME).$(DYNAMIC_LIB_EXTEN) $(DESTDIR)$(PREFIX)/mod 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 Mon Mar 12 00:21:54 2007 @@ -1,16 +1,11 @@ -CFLAGS+=-I$(BASE)/libs/codec/lpc10/src +# define these targets in your makefile if you wish +# local_all local_depend local_clean depend_install local_install local_distclean local_extraclean: -all: depends $(MODNAME).$(DYNAMIC_LIB_EXTEN) +# and define these variables to imapact your build +LOCAL_CFLAGS=-I$(BASE)/libs/codec/lpc10/src +LOCAL_LDFLAGS=$(BASE)/libs/codec/lpc10/liblpc10.la +LOCAL_OBJS= +include $(BASE)/build/modmake.rules -depends: +local_depend: cd $(BASE)/libs/codec/lpc10 && $(MAKE) - -$(MODNAME).$(DYNAMIC_LIB_EXTEN): $(MODNAME).c ../../../include/switch_bitpack.h - $(CC) $(CFLAGS) -c $(MODNAME).c -o $(MODNAME).o - $(LINK) $(SOLINK) $(MODNAME).o -o $(MODNAME).$(DYNAMIC_LIB_EXTEN) $(LDFLAGS) $(BASE)/libs/codec/lpc10/liblpc10.la - -clean: - rm -fr *.$(DYNAMIC_LIB_EXTEN) *.o *~ .libs - -install: - $(LTINSTALL) $(MODNAME).$(DYNAMIC_LIB_EXTEN) $(DESTDIR)$(PREFIX)/mod 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 Mon Mar 12 00:21:54 2007 @@ -1,15 +1,11 @@ -CFLAGS+=-I$(BASE)/libs/speex/include -all: depends $(MODNAME).$(DYNAMIC_LIB_EXTEN) +# define these targets in your makefile if you wish +# local_all local_depend local_clean depend_install local_install local_distclean local_extraclean: -depends: - cd $(BASE)/libs/speex && $(MAKE) - -$(MODNAME).$(DYNAMIC_LIB_EXTEN): $(MODNAME).c - $(CC) $(CFLAGS) -c $(MODNAME).c -o $(MODNAME).o - $(LINK) $(SOLINK) $(MODNAME).o -o $(MODNAME).$(DYNAMIC_LIB_EXTEN) $(LDFLAGS) $(BASE)/libs/speex/libspeex/libspeex.la +# and define these variables to imapact your build +LOCAL_CFLAGS=-I$(BASE)/libs/speex/include +LOCAL_LDFLAGS=$(BASE)/libs/speex/libspeex/libspeex.la +LOCAL_OBJS= +include $(BASE)/build/modmake.rules -clean: - rm -fr *.$(DYNAMIC_LIB_EXTEN) *.o *~ .libs - -install: - $(LTINSTALL) $(MODNAME).$(DYNAMIC_LIB_EXTEN) $(DESTDIR)$(PREFIX)/mod +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 Mon Mar 12 00:21:54 2007 @@ -1,20 +1,11 @@ -CFLAGS += -DWITH_OPENLDAP -DLDAP_DEPRECATED -LDFLAGS += -lldap_r -llber +# define these targets in your makefile if you wish +# local_all local_depend local_clean depend_install local_install local_distclean local_extraclean: -LINKER=$(CC) +# and define these variables to imapact your build +LOCAL_CFLAGS=-DWITH_OPENLDAP -DLDAP_DEPRECATED +LOCAL_LDFLAGS=-lldap_r -llber +LOCAL_OBJS= +include $(BASE)/build/modmake.rules - -all: depends $(MODNAME).$(DYNAMIC_LIB_EXTEN) - -depends: +local_depend: MAKE=$(MAKE) $(BASE)/build/buildlib.sh $(BASE) install openldap-2.3.19.tgz --prefix=$(PREFIX) --disable-bdb --disable-hdb - -$(MODNAME).$(DYNAMIC_LIB_EXTEN): $(MODNAME).c - $(CC) $(CFLAGS) -c $(MODNAME).c -o $(MODNAME).o - $(LINK) $(SOLINK) -o $(MODNAME).$(DYNAMIC_LIB_EXTEN) $(MODNAME).o $(LDFLAGS) - -clean: - rm -fr *.$(DYNAMIC_LIB_EXTEN) *.o *~ .libs - -install: - $(LTINSTALL) $(MODNAME).$(DYNAMIC_LIB_EXTEN) $(DESTDIR)$(PREFIX)/mod 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 Mon Mar 12 00:21:54 2007 @@ -1,20 +1,17 @@ -LDFLAGS += $(BASE)/libs/libdingaling/libdingaling.la -CFLAGS += -I$(BASE)/libs/libdingaling/src -all: depends $(MODNAME).$(DYNAMIC_LIB_EXTEN) +# define these targets in your makefile if you wish +# local_all local_depend local_clean depend_install local_install local_distclean local_extraclean: -depends: +# and define these variables to imapact your build +LOCAL_CFLAGS=-I$(BASE)/libs/libdingaling/src +LOCAL_LDFLAGS=$(BASE)/libs/libdingaling/libdingaling.la +LOCAL_OBJS= +include $(BASE)/build/modmake.rules + +local_depend: cd $(BASE)/libs/iksemel && $(MAKE) cd $(BASE)/libs/libdingaling && $(MAKE) - -$(MODNAME).$(DYNAMIC_LIB_EXTEN): $(MODNAME).c - $(CC) $(CFLAGS) -fPIC -c $(MODNAME).c -o $(MODNAME).o - $(LINK) $(SOLINK) -o $(MODNAME).$(DYNAMIC_LIB_EXTEN) $(MODNAME).o $(LDFLAGS) - -clean: - rm -fr *.$(DYNAMIC_LIB_EXTEN) *.o *~ .libs - -install: +depend_install: cd $(BASE)/libs/iksemel && $(MAKE) install cd $(BASE)/libs/libdingaling && $(MAKE) install - $(LTINSTALL) $(MODNAME).$(DYNAMIC_LIB_EXTEN) $(DESTDIR)$(PREFIX)/mod + 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 Mon Mar 12 00:21:54 2007 @@ -1,17 +1,12 @@ -CFLAGS += -I$(BASE)/libs/iax/src +# define these targets in your makefile if you wish +# local_all local_depend local_clean depend_install local_install local_distclean local_extraclean: -all: depends $(MODNAME).$(DYNAMIC_LIB_EXTEN) +# and define these variables to imapact your build +LOCAL_CFLAGS=-I$(BASE)/libs/iax/src +LOCAL_LDFLAGS=$(BASE)/libs/iax/src/libiax.la +LOCAL_OBJS= +include $(BASE)/build/modmake.rules -depends: +local_depend: cd $(BASE)/libs/iax && $(MAKE) -$(MODNAME).$(DYNAMIC_LIB_EXTEN): $(MODNAME).c - $(CC) $(CFLAGS) -c $(MODNAME).c -o $(MODNAME).o - $(LINK) $(SOLINK) -o $(MODNAME).$(DYNAMIC_LIB_EXTEN) $(MODNAME).o $(LDFLAGS) $(BASE)/libs/iax/src/libiax.la - - -clean: - rm -fr *.$(DYNAMIC_LIB_EXTEN) *.o *~ .libs - -install: - $(LTINSTALL) $(MODNAME).$(DYNAMIC_LIB_EXTEN) $(DESTDIR)$(PREFIX)/mod 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 Mon Mar 12 00:21:54 2007 @@ -1,25 +1,18 @@ -CFLAGS += -I. -I$(BASE)/libs/portaudio/include -MYOBJS = pablio.o pa_ringbuffer.o +# define these targets in your makefile if you wish +# local_all local_depend local_clean depend_install local_install local_distclean local_extraclean: + +# and define these variables to imapact your build +LOCAL_CFLAGS=-I. -I$(BASE)/libs/portaudio/include +LOCAL_LDFLAGS=$(BASE)/libs/portaudio/lib/libportaudio.la ifeq ($(OSARCH),Darwin) -LDFLAGS += -framework CoreAudio -framework AudioToolbox -framework AudioUnit -framework Carbon +LOCAL_LDFLAGS += -framework CoreAudio -framework AudioToolbox -framework AudioUnit -framework Carbon endif +LOCAL_OBJS=pablio.o pa_ringbuffer.o -all: depends $(MODNAME).$(DYNAMIC_LIB_EXTEN) +include $(BASE)/build/modmake.rules -depends: +local_depend: cd $(BASE)/libs/portaudio && $(MAKE) -%.o: %.c - $(CC) $(CFLAGS) -c -o $@ $< - -$(MODNAME).$(DYNAMIC_LIB_EXTEN): $(MODNAME).c $(MYOBJS) - $(CC) $(CFLAGS) -c $(MODNAME).c -o $(MODNAME).o - $(LINK) $(SOLINK) $(MODNAME).o -o $(MODNAME).$(DYNAMIC_LIB_EXTEN) $(MYOBJS) $(LDFLAGS) $(BASE)/libs/portaudio/lib/libportaudio.la - - - -clean: - rm -fr *.$(DYNAMIC_LIB_EXTEN) *.o *~ .libs - -install: - $(LTINSTALL) $(MODNAME).$(DYNAMIC_LIB_EXTEN) $(DESTDIR)$(PREFIX)/mod +pa_ringbuffer.o: pa_ringbuffer.c + $(COMPILE) -D__EXTENSION__=1 -c -o $@ $< Modified: freeswitch/trunk/src/mod/endpoints/mod_portaudio/pa_ringbuffer.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_portaudio/pa_ringbuffer.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_portaudio/pa_ringbuffer.c Mon Mar 12 00:21:54 2007 @@ -89,16 +89,17 @@ # define PaUtil_ReadMemoryBarrier() OSMemoryBarrier() # define PaUtil_WriteMemoryBarrier() OSMemoryBarrier() #elif defined(__GNUC__) + /* GCC understands volatile asm and "memory" to mean it * should not reorder memory read/writes */ # if defined( __PPC__ ) -# define PaUtil_FullMemoryBarrier() asm volatile("sync":::"memory") -# define PaUtil_ReadMemoryBarrier() asm volatile("sync":::"memory") -# define PaUtil_WriteMemoryBarrier() asm volatile("sync":::"memory") +# define PaUtil_FullMemoryBarrier() __asm__ volatile("sync":::"memory") +# define PaUtil_ReadMemoryBarrier() __asm__ volatile("sync":::"memory") +# define PaUtil_WriteMemoryBarrier() __asm__ volatile("sync":::"memory") # elif defined( __i386__ ) || defined( __i486__ ) || defined( __i586__ ) || defined( __i686__ ) || defined(__x86_64__) -# define PaUtil_FullMemoryBarrier() asm volatile("mfence":::"memory") -# define PaUtil_ReadMemoryBarrier() asm volatile("lfence":::"memory") -# define PaUtil_WriteMemoryBarrier() asm volatile("sfence":::"memory") +# define PaUtil_FullMemoryBarrier() __asm__ volatile("mfence":::"memory") +# define PaUtil_ReadMemoryBarrier() __asm__ volatile("lfence":::"memory") +# define PaUtil_WriteMemoryBarrier() __asm__ volatile("sfence":::"memory") # else # define PaUtil_FullMemoryBarrier() # define PaUtil_ReadMemoryBarrier() 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 Mon Mar 12 00:21:54 2007 @@ -1,32 +1,22 @@ OS_ARCH := $(subst /,_,$(shell uname -s | sed /\ /s//_/)) -LINKER=$(CC) -CFLAGS += -I. -I$(BASE)/libs/sofia-sip/libsofia-sip-ua/bnf -I$(BASE)/libs/sofia-sip/libsofia-sip-ua/features -CFLAGS += -I$(BASE)/libs/sofia-sip/libsofia-sip-ua/http -I$(BASE)/libs/sofia-sip/libsofia-sip-ua/ipt -CFLAGS += -I$(BASE)/libs/sofia-sip/libsofia-sip-ua/iptsec -I$(BASE)/libs/sofia-sip/libsofia-sip-ua/msg -CFLAGS += -I$(BASE)/libs/sofia-sip/libsofia-sip-ua/nea -I$(BASE)/libs/sofia-sip/libsofia-sip-ua/nta -CFLAGS += -I$(BASE)/libs/sofia-sip/libsofia-sip-ua/nth -I$(BASE)/libs/sofia-sip/libsofia-sip-ua/nua -CFLAGS += -I$(BASE)/libs/sofia-sip/libsofia-sip-ua/sdp -I$(BASE)/libs/sofia-sip/libsofia-sip-ua/sip -CFLAGS += -I$(BASE)/libs/sofia-sip/libsofia-sip-ua/soa -I$(BASE)/libs/sofia-sip/libsofia-sip-ua/sresolv -CFLAGS += -I$(BASE)/libs/sofia-sip/libsofia-sip-ua/stun -I$(BASE)/libs/sofia-sip/libsofia-sip-ua/su -CFLAGS += -I$(BASE)/libs/sofia-sip/libsofia-sip-ua/tport -I$(BASE)/libs/sofia-sip/libsofia-sip-ua/url -ifeq ($(OS_ARCH),Darwin) - LDFLAGS +=-framework CoreFoundation -framework SystemConfiguration -endif -all: depends $(MODNAME).$(DYNAMIC_LIB_EXTEN) - -depends: - cd $(BASE)/libs/sofia-sip && $(MAKE) +LOCAL_CFLAGS = -I. -I$(BASE)/libs/sofia-sip/libsofia-sip-ua/bnf -I$(BASE)/libs/sofia-sip/libsofia-sip-ua/features +LOCAL_CFLAGS += -I$(BASE)/libs/sofia-sip/libsofia-sip-ua/http -I$(BASE)/libs/sofia-sip/libsofia-sip-ua/ipt +LOCAL_CFLAGS += -I$(BASE)/libs/sofia-sip/libsofia-sip-ua/iptsec -I$(BASE)/libs/sofia-sip/libsofia-sip-ua/msg +LOCAL_CFLAGS += -I$(BASE)/libs/sofia-sip/libsofia-sip-ua/nea -I$(BASE)/libs/sofia-sip/libsofia-sip-ua/nta +LOCAL_CFLAGS += -I$(BASE)/libs/sofia-sip/libsofia-sip-ua/nth -I$(BASE)/libs/sofia-sip/libsofia-sip-ua/nua +LOCAL_CFLAGS += -I$(BASE)/libs/sofia-sip/libsofia-sip-ua/sdp -I$(BASE)/libs/sofia-sip/libsofia-sip-ua/sip +LOCAL_CFLAGS += -I$(BASE)/libs/sofia-sip/libsofia-sip-ua/soa -I$(BASE)/libs/sofia-sip/libsofia-sip-ua/sresolv +LOCAL_CFLAGS += -I$(BASE)/libs/sofia-sip/libsofia-sip-ua/stun -I$(BASE)/libs/sofia-sip/libsofia-sip-ua/su +LOCAL_CFLAGS += -I$(BASE)/libs/sofia-sip/libsofia-sip-ua/tport -I$(BASE)/libs/sofia-sip/libsofia-sip-ua/url -%.o: %.c - $(CC) $(CFLAGS) -c -o $@ $< +LOCAL_LDFLAGS=$(BASE)/libs/sofia-sip/libsofia-sip-ua/libsofia-sip-ua.la -$(MODNAME).$(DYNAMIC_LIB_EXTEN): $(MODNAME).c - $(CC) $(CFLAGS) -c $(MODNAME).c -o $(MODNAME).o - $(LINK) $(SOLINK) -o $(MODNAME).$(DYNAMIC_LIB_EXTEN) $(MODNAME).o $(LDFLAGS) $(BASE)/libs/sofia-sip/libsofia-sip-ua/libsofia-sip-ua.la +ifeq ($(OS_ARCH),Darwin) + LOCAL_LDFLAGS +=-framework CoreFoundation -framework SystemConfiguration +endif -clean: - rm -fr *.$(DYNAMIC_LIB_EXTEN) *.o *~ .libs +include $(BASE)/build/modmake.rules -install: - $(LTINSTALL) $(MODNAME).$(DYNAMIC_LIB_EXTEN) $(DESTDIR)$(PREFIX)/mod +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 Mon Mar 12 00:21:54 2007 @@ -1,28 +1,12 @@ -CFLAGS +=-I/usr/local/include -I/usr/src/libpri -I/usr/src/linux/include -I. -I/usr/include -CFLAGS +=-D__LINUX__ -D_REENTRANT -D_GNU_SOURCE -DAFT_A104 -DWANPIPE_TDM_API -LDFLAGS += -lsangoma -OBJS = ss7boost_client.o mod_wanpipe.o +# define these targets in your makefile if you wish +# local_all local_depend local_clean depend_install local_install local_distclean local_extraclean: -ifeq ($(OSARCH),Darwin) - LINKER=g++ -else - LINKER=$(CC) -endif +# and define these variables to imapact 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_OBJS=ss7boost_client.o +include $(BASE)/build/modmake.rules -all: depends $(MODNAME).$(DYNAMIC_LIB_EXTEN) - -depends: +local_depend: MAKE=$(MAKE) $(BASE)/build/buildlib.sh $(BASE) install libsangoma --prefix=$(PREFIX) --with-libpri=/usr/src/libpri - -%.o: %.c - $(CC) $(CFLAGS) $(MOD_CFLAGS) -g -ggdb -Werror -fPIC -c $< -o $@ - -$(MODNAME).$(DYNAMIC_LIB_EXTEN): $(OBJS) $(MODNAME).c - $(CC) $(CFLAGS) -c $(MODNAME).c -o $(MODNAME).o - $(LINK) $(SOLINK) -o $(MODNAME).$(DYNAMIC_LIB_EXTEN) $(OBJS) $(LDFLAGS) - -clean: - rm -fr *.$(DYNAMIC_LIB_EXTEN) *.o *~ .libs - -install: - $(LTINSTALL) $(MODNAME).$(DYNAMIC_LIB_EXTEN) $(DESTDIR)$(PREFIX)/mod 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 Mon Mar 12 00:21:54 2007 @@ -1,28 +1,18 @@ -#CFLAGS += -DSWITCH_QUEUE_ENHANCED -#LDFLAGS += -lcurl -CPPCC = g++ -OBJS=cdrcontainer.o basecdr.o baseregistry.o pddcdr.o csvcdr.o xmlcdr.o sqlitecdr.o +# define these targets in your makefile if you wish +# local_all local_depend local_clean depend_install local_install local_distclean local_extraclean: -ifneq ($(shell which mysql_config),) - CFLAGS += $(shell mysql_config --include) - LDFLAGS += $(shell mysql_config --libs) - OBJS += mysqlcdr.o -endif - -all: depends $(OBJS) $(MODNAME).$(DYNAMIC_LIB_EXTEN) - -depends: +# and define these variables to imapact your build +LOCAL_CFLAGS= +LOCAL_LDFLAGS= +LOCAL_OBJS=cdrcontainer.o basecdr.o baseregistry.o pddcdr.o csvcdr.o xmlcdr.o sqlitecdr.o -$(MODNAME).$(DYNAMIC_LIB_EXTEN): $(OBJS) $(MODNAME).cpp - $(CPPCC) $(CFLAGS) -c $(MODNAME).cpp -o $(MODNAME).o - $(LIBTOOL) --mode=link $(CPPCC) $(SOLINK) -o $(MODNAME).$(DYNAMIC_LIB_EXTEN) $(MODNAME).o $(OBJS) $(LDFLAGS) +#LOCAL_CFLAGS += -DSWITCH_QUEUE_ENHANCED +#LOCAL_LDFLAGS += -lcurl +ifneq ($(shell which mysql_config),) + LOCAL_CFLAGS += $(shell mysql_config --include) + LOCAL_LDFLAGS += $(shell mysql_config --libs) + LOCAL_OBJS += mysqlcdr.o +endif -%.o: %.cpp - $(CPPCC) -Wall -Werror -fPIC $(CFLAGS) -c -o $@ $< - -clean: - rm -fr *.$(DYNAMIC_LIB_EXTEN) *.o *~ .libs - -install: - $(LTINSTALL) $(MODNAME).$(DYNAMIC_LIB_EXTEN) $(DESTDIR)$(PREFIX)/mod +include $(BASE)/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 Mon Mar 12 00:21:54 2007 @@ -1,17 +1,11 @@ -CFLAGS += -I$(BASE)/libs/iksemel/include -LDFLAGS += $(BASE)/libs/iksemel/src/libiksemel.la +# define these targets in your makefile if you wish +# local_all local_depend local_clean depend_install local_install local_distclean local_extraclean: -all: depends $(MODNAME).$(DYNAMIC_LIB_EXTEN) +# and define these variables to imapact your build +LOCAL_CFLAGS=-I$(BASE)/libs/iksemel/include +LOCAL_LDFLAGS=$(BASE)/libs/iksemel/src/libiksemel.la +LOCAL_OBJS= +include $(BASE)/build/modmake.rules -depends: +local_depend: cd $(BASE)/libs/iksemel && $(MAKE) - -$(MODNAME).$(DYNAMIC_LIB_EXTEN): $(MODNAME).c - $(CC) $(CFLAGS) -c $(MODNAME).c -o $(MODNAME).o - $(LINK) $(SOLINK) -o $(MODNAME).$(DYNAMIC_LIB_EXTEN) $(MODNAME).o $(LDFLAGS) - -clean: - rm -fr *.$(DYNAMIC_LIB_EXTEN) *.o *~ .libs - -install: - $(LTINSTALL) $(MODNAME).$(DYNAMIC_LIB_EXTEN) $(DESTDIR)$(PREFIX)/mod 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 Mon Mar 12 00:21:54 2007 @@ -1,19 +1,11 @@ -LDFLAGS += -lhowl -CFLAGS += -I$(PREFIX)/include/howl -LINKER=$(CC) +# define these targets in your makefile if you wish +# local_all local_depend local_clean depend_install local_install local_distclean local_extraclean: +# and define these variables to imapact your build +LOCAL_CFLAGS=-I$(PREFIX)/include/howl +LOCAL_LDFLAGS=-lhowl +LOCAL_OBJS= +include $(BASE)/build/modmake.rules -all: depends $(MODNAME).$(DYNAMIC_LIB_EXTEN) - -depends: +local_depend: $(BASE)/build/buildlib.sh $(BASE) install howl-1.0.0.tar.gz --prefix=$(PREFIX) - -$(MODNAME).$(DYNAMIC_LIB_EXTEN): $(MODNAME).c - $(CC) $(CFLAGS) -c $(MODNAME).c -o $(MODNAME).o - $(LINK) $(SOLINK) -o $(MODNAME).$(DYNAMIC_LIB_EXTEN) $(MODNAME).o $(LDFLAGS) - -clean: - rm -fr *.$(DYNAMIC_LIB_EXTEN) *.o *~ .libs - -install: - $(LTINSTALL) $(MODNAME).$(DYNAMIC_LIB_EXTEN) $(DESTDIR)$(PREFIX)/mod 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 Mon Mar 12 00:21:54 2007 @@ -1,19 +1,12 @@ -LDFLAGS += -lshout -lmp3lame -MOD_CFLAGS += "-I${PREFIX}/include" -MOD_LDFLAGS += "-L${PREFIX}/lib" -all: depends $(MODNAME).$(DYNAMIC_LIB_EXTEN) - -depends: - MAKE=$(MAKE) $(BASE)/build/buildlib.sh $(BASE) install lame-3.97.tar.gz --prefix=$(PREFIX) --disable-shared --with-pic - MOD_CFLAGS="${MOD_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) - -$(MODNAME).$(DYNAMIC_LIB_EXTEN): $(MODNAME).c - $(CC) $(CFLAGS) -fPIC -c $(MODNAME).c -o $(MODNAME).o - $(CC) $(SOLINK) -o $(MODNAME).$(DYNAMIC_LIB_EXTEN) $(MODNAME).o $(LDFLAGS) +# define these targets in your makefile if you wish +# local_all local_depend local_clean depend_install local_install local_distclean local_extraclean: +# and define these variables to imapact your build +LOCAL_CFLAGS= +LOCAL_LDFLAGS=-lshout -lmp3lame +LOCAL_OBJS= +include $(BASE)/build/modmake.rules -clean: - rm -fr *.$(DYNAMIC_LIB_EXTEN) *.o *~ - -install: - cp -f $(MODNAME).$(DYNAMIC_LIB_EXTEN) $(PREFIX)/mod +local_depend: + 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) 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 Mon Mar 12 00:21:54 2007 @@ -1,19 +1,11 @@ -CFLAGS += -I$(BASE)/libs/libsndfile/src +# define these targets in your makefile if you wish +# local_all local_depend local_clean depend_install local_install local_distclean local_extraclean: -all: depends $(MODNAME).$(DYNAMIC_LIB_EXTEN) +# and define these variables to imapact your build +LOCAL_CFLAGS=-I$(BASE)/libs/libsndfile/src +LOCAL_LDFLAGS=$(BASE)/libs/libsndfile/src/libsndfile.la +LOCAL_OBJS= +include $(BASE)/build/modmake.rules -depends: +local_depend: cd $(BASE)/libs/libsndfile && $(MAKE) - -$(MODNAME).$(DYNAMIC_LIB_EXTEN): $(MODNAME).c - $(CC) $(CFLAGS) -c $(MODNAME).c -o $(MODNAME).o - $(LINK) $(SOLINK) -o $(MODNAME).$(DYNAMIC_LIB_EXTEN) $(MODNAME).o $(LDFLAGS) $(BASE)/libs/libsndfile/src/libsndfile.la - - -clean: - rm -fr *.$(DYNAMIC_LIB_EXTEN) *.o *~ .libs - -install: - $(LTINSTALL) $(MODNAME).$(DYNAMIC_LIB_EXTEN) $(DESTDIR)$(PREFIX)/mod - - 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 Mon Mar 12 00:21:54 2007 @@ -3,26 +3,14 @@ GLIB_TARBALL = glib-2.12.3.tar.gz GETTEXT_TARBALL = gettext-0.15.tar.gz PKGCONFIG_TARBALL = pkg-config-0.21.tar.gz -CFLAGS += `$(PREFIX)/bin/pkg-config --cflags mono` -LDFLAGS += `$(PREFIX)/bin/pkg-config --libs mono` -all: depends $(MODNAME).$(DYNAMIC_LIB_EXTEN) +LOCAL_CFLAGS=`$(PREFIX)/bin/pkg-config --cflags mono` +LOCAL_LDFLAGS=`$(PREFIX)/bin/pkg-config --libs mono` +include $(BASE)/build/modmake.rules -depends: +local_depend: MAKE=$(MAKE) $(BASE)/build/buildlib.sh $(BASE) configure install $(GETTEXT_TARBALL) --prefix=$(PREFIX) --with-pic MAKE=$(MAKE) $(BASE)/build/buildlib.sh $(BASE) configure install $(PKGCONFIG_TARBALL) --prefix=$(PREFIX) --with-pic export PKG_CONFIG=$(PREFIX)/bin/pkg-config; export MSGFMT=$(PREFIX)/bin/; MAKE=$(MAKE) $(BASE)/build/buildlib.sh $(BASE) configure install $(GLIB_TARBALL) --prefix=$(PREFIX) --with-pic export PATH=$(PATH):$(PREFIX)/bin/; MAKE=$(MAKE) $(BASE)/build/buildlib.sh $(BASE) configure install $(TARBALL) --prefix=$(PREFIX) --with-pic --with-gc=boehm --with-preview=yes --without-sigaltstack -%.o: %.c - $(CC) $(CFLAGS) -c -o $@ $< - -$(MODNAME).$(DYNAMIC_LIB_EXTEN): $(MODNAME).c - $(CC) $(CFLAGS) -c $(MODNAME).c -o $(MODNAME).o - $(LINK) $(SOLINK) $(MODNAME).o -o $(MODNAME).$(DYNAMIC_LIB_EXTEN) $(LDFLAGS) - -clean: - rm -fr *.$(DYNAMIC_LIB_EXTEN) *.o *~ .libs - -install: - $(LTINSTALL) $(MODNAME).$(DYNAMIC_LIB_EXTEN) $(DESTDIR)$(PREFIX)/mod 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 Mon Mar 12 00:21:54 2007 @@ -1,50 +1,43 @@ +# define these targets in your makefile if you wish +# local_all local_depend local_clean depend_install local_install local_distclean local_extraclean: + +# and define these variables to imapact your build +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 + PERL = $(shell which perl) PERL_LIBDIR =-L$(shell perl -MConfig -e 'print $$Config{archlib}')/CORE PERL_LIBS =$(shell perl -MConfig -e 'print $$Config{libs}') -CFLAGS += -DMULTIPLICITY $(shell $(PERL) -MExtUtils::Embed -e ccopts) -CFLAGS += -DEMBED_PERL -LDFLAGS += $(shell $(PERL) -MExtUtils::Embed -e ldopts) -LDFLAGS += $(shell $(PERL) -MConfig -e 'print $$Config{libs}') -OBJS += perlxsi.o + SWIGCFILE=../../../switch_swig.c SWIGIFILE=../../../switch_swig.i - -all: depends $(MODNAME).$(DYNAMIC_LIB_EXTEN) fs_perl.$(DYNAMIC_LIB_EXTEN) +local_all: fs_perl.$(DYNAMIC_LIB_EXTEN) .perlok: @(${PERL} -V | grep -i usemultiplicity=define >/dev/null && echo Phew, You have the right perl.) \ || ((echo Sorry, you need to compile perl with threads and multiplicity.&& exit 1)) @touch .perlok -depends: - -%.o: %.c - $(CC) $(CFLAGS) -c $< -o $@ - reswig: rm switch_swig_wrap.c swig -o switch_swig_wrap.c -l$(SWIGIFILE) -ignoremissing -DMULTIPLICITY -perl5 -module fs_perl $(SWIGCFILE) switch_swig.o: $(SWIGCFILE) Makefile - $(CC) -w $(CFLAGS) -c $< -o $@ + $(CC) -w $(ALL_CFLAGS) -c $< -o $@ switch_swig_wrap.o: switch_swig_wrap.c - $(CC) -w $(CFLAGS) -c $< -o $@ - + $(CC) -w $(ALL_CFLAGS) -c $< -o $@ fs_perl.$(DYNAMIC_LIB_EXTEN): $(MODNAME).$(DYNAMIC_LIB_EXTEN) switch_swig_wrap.o switch_swig.o $(LINK) $(SOLINK) -o fs_perl.$(DYNAMIC_LIB_EXTEN) switch_swig_wrap.o switch_swig.o $(LDFLAGS) +local_clean: + rm -fr *~ .perlok -$(MODNAME).$(DYNAMIC_LIB_EXTEN): $(MODNAME).c $(MODNAME).o $(OBJS) - $(LINK) $(SOLINK) -o $(MODNAME).$(DYNAMIC_LIB_EXTEN) $(MODNAME).o $(OBJS) $(LDFLAGS) - -clean: - rm -fr *.$(DYNAMIC_LIB_EXTEN) *.o *~ .perlok .libs - -install: +depend_install: mkdir -p $(PREFIX)/perl - $(LTINSTALL) $(MODNAME).$(DYNAMIC_LIB_EXTEN) $(DESTDIR)$(PREFIX)/mod $(LTINSTALL) fs_perl.$(DYNAMIC_LIB_EXTEN) fs_perl.pm $(PREFIX)/perl if [ ! -f $(PREFIX)/perl/freeswitch.pm ] ; then $(LTINSTALL) freeswitch.pm $(PREFIX)/perl ; fi 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 Mon Mar 12 00:21:54 2007 @@ -1,32 +1,22 @@ -LCFLAGS=-fPIC -CFLAGS += -fPIC -I$(PREFIX)/include/python2.4/ +# define these targets in your makefile if you wish +# local_all local_depend local_clean depend_install local_install local_distclean local_extraclean: + +# and define these variables to imapact your build +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 + PYMOD=freeswitch -LDFLAGS=-lpython2.4 -Xlinker -export-dynamic -L$(PREFIX)/lib/python2.4/config/ -lutil -lstdc++ + SWIGCFILE=../../../switch_swig.c SWIGIFILE=../../../switch_swig.i -CPPCC = g++ -OBJS=freeswitch_python.o mod_python_wrap.o -#all: depends $(MODNAME).$(DYNAMIC_LIB_EXTEN) $(PYMOD).$(DYNAMIC_LIB_EXTEN) -all: depends $(MODNAME).$(DYNAMIC_LIB_EXTEN) $(OBJS) - -depends: +local_depend: MAKE=$(MAKE) PY_CFLAGS=-fPIC $(BASE)/build/buildlib.sh $(BASE) install Python-2.4.3.tgz --prefix=$(PREFIX) --enable-threads -%.o: %.cpp - $(CPPCC) $(CFLAGS) -c -o $@ $< - -%.o: %.c - $(CC) $(LCFLAGS) $(CFLAGS) -c $< -o $@ - -mod_python.c: - $(CC) $(LCFLAGS) $(CFLAGS) -c mod_python.c -o mod_python.o - reswig: - # rm -f switch_swig_wrap.c config.m4 CREDITS *${PYMOD}* - # swig -o switch_swig_wrap.c -l$(SWIGIFILE) -ignoremissing -DMULTIPLICITY -python -module $(PYMOD) $(SWIGCFILE) swig -python -shadow -c++ -o mod_python_wrap.cpp mod_python.i - # patch -p0 -i fix.diff switch_swig_wrap.o: switch_swig_wrap.c Makefile $(CC) -w $(CFLAGS) -c $< -o $@ @@ -34,20 +24,6 @@ switch_swig.o: $(SWIGCFILE) Makefile $(CC) -w $(CFLAGS) -c $< -o $@ - -# $(PYMOD).$(DYNAMIC_LIB_EXTEN): $(MODNAME).$(DYNAMIC_LIB_EXTEN) switch_swig_wrap.o switch_swig.o Makefile -# $(CC) $(SOLINK) -o py_$(PYMOD).$(DYNAMIC_LIB_EXTEN) switch_swig_wrap.o switch_swig.o $(LDFLAGS) - -# $(MODNAME).$(DYNAMIC_LIB_EXTEN): $(MODNAME).c $(MODNAME).o $(OBJS) switch_swig_wrap.o switch_swig.o Makefile -# $(CC) $(LCFLAGS) $(SOLINK) -o $(MODNAME).$(DYNAMIC_LIB_EXTEN) $(MODNAME).o switch_swig_wrap.o switch_swig.o $(OBJS) $(LDFLAGS) - -$(MODNAME).$(DYNAMIC_LIB_EXTEN): $(MODNAME).c $(MODNAME).o $(OBJS) Makefile - $(CC) $(LCFLAGS) $(SOLINK) -o $(MODNAME).$(DYNAMIC_LIB_EXTEN) $(MODNAME).o $(OBJS) $(LDFLAGS) - -clean: - rm -fr *.$(DYNAMIC_LIB_EXTEN) *.o *~ - -install: - $(LTINSTALL) $(MODNAME).$(DYNAMIC_LIB_EXTEN) $(DESTDIR)$(PREFIX)/mod +local_install: cp -f freeswitch.py $(PREFIX)/lib/python2.4/site-packages/ 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 Mon Mar 12 00:21:54 2007 @@ -1,23 +1,17 @@ -CFLAGS += -I$(BASE)/libs/curl/include -LDFLAGS += $(BASE)/libs/curl/lib/libcurl.la + include sm.mak +LOCAL_CFLAGS += -I$(BASE)/libs/curl/include +LOCAL_LDFLAGS += $(BASE)/libs/curl/lib/libcurl.la -all: depends $(MODNAME).$(DYNAMIC_LIB_EXTEN) +include $(BASE)/build/modmake.rules -depends: +local_depend: cd $(BASE)/libs/curl && $(MAKE) cd $(BASE)/libs/js/nsprpub && $(MAKE) cd $(BASE)/libs/js && $(MAKE) -$(MODNAME).$(DYNAMIC_LIB_EXTEN): $(MODNAME).c $(MODNAME).h - $(CC) $(CFLAGS) -c $(MODNAME).c -o $(MODNAME).o - $(LINK) $(SOLINK) -o $(MODNAME).$(DYNAMIC_LIB_EXTEN) $(MODNAME).o $(OBJS) $(LDFLAGS) - -clean: - rm -fr *.$(DYNAMIC_LIB_EXTEN) *.o *~ .libs - -install: +depend_install: cd $(BASE)/libs/js/nsprpub && $(MAKE) install cd $(BASE)/libs/js && $(MAKE) install - $(LINK) $(SOLINK) -o $(MODNAME).$(DYNAMIC_LIB_EXTEN) $(MODNAME).o $(OBJS) $(LDFLAGS) - $(LTINSTALL) $(MODNAME).$(DYNAMIC_LIB_EXTEN) $(DESTDIR)$(PREFIX)/mod + $(LINK) $(SOLINK) $(MODNAME).o -o $(MODNAME).$(DYNAMIC_LIB_EXTEN) $(LIBS) $(LOCAL_LDFLAGS) $(LOCAL_OBJS) + Modified: freeswitch/trunk/src/mod/languages/mod_spidermonkey/sm.mak ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_spidermonkey/sm.mak (original) +++ freeswitch/trunk/src/mod/languages/mod_spidermonkey/sm.mak Mon Mar 12 00:21:54 2007 @@ -1,2 +1,2 @@ -CFLAGS += -I$(BASE)/libs/js/src -I$(BASE)/libs/js/nsprpub/dist/include/nspr -DXP_UNIX -I../mod_spidermonkey -DJS_THREADSAFE -DJS_HAS_FILE_OBJECT=1 -LDFLAGS += -L$(BASE)/libs/js/nsprpub/pr/src -L$(BASE)/libs/js/nsprpub/dist/lib -lnspr4 $(BASE)/libs/js/libjs.la +LOCAL_CFLAGS = -I$(BASE)/libs/js/src -I$(BASE)/libs/js/nsprpub/dist/include/nspr -DXP_UNIX -I../mod_spidermonkey -DJS_THREADSAFE -DJS_HAS_FILE_OBJECT=1 +LOCAL_LDFLAGS = -L$(BASE)/libs/js/nsprpub/pr/src -L$(BASE)/libs/js/nsprpub/dist/lib -lnspr4 $(BASE)/libs/js/libjs.la 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 Mon Mar 12 00:21:54 2007 @@ -1,15 +1,2 @@ include ../mod_spidermonkey/sm.mak - -all: depends $(MODNAME).$(DYNAMIC_LIB_EXTEN) - -depends: - -$(MODNAME).$(DYNAMIC_LIB_EXTEN): $(MODNAME).c - $(CC) $(CFLAGS) -c $(MODNAME).c -o $(MODNAME).o - $(LINK) $(SOLINK) -o $(MODNAME).$(DYNAMIC_LIB_EXTEN) $(MODNAME).o $(OBJS) $(LDFLAGS) - -clean: - rm -fr *.$(DYNAMIC_LIB_EXTEN) *.o *~ .libs - -install: - $(LTINSTALL) $(MODNAME).$(DYNAMIC_LIB_EXTEN) $(DESTDIR)$(PREFIX)/mod +include $(BASE)/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 Mon Mar 12 00:21:54 2007 @@ -1,18 +1,13 @@ include ../mod_spidermonkey/sm.mak +# define these targets in your makefile if you wish +# local_all local_depend local_clean depend_install local_install local_distclean local_extraclean: -LDFLAGS+=-letpan +# and define these variables to imapact your build +#LOCAL_CFLAGS= +LOCAL_LDFLAGS+=-letpan +#LOCAL_OBJS= +include $(BASE)/build/modmake.rules -all: depends $(MODNAME).$(DYNAMIC_LIB_EXTEN) - -depends: +local_depend: MAKE=$(MAKE) $(BASE)/build/buildlib.sh $(BASE) install libetpan --prefix=$(PREFIX) -$(MODNAME).$(DYNAMIC_LIB_EXTEN): $(MODNAME).c - $(CC) $(CFLAGS) -c $(MODNAME).c -o $(MODNAME).o - $(LINK) $(SOLINK) -o $(MODNAME).$(DYNAMIC_LIB_EXTEN) $(MODNAME).o $(LDFLAGS) - -clean: - rm -fr *.$(DYNAMIC_LIB_EXTEN) *.o *~ .libs - -install: - $(LTINSTALL) $(MODNAME).$(DYNAMIC_LIB_EXTEN) $(DESTDIR)$(PREFIX)/mod 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 Mon Mar 12 00:21:54 2007 @@ -1,17 +1,13 @@ include ../mod_spidermonkey/sm.mak -LDFLAGS+=-lodbc +# define these targets in your makefile if you wish +# local_all local_depend local_clean depend_install local_install local_distclean local_extraclean: -all: depends $(MODNAME).$(DYNAMIC_LIB_EXTEN) +# and define these variables to imapact your build +#LOCAL_CFLAGS= +LOCAL_LDFLAGS+=-lodbc +#LOCAL_OBJS= +include $(BASE)/build/modmake.rules -depends: +local_depend: MAKE=$(MAKE) $(BASE)/build/buildlib.sh $(BASE) install unixODBC-2.2.12.tar.gz --prefix=$(PREFIX) --disable-gui --without-x --with-pic -$(MODNAME).$(DYNAMIC_LIB_EXTEN): $(MODNAME).c - $(CC) $(CFLAGS) -c $(MODNAME).c -o $(MODNAME).o - $(LINK) $(SOLINK) -o $(MODNAME).$(DYNAMIC_LIB_EXTEN) $(MODNAME).o $(LDFLAGS) - -clean: - rm -fr *.$(DYNAMIC_LIB_EXTEN) *.o *~ .libs - -install: - $(LTINSTALL) $(MODNAME).$(DYNAMIC_LIB_EXTEN) $(DESTDIR)$(PREFIX)/mod 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 Mon Mar 12 00:21:54 2007 @@ -1,15 +1,3 @@ include ../mod_spidermonkey/sm.mak +include $(BASE)/build/modmake.rules -all: depends $(MODNAME).$(DYNAMIC_LIB_EXTEN) - -depends: - -$(MODNAME).$(DYNAMIC_LIB_EXTEN): $(MODNAME).c - $(CC) $(CFLAGS) -c $(MODNAME).c -o $(MODNAME).o - $(LINK) $(SOLINK) -o $(MODNAME).$(DYNAMIC_LIB_EXTEN) $(MODNAME).o $(LDFLAGS) - -clean: - rm -fr *.$(DYNAMIC_LIB_EXTEN) *.o *~ .libs - -install: - $(LTINSTALL) $(MODNAME).$(DYNAMIC_LIB_EXTEN) $(DESTDIR)$(PREFIX)/mod 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 Mon Mar 12 00:21:54 2007 @@ -1,17 +1,5 @@ -include ../mod_spidermonkey/sm.mak -CFLAGS+=-I$(BASE)/libs/libteletone/src -LDFLAGS+=$(BASE)/libs/libteletone/libteletone.la - -all: depends $(MODNAME).$(DYNAMIC_LIB_EXTEN) - -depends: -$(MODNAME).$(DYNAMIC_LIB_EXTEN): $(MODNAME).c - $(CC) $(CFLAGS) -c $(MODNAME).c -o $(MODNAME).o - $(LINK) $(SOLINK) -o $(MODNAME).$(DYNAMIC_LIB_EXTEN) $(MODNAME).o $(OBJS) $(LDFLAGS) - -clean: - rm -fr *.$(DYNAMIC_LIB_EXTEN) *.o *~ .libs - -install: - $(LTINSTALL) $(MODNAME).$(DYNAMIC_LIB_EXTEN) $(DESTDIR)$(PREFIX)/mod +include ../mod_spidermonkey/sm.mak +LOCAL_CFLAGS+=-I$(BASE)/libs/libteletone/src +LOCAL_LDFLAGS+=$(BASE)/libs/libteletone/libteletone.la +include $(BASE)/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 Mon Mar 12 00:21:54 2007 @@ -1,19 +1,11 @@ -CFLAGS += -I$(BASE)/libs/curl/include -LDFLAGS += $(BASE)/libs/curl/lib/libcurl.la +# define these targets in your makefile if you wish +# local_all local_depend local_clean depend_install local_install local_distclean local_extraclean: -all: depends $(MODNAME).$(DYNAMIC_LIB_EXTEN) +# and define these variables to imapact your build +LOCAL_CFLAGS=-I$(BASE)/libs/curl/include +LOCAL_LDFLAGS=$(BASE)/libs/curl/lib/libcurl.la +LOCAL_OBJS= +include $(BASE)/build/modmake.rules -depends: +local_depend: cd $(BASE)/libs/curl && $(MAKE) - - -$(MODNAME).$(DYNAMIC_LIB_EXTEN): $(MODNAME).c - $(CC) $(CFLAGS) -c $(MODNAME).c -o $(MODNAME).o - $(LINK) $(SOLINK) -o $(MODNAME).$(DYNAMIC_LIB_EXTEN) $(MODNAME).o $(LDFLAGS) - - -clean: - rm -fr *.$(DYNAMIC_LIB_EXTEN) *.o *~ .libs - -install: - $(LTINSTALL) $(MODNAME).$(DYNAMIC_LIB_EXTEN) $(DESTDIR)$(PREFIX)/mod 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 Mon Mar 12 00:21:54 2007 @@ -1,23 +1,12 @@ -#LDFLAGS += -lxmlrpc -lxmlrpc_abyss -lxmlrpc_server -lxmlrpc_server_abyss -lxmlrpc_xmlparse -LDFLAGS += $(BASE)/libs/xmlrpc-c/src/libxmlrpc.la $(BASE)/libs/xmlrpc-c/src/libxmlrpc_server.la -LDFLAGS += $(BASE)/libs/xmlrpc-c/src/libxmlrpc_server_abyss.la $(BASE)/libs/xmlrpc-c/lib/abyss/src/libxmlrpc_abyss.la -LDFLAGS += $(BASE)/libs/xmlrpc-c/lib/expat/xmlparse/libxmlrpc_xmlparse.la -CFLAGS += -I$(BASE)/libs/xmlrpc-c/include +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 -all: depends $(MODNAME).$(DYNAMIC_LIB_EXTEN) +LOCAL_CFLAGS=-I$(BASE)/libs/xmlrpc-c/include -depends: - cd $(BASE)/libs/xmlrpc-c && $(MAKE) - - -$(MODNAME).$(DYNAMIC_LIB_EXTEN): $(MODNAME).c - $(CC) $(CFLAGS) -c $(MODNAME).c -o $(MODNAME).o - $(LINK) $(SOLINK) -o $(MODNAME).$(DYNAMIC_LIB_EXTEN) $(MODNAME).o $(LDFLAGS) +include $(BASE)/build/modmake.rules +local_depend: + cd $(BASE)/libs/xmlrpc-c && $(MAKE) -clean: - rm -fr *.$(DYNAMIC_LIB_EXTEN) *.o *~ .libs - -install: - $(LTINSTALL) $(MODNAME).$(DYNAMIC_LIB_EXTEN) $(DESTDIR)$(PREFIX)/mod

1 0

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

12 Mar '07

Author: brian Date: Sun Mar 11 22:38:55 2007 New Revision: 4561 Modified: freeswitch/trunk/src/mod/formats/mod_shout/mod_shout.c Log: changed usigned char 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 Sun Mar 11 22:38:55 2007 @@ -297,7 +297,7 @@ shout_context_t *context = handle->private_info; - char mp3buf[2048] = ""; + unsigned char mp3buf[2048] = ""; long ret = 0; int rlen; int16_t *audio = data;

1 0

[commit] r4560 - freeswitch/trunk/build
by Freeswitch SVN 11 Mar '07

11 Mar '07

Author: mikej Date: Sun Mar 11 12:58:22 2007 New Revision: 4560 Added: freeswitch/trunk/build/modmake.rules.in Log: first revision of a configure generated makefile for use with all the modules. Added: freeswitch/trunk/build/modmake.rules.in ============================================================================== --- (empty file) +++ freeswitch/trunk/build/modmake.rules.in Sun Mar 11 12:58:22 2007 @@ -0,0 +1,57 @@ +@SET_MAKE@ + +switch_builddir=@switch_builddir@ +switch_srcdir=@switch_srcdir@ +BASE=$(switch_srcdir) + +CC=@CC@ +RM=@RM@ +AWK=@AWK@ +SHELL=@SHELL@ +INSTALL=@INSTALL@ +LIBTOOL=$(switch_builddir)/libtool +LTINSTALL = $(LIBTOOL) --mode=install $(INSTALL) + +CFLAGS=@SWITCH_AM_CFLAGS@ @CFLAGS@ +CPPFLAGS=$(CFLAGS) @CPPFLAGS@ +LDFLAGS=@SWITCH_AM_LDFLAGS@ @LDFLAGS@ +LIBS=$(switch_builddir)/libfreeswitch.la +DEFS=@DEFS@ +PREFIX = @prefix@ + +DYLD_LIBRARY_PATH=$(PREFIX)/lib:$DYLD_LIBRARY_PATH +LD_LIBRARY_PATH=$(PREFIX)/lib:$LD_LIBRARY_PATH +OSARCH=$(shell uname -s) +DYNAMIC_LIB_EXTEN = @DYNAMIC_LIB_EXTEN@ +SOLINK = @SOLINK@ + +COMPILE = $(CC) $(MOD_CFLAGS) $(MOD_CPPFLAGS) $(MOD_INCLUDES) +LT_COMPILE = @lt_compile@ + +LINK = @link@ + +all: $(MODNAME).$(DYNAMIC_LIB_EXTEN) + +$(MODNAME).$(DYNAMIC_LIB_EXTEN): $(MODNAME).c + $(CC) $(CFLAGS) -c $(MODNAME).c -o $(MODNAME).o + $(LINK) $(SOLINK) $(MODNAME).o -o $(MODNAME).$(DYNAMIC_LIB_EXTEN) $(LDFLAGS) $(OBJS) + +clean: + rm -fr *.$(DYNAMIC_LIB_EXTEN) *.o *~ .libs + +install: + $(LTINSTALL) $(MODNAME).$(DYNAMIC_LIB_EXTEN) $(DESTDIR)$(PREFIX)/mod + + +# +# Implicit rules for creating outputs from input files +# +.SUFFIXES: +.SUFFIXES: .c .lo .o + +.c.o: + $(COMPILE) -c $< + +.c.lo: + $(LT_COMPILE) +

1 0

[commit] r4559 - in freeswitch/trunk/src/mod: directories/mod_ldap languages/mod_spidermonkey languages/mod_spidermonkey_teletone
by Freeswitch SVN 11 Mar '07

11 Mar '07

Author: mikej Date: Sun Mar 11 12:24:34 2007 New Revision: 4559 Modified: freeswitch/trunk/src/mod/directories/mod_ldap/Makefile freeswitch/trunk/src/mod/languages/mod_spidermonkey/sm.mak freeswitch/trunk/src/mod/languages/mod_spidermonkey_teletone/Makefile Log: fix include paths and makefiles 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 Sun Mar 11 12:24:34 2007 @@ -10,11 +10,11 @@ MAKE=$(MAKE) $(BASE)/build/buildlib.sh $(BASE) install openldap-2.3.19.tgz --prefix=$(PREFIX) --disable-bdb --disable-hdb $(MODNAME).$(DYNAMIC_LIB_EXTEN): $(MODNAME).c - $(CC) $(CFLAGS) -fPIC -c $(MODNAME).c -o $(MODNAME).o - $(LINKER) $(SOLINK) -o $(MODNAME).$(DYNAMIC_LIB_EXTEN) $(MODNAME).o $(LDFLAGS) + $(CC) $(CFLAGS) -c $(MODNAME).c -o $(MODNAME).o + $(LINK) $(SOLINK) -o $(MODNAME).$(DYNAMIC_LIB_EXTEN) $(MODNAME).o $(LDFLAGS) clean: - rm -fr *.$(DYNAMIC_LIB_EXTEN) *.o *~ + rm -fr *.$(DYNAMIC_LIB_EXTEN) *.o *~ .libs install: - cp -f $(MODNAME).$(DYNAMIC_LIB_EXTEN) $(PREFIX)/mod + $(LTINSTALL) $(MODNAME).$(DYNAMIC_LIB_EXTEN) $(DESTDIR)$(PREFIX)/mod Modified: freeswitch/trunk/src/mod/languages/mod_spidermonkey/sm.mak ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_spidermonkey/sm.mak (original) +++ freeswitch/trunk/src/mod/languages/mod_spidermonkey/sm.mak Sun Mar 11 12:24:34 2007 @@ -1,2 +1,2 @@ -CFLAGS += -I$(BASE)/libs/js/src -I$(BASE)/libs/js/nsprpub/include -DXP_UNIX -I../mod_spidermonkey -DJS_THREADSAFE -DJS_HAS_FILE_OBJECT=1 +CFLAGS += -I$(BASE)/libs/js/src -I$(BASE)/libs/js/nsprpub/dist/include/nspr -DXP_UNIX -I../mod_spidermonkey -DJS_THREADSAFE -DJS_HAS_FILE_OBJECT=1 LDFLAGS += -L$(BASE)/libs/js/nsprpub/pr/src -L$(BASE)/libs/js/nsprpub/dist/lib -lnspr4 $(BASE)/libs/js/libjs.la 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 Sun Mar 11 12:24:34 2007 @@ -1,4 +1,5 @@ include ../mod_spidermonkey/sm.mak +CFLAGS+=-I$(BASE)/libs/libteletone/src LDFLAGS+=$(BASE)/libs/libteletone/libteletone.la all: depends $(MODNAME).$(DYNAMIC_LIB_EXTEN)

1 0

[commit] r4558 - freeswitch/trunk/src/mod/event_handlers/mod_xmpp_event
by Freeswitch SVN 11 Mar '07

11 Mar '07

Author: mikej Date: Sun Mar 11 11:36:04 2007 New Revision: 4558 Modified: freeswitch/trunk/src/mod/event_handlers/mod_xmpp_event/Makefile Log: no need to install, no need for buildlib.sh 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 Sun Mar 11 11:36:04 2007 @@ -4,7 +4,7 @@ all: depends $(MODNAME).$(DYNAMIC_LIB_EXTEN) depends: - MAKE=$(MAKE) $(BASE)/build/buildlib.sh $(BASE) install iksemel --prefix=$(PREFIX) + cd $(BASE)/libs/iksemel && $(MAKE) $(MODNAME).$(DYNAMIC_LIB_EXTEN): $(MODNAME).c $(CC) $(CFLAGS) -c $(MODNAME).c -o $(MODNAME).o @@ -14,5 +14,4 @@ rm -fr *.$(DYNAMIC_LIB_EXTEN) *.o *~ .libs install: - cd $(BASE)/libs/iksemel && $(MAKE) install $(LTINSTALL) $(MODNAME).$(DYNAMIC_LIB_EXTEN) $(DESTDIR)$(PREFIX)/mod

1 0

[commit] r4557 - freeswitch/trunk/libs/libsndfile
by Freeswitch SVN 11 Mar '07

11 Mar '07

Author: mikej Date: Sun Mar 11 11:35:32 2007 New Revision: 4557 Modified: freeswitch/trunk/libs/libsndfile/configure.gnu Log: don't give me no flac. Modified: freeswitch/trunk/libs/libsndfile/configure.gnu ============================================================================== --- freeswitch/trunk/libs/libsndfile/configure.gnu (original) +++ freeswitch/trunk/libs/libsndfile/configure.gnu Sun Mar 11 11:35:32 2007 @@ -1,3 +1,3 @@ #! /bin/sh -./configure "$@" --disable-sqlite --disable-shared --with-pic +./configure "$@" --disable-sqlite --disable-shared --with-pic --disable-flac

1 0

[commit] r4556 - freeswitch/trunk/libs/codec/lpc10/build
by Freeswitch SVN 11 Mar '07

11 Mar '07

Author: mikej Date: Sun Mar 11 11:24:36 2007 New Revision: 4556 Added: freeswitch/trunk/libs/codec/lpc10/build/compile (contents, props changed) freeswitch/trunk/libs/codec/lpc10/build/depcomp (contents, props changed) freeswitch/trunk/libs/codec/lpc10/build/install-sh (contents, props changed) freeswitch/trunk/libs/codec/lpc10/build/missing (contents, props changed) Log: update the in tree generated files for lpc10 2/2 Added: freeswitch/trunk/libs/codec/lpc10/build/compile ============================================================================== --- (empty file) +++ freeswitch/trunk/libs/codec/lpc10/build/compile Sun Mar 11 11:24:36 2007 @@ -0,0 +1,140 @@ +#! /bin/sh +# Wrapper for compilers which do not understand `-c -o'. + +scriptversion=2004-09-10.20 + +# Copyright (C) 1999, 2000, 2003, 2004 Free Software Foundation, Inc. +# Written by Tom Tromey <tromey(a)cygnus.com>. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2, or (at your option) +# any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + +# As a special exception to the GNU General Public License, if you +# distribute this file as part of a program that contains a +# configuration script generated by Autoconf, you may include it under +# the same distribution terms that you use for the rest of that program. + +# This file is maintained in Automake, please report +# bugs to <bug-automake(a)gnu.org> or send patches to +# <automake-patches(a)gnu.org>. + +case $1 in + '') + echo "$0: No command. Try \`$0 --help' for more information." 1>&2 + exit 1; + ;; + -h | --h*) + cat <<\EOF +Usage: compile [--help] [--version] PROGRAM [ARGS] + +Wrapper for compilers which do not understand `-c -o'. +Remove `-o dest.o' from ARGS, run PROGRAM with the remaining +arguments, and rename the output as expected. + +If you are trying to build a whole package this is not the +right script to run: please start by reading the file `INSTALL'. + +Report bugs to <bug-automake(a)gnu.org>. +EOF + exit 0 + ;; + -v | --v*) + echo "compile $scriptversion" + exit 0 + ;; +esac + +ofile= +cfile= +eat= + +for arg +do + if test -n "$eat"; then + eat= + else + case $1 in + -o) + # configure might choose to run compile as `compile cc -o foo foo.c'. + # So we strip `-o arg' only if arg is an object. + eat=1 + case $2 in + *.o | *.obj) + ofile=$2 + ;; + *) + set x "$@" -o "$2" + shift + ;; + esac + ;; + *.c) + cfile=$1 + set x "$@" "$1" + shift + ;; + *) + set x "$@" "$1" + shift + ;; + esac + fi + shift +done + +if test -z "$ofile" || test -z "$cfile"; then + # If no `-o' option was seen then we might have been invoked from a + # pattern rule where we don't need one. That is ok -- this is a + # normal compilation that the losing compiler can handle. If no + # `.c' file was seen then we are probably linking. That is also + # ok. + exec "$@" +fi + +# Name of file we expect compiler to create. +cofile=`echo "$cfile" | sed -e 's|^.*/||' -e 's/\.c$/.o/'` + +# Create the lock directory. +# Note: use `[/.-]' here to ensure that we don't use the same name +# that we are using for the .o file. Also, base the name on the expected +# object file name, since that is what matters with a parallel build. +lockdir=`echo "$cofile" | sed -e 's|[/.-]|_|g'`.d +while true; do + if mkdir "$lockdir" >/dev/null 2>&1; then + break + fi + sleep 1 +done +# FIXME: race condition here if user kills between mkdir and trap. +trap "rmdir '$lockdir'; exit 1" 1 2 15 + +# Run the compile. +"$@" +ret=$? + +if test -f "$cofile"; then + mv "$cofile" "$ofile" +fi + +rmdir "$lockdir" +exit $ret + +# Local Variables: +# mode: shell-script +# sh-indentation: 2 +# eval: (add-hook 'write-file-hooks 'time-stamp) +# time-stamp-start: "scriptversion=" +# time-stamp-format: "%:y-%02m-%02d.%02H" +# time-stamp-end: "$" +# End: Added: freeswitch/trunk/libs/codec/lpc10/build/depcomp ============================================================================== --- (empty file) +++ freeswitch/trunk/libs/codec/lpc10/build/depcomp Sun Mar 11 11:24:36 2007 @@ -0,0 +1,522 @@ +#! /bin/sh +# depcomp - compile a program generating dependencies as side-effects + +scriptversion=2004-05-31.23 + +# Copyright (C) 1999, 2000, 2003, 2004 Free Software Foundation, Inc. + +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2, or (at your option) +# any later version. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. + +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA +# 02111-1307, USA. + +# As a special exception to the GNU General Public License, if you +# distribute this file as part of a program that contains a +# configuration script generated by Autoconf, you may include it under +# the same distribution terms that you use for the rest of that program. + +# Originally written by Alexandre Oliva <oliva(a)dcc.unicamp.br>. + +case $1 in + '') + echo "$0: No command. Try \`$0 --help' for more information." 1>&2 + exit 1; + ;; + -h | --h*) + cat <<\EOF +Usage: depcomp [--help] [--version] PROGRAM [ARGS] + +Run PROGRAMS ARGS to compile a file, generating dependencies +as side-effects. + +Environment variables: + depmode Dependency tracking mode. + source Source file read by `PROGRAMS ARGS'. + object Object file output by `PROGRAMS ARGS'. + DEPDIR directory where to store dependencies. + depfile Dependency file to output. + tmpdepfile Temporary file to use when outputing dependencies. + libtool Whether libtool is used (yes/no). + +Report bugs to <bug-automake(a)gnu.org>. +EOF + exit 0 + ;; + -v | --v*) + echo "depcomp $scriptversion" + exit 0 + ;; +esac + +if test -z "$depmode" || test -z "$source" || test -z "$object"; then + echo "depcomp: Variables source, object and depmode must be set" 1>&2 + exit 1 +fi + +# Dependencies for sub/bar.o or sub/bar.obj go into sub/.deps/bar.Po. +depfile=${depfile-`echo "$object" | + sed 's|[^\\/]*$|'${DEPDIR-.deps}'/&|;s|\.$[^.]*$$|.P\1|;s|Pobj$|Po|'`} +tmpdepfile=${tmpdepfile-`echo "$depfile" | sed 's/\.$[^.]*$$/.T\1/'`} + +rm -f "$tmpdepfile" + +# Some modes work just like other modes, but use different flags. We +# parameterize here, but still list the modes in the big case below, +# to make depend.m4 easier to write. Note that we *cannot* use a case +# here, because this file can only contain one case statement. +if test "$depmode" = hp; then + # HP compiler uses -M and no extra arg. + gccflag=-M + depmode=gcc +fi + +if test "$depmode" = dashXmstdout; then + # This is just like dashmstdout with a different argument. + dashmflag=-xM + depmode=dashmstdout +fi + +case "$depmode" in +gcc3) +## gcc 3 implements dependency tracking that does exactly what +## we want. Yay! Note: for some reason libtool 1.4 doesn't like +## it if -MD -MP comes after the -MF stuff. Hmm. + "$@" -MT "$object" -MD -MP -MF "$tmpdepfile" + stat=$? + if test $stat -eq 0; then : + else + rm -f "$tmpdepfile" + exit $stat + fi + mv "$tmpdepfile" "$depfile" + ;; + +gcc) +## There are various ways to get dependency output from gcc. Here's +## why we pick this rather obscure method: +## - Don't want to use -MD because we'd like the dependencies to end +## up in a subdir. Having to rename by hand is ugly. +## (We might end up doing this anyway to support other compilers.) +## - The DEPENDENCIES_OUTPUT environment variable makes gcc act like +## -MM, not -M (despite what the docs say). +## - Using -M directly means running the compiler twice (even worse +## than renaming). + if test -z "$gccflag"; then + gccflag=-MD, + fi + "$@" -Wp,"$gccflag$tmpdepfile" + stat=$? + if test $stat -eq 0; then : + else + rm -f "$tmpdepfile" + exit $stat + fi + rm -f "$depfile" + echo "$object : \\" > "$depfile" + alpha=ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz +## The second -e expression handles DOS-style file names with drive letters. + sed -e 's/^[^:]*: / /' \ + -e 's/^['$alpha']:\/[^:]*: / /' < "$tmpdepfile" >> "$depfile" +## This next piece of magic avoids the `deleted header file' problem. +## The problem is that when a header file which appears in a .P file +## is deleted, the dependency causes make to die (because there is +## typically no way to rebuild the header). We avoid this by adding +## dummy dependencies for each header file. Too bad gcc doesn't do +## this for us directly. + tr ' ' ' +' < "$tmpdepfile" | +## Some versions of gcc put a space before the `:'. On the theory +## that the space means something, we add a space to the output as +## well. +## Some versions of the HPUX 10.20 sed can't process this invocation +## correctly. Breaking it into two sed invocations is a workaround. + sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile" + rm -f "$tmpdepfile" + ;; + +hp) + # This case exists only to let depend.m4 do its work. It works by + # looking at the text of this script. This case will never be run, + # since it is checked for above. + exit 1 + ;; + +sgi) + if test "$libtool" = yes; then + "$@" "-Wp,-MDupdate,$tmpdepfile" + else + "$@" -MDupdate "$tmpdepfile" + fi + stat=$? + if test $stat -eq 0; then : + else + rm -f "$tmpdepfile" + exit $stat + fi + rm -f "$depfile" + + if test -f "$tmpdepfile"; then # yes, the sourcefile depend on other files + echo "$object : \\" > "$depfile" + + # Clip off the initial element (the dependent). Don't try to be + # clever and replace this with sed code, as IRIX sed won't handle + # lines with more than a fixed number of characters (4096 in + # IRIX 6.2 sed, 8192 in IRIX 6.5). We also remove comment lines; + # the IRIX cc adds comments like `#:fec' to the end of the + # dependency line. + tr ' ' ' +' < "$tmpdepfile" \ + | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' | \ + tr ' +' ' ' >> $depfile + echo >> $depfile + + # The second pass generates a dummy entry for each header file. + tr ' ' ' +' < "$tmpdepfile" \ + | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' -e 's/$/:/' \ + >> $depfile + else + # The sourcefile does not contain any dependencies, so just + # store a dummy comment line, to avoid errors with the Makefile + # "include basename.Plo" scheme. + echo "#dummy" > "$depfile" + fi + rm -f "$tmpdepfile" + ;; + +aix) + # The C for AIX Compiler uses -M and outputs the dependencies + # in a .u file. In older versions, this file always lives in the + # current directory. Also, the AIX compiler puts `$object:' at the + # start of each line; $object doesn't have directory information. + # Version 6 uses the directory in both cases. + stripped=`echo "$object" | sed 's/$.*$\..*$/\1/'` + tmpdepfile="$stripped.u" + if test "$libtool" = yes; then + "$@" -Wc,-M + else + "$@" -M + fi + stat=$? + + if test -f "$tmpdepfile"; then : + else + stripped=`echo "$stripped" | sed 's,^.*/,,'` + tmpdepfile="$stripped.u" + fi + + if test $stat -eq 0; then : + else + rm -f "$tmpdepfile" + exit $stat + fi + + if test -f "$tmpdepfile"; then + outname="$stripped.o" + # Each line is of the form `foo.o: dependent.h'. + # Do two passes, one to just change these to + # `$object: dependent.h' and one to simply `dependent.h:'. + sed -e "s,^$outname:,$object :," < "$tmpdepfile" > "$depfile" + sed -e "s,^$outname: $.*$$,\1:," < "$tmpdepfile" >> "$depfile" + else + # The sourcefile does not contain any dependencies, so just + # store a dummy comment line, to avoid errors with the Makefile + # "include basename.Plo" scheme. + echo "#dummy" > "$depfile" + fi + rm -f "$tmpdepfile" + ;; + +icc) + # Intel's C compiler understands `-MD -MF file'. However on + # icc -MD -MF foo.d -c -o sub/foo.o sub/foo.c + # ICC 7.0 will fill foo.d with something like + # foo.o: sub/foo.c + # foo.o: sub/foo.h + # which is wrong. We want: + # sub/foo.o: sub/foo.c + # sub/foo.o: sub/foo.h + # sub/foo.c: + # sub/foo.h: + # ICC 7.1 will output + # foo.o: sub/foo.c sub/foo.h + # and will wrap long lines using \ : + # foo.o: sub/foo.c ... \ + # sub/foo.h ... \ + # ... + + "$@" -MD -MF "$tmpdepfile" + stat=$? + if test $stat -eq 0; then : + else + rm -f "$tmpdepfile" + exit $stat + fi + rm -f "$depfile" + # Each line is of the form `foo.o: dependent.h', + # or `foo.o: dep1.h dep2.h \', or ` dep3.h dep4.h \'. + # Do two passes, one to just change these to + # `$object: dependent.h' and one to simply `dependent.h:'. + sed "s,^[^:]*:,$object :," < "$tmpdepfile" > "$depfile" + # Some versions of the HPUX 10.20 sed can't process this invocation + # correctly. Breaking it into two sed invocations is a workaround. + sed 's,^[^:]*: $.*$$,\1,;s/^\\$//;/^$/d;/:$/d' < "$tmpdepfile" | + sed -e 's/$/ :/' >> "$depfile" + rm -f "$tmpdepfile" + ;; + +tru64) + # The Tru64 compiler uses -MD to generate dependencies as a side + # effect. `cc -MD -o foo.o ...' puts the dependencies into `foo.o.d'. + # At least on Alpha/Redhat 6.1, Compaq CCC V6.2-504 seems to put + # dependencies in `foo.d' instead, so we check for that too. + # Subdirectories are respected. + dir=`echo "$object" | sed -e 's|/[^/]*$|/|'` + test "x$dir" = "x$object" && dir= + base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'` + + if test "$libtool" = yes; then + # Dependencies are output in .lo.d with libtool 1.4. + # With libtool 1.5 they are output both in $dir.libs/$base.o.d + # and in $dir.libs/$base.o.d and $dir$base.o.d. We process the + # latter, because the former will be cleaned when $dir.libs is + # erased. + tmpdepfile1="$dir.libs/$base.lo.d" + tmpdepfile2="$dir$base.o.d" + tmpdepfile3="$dir.libs/$base.d" + "$@" -Wc,-MD + else + tmpdepfile1="$dir$base.o.d" + tmpdepfile2="$dir$base.d" + tmpdepfile3="$dir$base.d" + "$@" -MD + fi + + stat=$? + if test $stat -eq 0; then : + else + rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" + exit $stat + fi + + if test -f "$tmpdepfile1"; then + tmpdepfile="$tmpdepfile1" + elif test -f "$tmpdepfile2"; then + tmpdepfile="$tmpdepfile2" + else + tmpdepfile="$tmpdepfile3" + fi + if test -f "$tmpdepfile"; then + sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile" + # That's a tab and a space in the []. + sed -e 's,^.*\.[a-z]*:[ ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile" + else + echo "#dummy" > "$depfile" + fi + rm -f "$tmpdepfile" + ;; + +#nosideeffect) + # This comment above is used by automake to tell side-effect + # dependency tracking mechanisms from slower ones. + +dashmstdout) + # Important note: in order to support this mode, a compiler *must* + # always write the preprocessed file to stdout, regardless of -o. + "$@" || exit $? + + # Remove the call to Libtool. + if test "$libtool" = yes; then + while test $1 != '--mode=compile'; do + shift + done + shift + fi + + # Remove `-o $object'. + IFS=" " + for arg + do + case $arg in + -o) + shift + ;; + $object) + shift + ;; + *) + set fnord "$@" "$arg" + shift # fnord + shift # $arg + ;; + esac + done + + test -z "$dashmflag" && dashmflag=-M + # Require at least two characters before searching for `:' + # in the target name. This is to cope with DOS-style filenames: + # a dependency such as `c:/foo/bar' could be seen as target `c' otherwise. + "$@" $dashmflag | + sed 's:^[ ]*[^: ][^:][^:]*\:[ ]*:'"$object"'\: :' > "$tmpdepfile" + rm -f "$depfile" + cat < "$tmpdepfile" > "$depfile" + tr ' ' ' +' < "$tmpdepfile" | \ +## Some versions of the HPUX 10.20 sed can't process this invocation +## correctly. Breaking it into two sed invocations is a workaround. + sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile" + rm -f "$tmpdepfile" + ;; + +dashXmstdout) + # This case only exists to satisfy depend.m4. It is never actually + # run, as this mode is specially recognized in the preamble. + exit 1 + ;; + +makedepend) + "$@" || exit $? + # Remove any Libtool call + if test "$libtool" = yes; then + while test $1 != '--mode=compile'; do + shift + done + shift + fi + # X makedepend + shift + cleared=no + for arg in "$@"; do + case $cleared in + no) + set ""; shift + cleared=yes ;; + esac + case "$arg" in + -D*|-I*) + set fnord "$@" "$arg"; shift ;; + # Strip any option that makedepend may not understand. Remove + # the object too, otherwise makedepend will parse it as a source file. + -*|$object) + ;; + *) + set fnord "$@" "$arg"; shift ;; + esac + done + obj_suffix="`echo $object | sed 's/^.*\././'`" + touch "$tmpdepfile" + ${MAKEDEPEND-makedepend} -o"$obj_suffix" -f"$tmpdepfile" "$@" + rm -f "$depfile" + cat < "$tmpdepfile" > "$depfile" + sed '1,2d' "$tmpdepfile" | tr ' ' ' +' | \ +## Some versions of the HPUX 10.20 sed can't process this invocation +## correctly. Breaking it into two sed invocations is a workaround. + sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile" + rm -f "$tmpdepfile" "$tmpdepfile".bak + ;; + +cpp) + # Important note: in order to support this mode, a compiler *must* + # always write the preprocessed file to stdout. + "$@" || exit $? + + # Remove the call to Libtool. + if test "$libtool" = yes; then + while test $1 != '--mode=compile'; do + shift + done + shift + fi + + # Remove `-o $object'. + IFS=" " + for arg + do + case $arg in + -o) + shift + ;; + $object) + shift + ;; + *) + set fnord "$@" "$arg" + shift # fnord + shift # $arg + ;; + esac + done + + "$@" -E | + sed -n '/^# [0-9][0-9]* "$[^"]*$".*/ s:: \1 \\:p' | + sed '$ s: \\$::' > "$tmpdepfile" + rm -f "$depfile" + echo "$object : \\" > "$depfile" + cat < "$tmpdepfile" >> "$depfile" + sed < "$tmpdepfile" '/^$/d;s/^ //;s/ \\$//;s/$/ :/' >> "$depfile" + rm -f "$tmpdepfile" + ;; + +msvisualcpp) + # Important note: in order to support this mode, a compiler *must* + # always write the preprocessed file to stdout, regardless of -o, + # because we must use -o when running libtool. + "$@" || exit $? + IFS=" " + for arg + do + case "$arg" in + "-Gm"|"/Gm"|"-Gi"|"/Gi"|"-ZI"|"/ZI") + set fnord "$@" + shift + shift + ;; + *) + set fnord "$@" "$arg" + shift + shift + ;; + esac + done + "$@" -E | + sed -n '/^#line [0-9][0-9]* "$[^"]*$"/ s::echo "`cygpath -u \\"\1\\"`":p' | sort | uniq > "$tmpdepfile" + rm -f "$depfile" + echo "$object : \\" > "$depfile" + . "$tmpdepfile" | sed 's% %\\ %g' | sed -n '/^$.*$$/ s:: \1 \\:p' >> "$depfile" + echo " " >> "$depfile" + . "$tmpdepfile" | sed 's% %\\ %g' | sed -n '/^$.*$$/ s::\1\::p' >> "$depfile" + rm -f "$tmpdepfile" + ;; + +none) + exec "$@" + ;; + +*) + echo "Unknown depmode $depmode" 1>&2 + exit 1 + ;; +esac + +exit 0 + +# Local Variables: +# mode: shell-script +# sh-indentation: 2 +# eval: (add-hook 'write-file-hooks 'time-stamp) +# time-stamp-start: "scriptversion=" +# time-stamp-format: "%:y-%02m-%02d.%02H" +# time-stamp-end: "$" +# End: Added: freeswitch/trunk/libs/codec/lpc10/build/install-sh ============================================================================== --- (empty file) +++ freeswitch/trunk/libs/codec/lpc10/build/install-sh Sun Mar 11 11:24:36 2007 @@ -0,0 +1,322 @@ +#!/bin/sh +# install - install a program, script, or datafile + +scriptversion=2004-09-10.20 + +# This originates from X11R5 (mit/util/scripts/install.sh), which was +# later released in X11R6 (xc/config/util/install.sh) with the +# following copyright and license. +# +# Copyright (C) 1994 X Consortium +# +# Permission is hereby granted, free of charge, to any person obtaining a copy +# of this software and associated documentation files (the "Software"), to +# deal in the Software without restriction, including without limitation the +# rights to use, copy, modify, merge, publish, distribute, sublicense, and/or +# sell copies of the Software, and to permit persons to whom the Software is +# furnished to do so, subject to the following conditions: +# +# The above copyright notice and this permission notice shall be included in +# all copies or substantial portions of the Software. +# +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +# X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN +# AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNEC- +# TION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. +# +# Except as contained in this notice, the name of the X Consortium shall not +# be used in advertising or otherwise to promote the sale, use or other deal- +# ings in this Software without prior written authorization from the X Consor- +# tium. +# +# +# FSF changes to this file are in the public domain. +# +# Calling this script install-sh is preferred over install.sh, to prevent +# `make' implicit rules from creating a file called install from it +# when there is no Makefile. +# +# This script is compatible with the BSD install script, but was written +# from scratch. It can only install one file at a time, a restriction +# shared with many OS's install programs. + +# set DOITPROG to echo to test this script + +# Don't use :- since 4.3BSD and earlier shells don't like it. +doit="${DOITPROG-}" + +# put in absolute paths if you don't have them in your path; or use env. vars. + +mvprog="${MVPROG-mv}" +cpprog="${CPPROG-cp}" +chmodprog="${CHMODPROG-chmod}" +chownprog="${CHOWNPROG-chown}" +chgrpprog="${CHGRPPROG-chgrp}" +stripprog="${STRIPPROG-strip}" +rmprog="${RMPROG-rm}" +mkdirprog="${MKDIRPROG-mkdir}" + +chmodcmd="$chmodprog 0755" +chowncmd= +chgrpcmd= +stripcmd= +rmcmd="$rmprog -f" +mvcmd="$mvprog" +src= +dst= +dir_arg= +dstarg= +no_target_directory= + +usage="Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE + or: $0 [OPTION]... SRCFILES... DIRECTORY + or: $0 [OPTION]... -t DIRECTORY SRCFILES... + or: $0 [OPTION]... -d DIRECTORIES... + +In the 1st form, copy SRCFILE to DSTFILE. +In the 2nd and 3rd, copy all SRCFILES to DIRECTORY. +In the 4th, create DIRECTORIES. + +Options: +-c (ignored) +-d create directories instead of installing files. +-g GROUP $chgrpprog installed files to GROUP. +-m MODE $chmodprog installed files to MODE. +-o USER $chownprog installed files to USER. +-s $stripprog installed files. +-t DIRECTORY install into DIRECTORY. +-T report an error if DSTFILE is a directory. +--help display this help and exit. +--version display version info and exit. + +Environment variables override the default commands: + CHGRPPROG CHMODPROG CHOWNPROG CPPROG MKDIRPROG MVPROG RMPROG STRIPPROG +" + +while test -n "$1"; do + case $1 in + -c) shift + continue;; + + -d) dir_arg=true + shift + continue;; + + -g) chgrpcmd="$chgrpprog $2" + shift + shift + continue;; + + --help) echo "$usage"; exit 0;; + + -m) chmodcmd="$chmodprog $2" + shift + shift + continue;; + + -o) chowncmd="$chownprog $2" + shift + shift + continue;; + + -s) stripcmd=$stripprog + shift + continue;; + + -t) dstarg=$2 + shift + shift + continue;; + + -T) no_target_directory=true + shift + continue;; + + --version) echo "$0 $scriptversion"; exit 0;; + + *) # When -d is used, all remaining arguments are directories to create. + # When -t is used, the destination is already specified. + test -n "$dir_arg$dstarg" && break + # Otherwise, the last argument is the destination. Remove it from $@. + for arg + do + if test -n "$dstarg"; then + # $@ is not empty: it contains at least $arg. + set fnord "$@" "$dstarg" + shift # fnord + fi + shift # arg + dstarg=$arg + done + break;; + esac +done + +if test -z "$1"; then + if test -z "$dir_arg"; then + echo "$0: no input file specified." >&2 + exit 1 + fi + # It's OK to call `install-sh -d' without argument. + # This can happen when creating conditional directories. + exit 0 +fi + +for src +do + # Protect names starting with `-'. + case $src in + -*) src=./$src ;; + esac + + if test -n "$dir_arg"; then + dst=$src + src= + + if test -d "$dst"; then + mkdircmd=: + chmodcmd= + else + mkdircmd=$mkdirprog + fi + else + # Waiting for this to be detected by the "$cpprog $src $dsttmp" command + # might cause directories to be created, which would be especially bad + # if $src (and thus $dsttmp) contains '*'. + if test ! -f "$src" && test ! -d "$src"; then + echo "$0: $src does not exist." >&2 + exit 1 + fi + + if test -z "$dstarg"; then + echo "$0: no destination specified." >&2 + exit 1 + fi + + dst=$dstarg + # Protect names starting with `-'. + case $dst in + -*) dst=./$dst ;; + esac + + # If destination is a directory, append the input filename; won't work + # if double slashes aren't ignored. + if test -d "$dst"; then + if test -n "$no_target_directory"; then + echo "$0: $dstarg: Is a directory" >&2 + exit 1 + fi + dst=$dst/`basename "$src"` + fi + fi + + # This sed command emulates the dirname command. + dstdir=`echo "$dst" | sed -e 's,[^/]*$,,;s,/$,,;s,^$,.,'` + + # Make sure that the destination directory exists. + + # Skip lots of stat calls in the usual case. + if test ! -d "$dstdir"; then + defaultIFS=' + ' + IFS="${IFS-$defaultIFS}" + + oIFS=$IFS + # Some sh's can't handle IFS=/ for some reason. + IFS='%' + set - `echo "$dstdir" | sed -e 's@/@%@g' -e 's@^%@/@'` + IFS=$oIFS + + pathcomp= + + while test $# -ne 0 ; do + pathcomp=$pathcomp$1 + shift + if test ! -d "$pathcomp"; then + $mkdirprog "$pathcomp" + # mkdir can fail with a `File exist' error in case several + # install-sh are creating the directory concurrently. This + # is OK. + test -d "$pathcomp" || exit + fi + pathcomp=$pathcomp/ + done + fi + + if test -n "$dir_arg"; then + $doit $mkdircmd "$dst" \ + && { test -z "$chowncmd" || $doit $chowncmd "$dst"; } \ + && { test -z "$chgrpcmd" || $doit $chgrpcmd "$dst"; } \ + && { test -z "$stripcmd" || $doit $stripcmd "$dst"; } \ + && { test -z "$chmodcmd" || $doit $chmodcmd "$dst"; } + + else + dstfile=`basename "$dst"` + + # Make a couple of temp file names in the proper directory. + dsttmp=$dstdir/_inst.$$_ + rmtmp=$dstdir/_rm.$$_ + + # Trap to clean up those temp files at exit. + trap 'ret=$?; rm -f "$dsttmp" "$rmtmp" && exit $ret' 0 + trap '(exit $?); exit' 1 2 13 15 + + # Copy the file name to the temp name. + $doit $cpprog "$src" "$dsttmp" && + + # and set any options; do chmod last to preserve setuid bits. + # + # If any of these fail, we abort the whole thing. If we want to + # ignore errors from any of these, just make sure not to ignore + # errors from the above "$doit $cpprog $src $dsttmp" command. + # + { test -z "$chowncmd" || $doit $chowncmd "$dsttmp"; } \ + && { test -z "$chgrpcmd" || $doit $chgrpcmd "$dsttmp"; } \ + && { test -z "$stripcmd" || $doit $stripcmd "$dsttmp"; } \ + && { test -z "$chmodcmd" || $doit $chmodcmd "$dsttmp"; } && + + # Now rename the file to the real destination. + { $doit $mvcmd -f "$dsttmp" "$dstdir/$dstfile" 2>/dev/null \ + || { + # The rename failed, perhaps because mv can't rename something else + # to itself, or perhaps because mv is so ancient that it does not + # support -f. + + # Now remove or move aside any old file at destination location. + # We try this two ways since rm can't unlink itself on some + # systems and the destination file might be busy for other + # reasons. In this case, the final cleanup might fail but the new + # file should still install successfully. + { + if test -f "$dstdir/$dstfile"; then + $doit $rmcmd -f "$dstdir/$dstfile" 2>/dev/null \ + || $doit $mvcmd -f "$dstdir/$dstfile" "$rmtmp" 2>/dev/null \ + || { + echo "$0: cannot unlink or rename $dstdir/$dstfile" >&2 + (exit 1); exit + } + else + : + fi + } && + + # Now rename the file to the real destination. + $doit $mvcmd "$dsttmp" "$dstdir/$dstfile" + } + } + fi || { (exit 1); exit; } +done + +# The final little trick to "correctly" pass the exit status to the exit trap. +{ + (exit 0); exit +} + +# Local variables: +# eval: (add-hook 'write-file-hooks 'time-stamp) +# time-stamp-start: "scriptversion=" +# time-stamp-format: "%:y-%02m-%02d.%02H" +# time-stamp-end: "$" +# End: Added: freeswitch/trunk/libs/codec/lpc10/build/missing ============================================================================== --- (empty file) +++ freeswitch/trunk/libs/codec/lpc10/build/missing Sun Mar 11 11:24:36 2007 @@ -0,0 +1,353 @@ +#! /bin/sh +# Common stub for a few missing GNU programs while installing. + +scriptversion=2004-09-07.08 + +# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004 +# Free Software Foundation, Inc. +# Originally by Fran,cois Pinard <pinard(a)iro.umontreal.ca>, 1996. + +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2, or (at your option) +# any later version. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. + +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA +# 02111-1307, USA. + +# As a special exception to the GNU General Public License, if you +# distribute this file as part of a program that contains a +# configuration script generated by Autoconf, you may include it under +# the same distribution terms that you use for the rest of that program. + +if test $# -eq 0; then + echo 1>&2 "Try \`$0 --help' for more information" + exit 1 +fi + +run=: + +# In the cases where this matters, `missing' is being run in the +# srcdir already. +if test -f configure.ac; then + configure_ac=configure.ac +else + configure_ac=configure.in +fi + +msg="missing on your system" + +case "$1" in +--run) + # Try to run requested program, and just exit if it succeeds. + run= + shift + "$@" && exit 0 + # Exit code 63 means version mismatch. This often happens + # when the user try to use an ancient version of a tool on + # a file that requires a minimum version. In this case we + # we should proceed has if the program had been absent, or + # if --run hadn't been passed. + if test $? = 63; then + run=: + msg="probably too old" + fi + ;; + + -h|--h|--he|--hel|--help) + echo "\ +$0 [OPTION]... PROGRAM [ARGUMENT]... + +Handle \`PROGRAM [ARGUMENT]...' for when PROGRAM is missing, or return an +error status if there is no known handling for PROGRAM. + +Options: + -h, --help display this help and exit + -v, --version output version information and exit + --run try to run the given command, and emulate it if it fails + +Supported PROGRAM values: + aclocal touch file \`aclocal.m4' + autoconf touch file \`configure' + autoheader touch file \`config.h.in' + automake touch all \`Makefile.in' files + bison create \`y.tab.[ch]', if possible, from existing .[ch] + flex create \`lex.yy.c', if possible, from existing .c + help2man touch the output file + lex create \`lex.yy.c', if possible, from existing .c + makeinfo touch the output file + tar try tar, gnutar, gtar, then tar without non-portable flags + yacc create \`y.tab.[ch]', if possible, from existing .[ch] + +Send bug reports to <bug-automake(a)gnu.org>." + exit 0 + ;; + + -v|--v|--ve|--ver|--vers|--versi|--versio|--version) + echo "missing $scriptversion (GNU Automake)" + exit 0 + ;; + + -*) + echo 1>&2 "$0: Unknown \`$1' option" + echo 1>&2 "Try \`$0 --help' for more information" + exit 1 + ;; + +esac + +# Now exit if we have it, but it failed. Also exit now if we +# don't have it and --version was passed (most likely to detect +# the program). +case "$1" in + lex|yacc) + # Not GNU programs, they don't have --version. + ;; + + tar) + if test -n "$run"; then + echo 1>&2 "ERROR: \`tar' requires --run" + exit 1 + elif test "x$2" = "x--version" || test "x$2" = "x--help"; then + exit 1 + fi + ;; + + *) + if test -z "$run" && ($1 --version) > /dev/null 2>&1; then + # We have it, but it failed. + exit 1 + elif test "x$2" = "x--version" || test "x$2" = "x--help"; then + # Could not run --version or --help. This is probably someone + # running `$TOOL --version' or `$TOOL --help' to check whether + # $TOOL exists and not knowing $TOOL uses missing. + exit 1 + fi + ;; +esac + +# If it does not exist, or fails to run (possibly an outdated version), +# try to emulate it. +case "$1" in + aclocal*) + echo 1>&2 "\ +WARNING: \`$1' is $msg. You should only need it if + you modified \`acinclude.m4' or \`${configure_ac}'. You might want + to install the \`Automake' and \`Perl' packages. Grab them from + any GNU archive site." + touch aclocal.m4 + ;; + + autoconf) + echo 1>&2 "\ +WARNING: \`$1' is $msg. You should only need it if + you modified \`${configure_ac}'. You might want to install the + \`Autoconf' and \`GNU m4' packages. Grab them from any GNU + archive site." + touch configure + ;; + + autoheader) + echo 1>&2 "\ +WARNING: \`$1' is $msg. You should only need it if + you modified \`acconfig.h' or \`${configure_ac}'. You might want + to install the \`Autoconf' and \`GNU m4' packages. Grab them + from any GNU archive site." + files=`sed -n 's/^[ ]*A[CM]_CONFIG_HEADER($[^)]*$).*/\1/p' ${configure_ac}` + test -z "$files" && files="config.h" + touch_files= + for f in $files; do + case "$f" in + *:*) touch_files="$touch_files "`echo "$f" | + sed -e 's/^[^:]*://' -e 's/:.*//'`;; + *) touch_files="$touch_files $f.in";; + esac + done + touch $touch_files + ;; + + automake*) + echo 1>&2 "\ +WARNING: \`$1' is $msg. You should only need it if + you modified \`Makefile.am', \`acinclude.m4' or \`${configure_ac}'. + You might want to install the \`Automake' and \`Perl' packages. + Grab them from any GNU archive site." + find . -type f -name Makefile.am -print | + sed 's/\.am$/.in/' | + while read f; do touch "$f"; done + ;; + + autom4te) + echo 1>&2 "\ +WARNING: \`$1' is needed, but is $msg. + You might have modified some files without having the + proper tools for further handling them. + You can get \`$1' as part of \`Autoconf' from any GNU + archive site." + + file=`echo "$*" | sed -n 's/.*--output[ =]*$[^ ]*$.*/\1/p'` + test -z "$file" && file=`echo "$*" | sed -n 's/.*-o[ ]*$[^ ]*$.*/\1/p'` + if test -f "$file"; then + touch $file + else + test -z "$file" || exec >$file + echo "#! /bin/sh" + echo "# Created by GNU Automake missing as a replacement of" + echo "# $ $@" + echo "exit 0" + chmod +x $file + exit 1 + fi + ;; + + bison|yacc) + echo 1>&2 "\ +WARNING: \`$1' $msg. You should only need it if + you modified a \`.y' file. You may need the \`Bison' package + in order for those modifications to take effect. You can get + \`Bison' from any GNU archive site." + rm -f y.tab.c y.tab.h + if [ $# -ne 1 ]; then + eval LASTARG="\${$#}" + case "$LASTARG" in + *.y) + SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'` + if [ -f "$SRCFILE" ]; then + cp "$SRCFILE" y.tab.c + fi + SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'` + if [ -f "$SRCFILE" ]; then + cp "$SRCFILE" y.tab.h + fi + ;; + esac + fi + if [ ! -f y.tab.h ]; then + echo >y.tab.h + fi + if [ ! -f y.tab.c ]; then + echo 'main() { return 0; }' >y.tab.c + fi + ;; + + lex|flex) + echo 1>&2 "\ +WARNING: \`$1' is $msg. You should only need it if + you modified a \`.l' file. You may need the \`Flex' package + in order for those modifications to take effect. You can get + \`Flex' from any GNU archive site." + rm -f lex.yy.c + if [ $# -ne 1 ]; then + eval LASTARG="\${$#}" + case "$LASTARG" in + *.l) + SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'` + if [ -f "$SRCFILE" ]; then + cp "$SRCFILE" lex.yy.c + fi + ;; + esac + fi + if [ ! -f lex.yy.c ]; then + echo 'main() { return 0; }' >lex.yy.c + fi + ;; + + help2man) + echo 1>&2 "\ +WARNING: \`$1' is $msg. You should only need it if + you modified a dependency of a manual page. You may need the + \`Help2man' package in order for those modifications to take + effect. You can get \`Help2man' from any GNU archive site." + + file=`echo "$*" | sed -n 's/.*-o $[^ ]*$.*/\1/p'` + if test -z "$file"; then + file=`echo "$*" | sed -n 's/.*--output=$[^ ]*$.*/\1/p'` + fi + if [ -f "$file" ]; then + touch $file + else + test -z "$file" || exec >$file + echo ".ab help2man is required to generate this page" + exit 1 + fi + ;; + + makeinfo) + echo 1>&2 "\ +WARNING: \`$1' is $msg. You should only need it if + you modified a \`.texi' or \`.texinfo' file, or any other file + indirectly affecting the aspect of the manual. The spurious + call might also be the consequence of using a buggy \`make' (AIX, + DU, IRIX). You might want to install the \`Texinfo' package or + the \`GNU make' package. Grab either from any GNU archive site." + file=`echo "$*" | sed -n 's/.*-o $[^ ]*$.*/\1/p'` + if test -z "$file"; then + file=`echo "$*" | sed 's/.* $[^ ]*$ *$/\1/'` + file=`sed -n '/^@setfilename/ { s/.* $[^ ]*$ *$/\1/; p; q; }' $file` + fi + touch $file + ;; + + tar) + shift + + # We have already tried tar in the generic part. + # Look for gnutar/gtar before invocation to avoid ugly error + # messages. + if (gnutar --version > /dev/null 2>&1); then + gnutar "$@" && exit 0 + fi + if (gtar --version > /dev/null 2>&1); then + gtar "$@" && exit 0 + fi + firstarg="$1" + if shift; then + case "$firstarg" in + *o*) + firstarg=`echo "$firstarg" | sed s/o//` + tar "$firstarg" "$@" && exit 0 + ;; + esac + case "$firstarg" in + *h*) + firstarg=`echo "$firstarg" | sed s/h//` + tar "$firstarg" "$@" && exit 0 + ;; + esac + fi + + echo 1>&2 "\ +WARNING: I can't seem to be able to run \`tar' with the given arguments. + You may want to install GNU tar or Free paxutils, or check the + command line arguments." + exit 1 + ;; + + *) + echo 1>&2 "\ +WARNING: \`$1' is needed, and is $msg. + You might have modified some files without having the + proper tools for further handling them. Check the \`README' file, + it often tells you about the needed prerequisites for installing + this package. You may also peek at any GNU archive site, in case + some other package would contain this missing \`$1' program." + exit 1 + ;; +esac + +exit 0 + +# Local variables: +# eval: (add-hook 'write-file-hooks 'time-stamp) +# time-stamp-start: "scriptversion=" +# time-stamp-format: "%:y-%02m-%02d.%02H" +# time-stamp-end: "$" +# End:

1 0

[commit] r4555 - in freeswitch/trunk/libs/codec/lpc10: . build
by Freeswitch SVN 11 Mar '07

11 Mar '07

Author: mikej Date: Sun Mar 11 11:23:07 2007 New Revision: 4555 Removed: freeswitch/trunk/libs/codec/lpc10/build/compile freeswitch/trunk/libs/codec/lpc10/build/depcomp freeswitch/trunk/libs/codec/lpc10/build/install-sh freeswitch/trunk/libs/codec/lpc10/build/missing freeswitch/trunk/libs/codec/lpc10/compile freeswitch/trunk/libs/codec/lpc10/install-sh freeswitch/trunk/libs/codec/lpc10/ltmain.sh Modified: freeswitch/trunk/libs/codec/lpc10/Makefile.in freeswitch/trunk/libs/codec/lpc10/build/config.guess freeswitch/trunk/libs/codec/lpc10/build/config.sub Log: update the in tree generated files for lpc10 1/2 Modified: freeswitch/trunk/libs/codec/lpc10/Makefile.in ============================================================================== --- freeswitch/trunk/libs/codec/lpc10/Makefile.in (original) +++ freeswitch/trunk/libs/codec/lpc10/Makefile.in Sun Mar 11 11:23:07 2007 @@ -43,8 +43,7 @@ $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ $(top_srcdir)/configure AUTHORS COPYING ChangeLog INSTALL NEWS \ build/compile build/config.guess build/config.sub \ - build/depcomp build/install-sh build/ltmain.sh build/missing \ - compile install-sh ltmain.sh + build/depcomp build/install-sh build/ltmain.sh build/missing subdir = . ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/configure.ac Modified: freeswitch/trunk/libs/codec/lpc10/build/config.guess ============================================================================== --- freeswitch/trunk/libs/codec/lpc10/build/config.guess (original) +++ freeswitch/trunk/libs/codec/lpc10/build/config.guess Sun Mar 11 11:23:07 2007 @@ -1,9 +1,9 @@ #! /bin/sh # Attempt to guess a canonical system name. # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, -# 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. +# 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc. -timestamp='2005-12-13' +timestamp='2004-09-07' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by @@ -17,15 +17,13 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA -# 02110-1301, USA. +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. # # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a # configuration script generated by Autoconf, you may include it under # the same distribution terms that you use for the rest of that program. - # Originally written by Per Bothner <per(a)bothner.com>. # Please send patches to <config-patches(a)gnu.org>. Submit a context # diff and a properly formatted ChangeLog entry. @@ -55,7 +53,7 @@ GNU config.guess ($timestamp) Originally written by Per Bothner. -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 +Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO @@ -68,11 +66,11 @@ while test $# -gt 0 ; do case $1 in --time-stamp | --time* | -t ) - echo "$timestamp" ; exit ;; + echo "$timestamp" ; exit 0 ;; --version | -v ) - echo "$version" ; exit ;; + echo "$version" ; exit 0 ;; --help | --h* | -h ) - echo "$usage"; exit ;; + echo "$usage"; exit 0 ;; -- ) # Stop option processing shift; break ;; - ) # Use stdin as input. @@ -125,7 +123,7 @@ ;; ,,*) CC_FOR_BUILD=$CC ;; ,*,*) CC_FOR_BUILD=$HOST_CC ;; -esac ; set_cc_for_build= ;' +esac ;' # This is needed to find uname on a Pyramid OSx when run in the BSD universe. # (ghazi(a)noc.rutgers.edu 1994-08-24) @@ -198,20 +196,55 @@ # contains redundant information, the shorter form: # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used. echo "${machine}-${os}${release}" - exit ;; + exit 0 ;; + amd64:OpenBSD:*:*) + echo x86_64-unknown-openbsd${UNAME_RELEASE} + exit 0 ;; + amiga:OpenBSD:*:*) + echo m68k-unknown-openbsd${UNAME_RELEASE} + exit 0 ;; + cats:OpenBSD:*:*) + echo arm-unknown-openbsd${UNAME_RELEASE} + exit 0 ;; + hp300:OpenBSD:*:*) + echo m68k-unknown-openbsd${UNAME_RELEASE} + exit 0 ;; + luna88k:OpenBSD:*:*) + echo m88k-unknown-openbsd${UNAME_RELEASE} + exit 0 ;; + mac68k:OpenBSD:*:*) + echo m68k-unknown-openbsd${UNAME_RELEASE} + exit 0 ;; + macppc:OpenBSD:*:*) + echo powerpc-unknown-openbsd${UNAME_RELEASE} + exit 0 ;; + mvme68k:OpenBSD:*:*) + echo m68k-unknown-openbsd${UNAME_RELEASE} + exit 0 ;; + mvme88k:OpenBSD:*:*) + echo m88k-unknown-openbsd${UNAME_RELEASE} + exit 0 ;; + mvmeppc:OpenBSD:*:*) + echo powerpc-unknown-openbsd${UNAME_RELEASE} + exit 0 ;; + sgi:OpenBSD:*:*) + echo mips64-unknown-openbsd${UNAME_RELEASE} + exit 0 ;; + sun3:OpenBSD:*:*) + echo m68k-unknown-openbsd${UNAME_RELEASE} + exit 0 ;; *:OpenBSD:*:*) - UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'` - echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE} - exit ;; + echo ${UNAME_MACHINE}-unknown-openbsd${UNAME_RELEASE} + exit 0 ;; *:ekkoBSD:*:*) echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE} - exit ;; + exit 0 ;; macppc:MirBSD:*:*) echo powerppc-unknown-mirbsd${UNAME_RELEASE} - exit ;; + exit 0 ;; *:MirBSD:*:*) echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE} - exit ;; + exit 0 ;; alpha:OSF1:*:*) case $UNAME_RELEASE in *4.0) @@ -264,43 +297,37 @@ # A Xn.n version is an unreleased experimental baselevel. # 1.2 uses "1.2" for uname -r. echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` - exit ;; + exit 0 ;; Alpha\ *:Windows_NT*:*) # How do we know it's Interix rather than the generic POSIX subsystem? # Should we change UNAME_MACHINE based on the output of uname instead # of the specific Alpha model? echo alpha-pc-interix - exit ;; + exit 0 ;; 21064:Windows_NT:50:3) echo alpha-dec-winnt3.5 - exit ;; + exit 0 ;; Amiga*:UNIX_System_V:4.0:*) echo m68k-unknown-sysv4 - exit ;; + exit 0;; *:[Aa]miga[Oo][Ss]:*:*) echo ${UNAME_MACHINE}-unknown-amigaos - exit ;; + exit 0 ;; *:[Mm]orph[Oo][Ss]:*:*) echo ${UNAME_MACHINE}-unknown-morphos - exit ;; + exit 0 ;; *:OS/390:*:*) echo i370-ibm-openedition - exit ;; - *:z/VM:*:*) - echo s390-ibm-zvmoe - exit ;; + exit 0 ;; *:OS400:*:*) echo powerpc-ibm-os400 - exit ;; + exit 0 ;; arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*) echo arm-acorn-riscix${UNAME_RELEASE} - exit ;; - arm:riscos:*:*|arm:RISCOS:*:*) - echo arm-unknown-riscos - exit ;; + exit 0;; SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*) echo hppa1.1-hitachi-hiuxmpp - exit ;; + exit 0;; Pyramid*:OSx*:*:* | MIS*:OSx*:*:* | MIS*:SMP_DC-OSx*:*:*) # akee(a)wpdis03.wpafb.af.mil (Earle F. Ake) contributed MIS and NILE. if test "`(/bin/universe) 2>/dev/null`" = att ; then @@ -308,32 +335,32 @@ else echo pyramid-pyramid-bsd fi - exit ;; + exit 0 ;; NILE*:*:*:dcosx) echo pyramid-pyramid-svr4 - exit ;; + exit 0 ;; DRS?6000:unix:4.0:6*) echo sparc-icl-nx6 - exit ;; - DRS?6000:UNIX_SV:4.2*:7* | DRS?6000:isis:4.2*:7*) + exit 0 ;; + DRS?6000:UNIX_SV:4.2*:7*) case `/usr/bin/uname -p` in - sparc) echo sparc-icl-nx7; exit ;; + sparc) echo sparc-icl-nx7 && exit 0 ;; esac ;; sun4H:SunOS:5.*:*) echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` - exit ;; + exit 0 ;; sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*) echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` - exit ;; + exit 0 ;; i86pc:SunOS:5.*:*) echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` - exit ;; + exit 0 ;; sun4*:SunOS:6*:*) # According to config.sub, this is the proper way to canonicalize # SunOS6. Hard to guess exactly what SunOS6 will be like, but # it's likely to be more like Solaris than SunOS4. echo sparc-sun-solaris3`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` - exit ;; + exit 0 ;; sun4*:SunOS:*:*) case "`/usr/bin/arch -k`" in Series*|S4*) @@ -342,10 +369,10 @@ esac # Japanese Language versions have a version number like `4.1.3-JL'. echo sparc-sun-sunos`echo ${UNAME_RELEASE}|sed -e 's/-/_/'` - exit ;; + exit 0 ;; sun3*:SunOS:*:*) echo m68k-sun-sunos${UNAME_RELEASE} - exit ;; + exit 0 ;; sun*:*:4.2BSD:*) UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null` test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3 @@ -357,10 +384,10 @@ echo sparc-sun-sunos${UNAME_RELEASE} ;; esac - exit ;; + exit 0 ;; aushp:SunOS:*:*) echo sparc-auspex-sunos${UNAME_RELEASE} - exit ;; + exit 0 ;; # The situation for MiNT is a little confusing. The machine name # can be virtually everything (everything which is not # "atarist" or "atariste" at least should have a processor @@ -371,40 +398,40 @@ # be no problem. atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*) echo m68k-atari-mint${UNAME_RELEASE} - exit ;; + exit 0 ;; atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*) echo m68k-atari-mint${UNAME_RELEASE} - exit ;; + exit 0 ;; *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*) echo m68k-atari-mint${UNAME_RELEASE} - exit ;; + exit 0 ;; milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*) echo m68k-milan-mint${UNAME_RELEASE} - exit ;; + exit 0 ;; hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*) echo m68k-hades-mint${UNAME_RELEASE} - exit ;; + exit 0 ;; *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*) echo m68k-unknown-mint${UNAME_RELEASE} - exit ;; + exit 0 ;; m68k:machten:*:*) echo m68k-apple-machten${UNAME_RELEASE} - exit ;; + exit 0 ;; powerpc:machten:*:*) echo powerpc-apple-machten${UNAME_RELEASE} - exit ;; + exit 0 ;; RISC*:Mach:*:*) echo mips-dec-mach_bsd4.3 - exit ;; + exit 0 ;; RISC*:ULTRIX:*:*) echo mips-dec-ultrix${UNAME_RELEASE} - exit ;; + exit 0 ;; VAX*:ULTRIX*:*:*) echo vax-dec-ultrix${UNAME_RELEASE} - exit ;; + exit 0 ;; 2020:CLIX:*:* | 2430:CLIX:*:*) echo clipper-intergraph-clix${UNAME_RELEASE} - exit ;; + exit 0 ;; mips:*:*:UMIPS | mips:*:*:RISCos) eval $set_cc_for_build sed 's/^ //' << EOF >$dummy.c @@ -428,33 +455,32 @@ exit (-1); } EOF - $CC_FOR_BUILD -o $dummy $dummy.c && - dummyarg=`echo "${UNAME_RELEASE}" | sed -n 's/$[0-9]*$.*/\1/p'` && - SYSTEM_NAME=`$dummy $dummyarg` && - { echo "$SYSTEM_NAME"; exit; } + $CC_FOR_BUILD -o $dummy $dummy.c \ + && $dummy `echo "${UNAME_RELEASE}" | sed -n 's/$[0-9]*$.*/\1/p'` \ + && exit 0 echo mips-mips-riscos${UNAME_RELEASE} - exit ;; + exit 0 ;; Motorola:PowerMAX_OS:*:*) echo powerpc-motorola-powermax - exit ;; + exit 0 ;; Motorola:*:4.3:PL8-*) echo powerpc-harris-powermax - exit ;; + exit 0 ;; Night_Hawk:*:*:PowerMAX_OS | Synergy:PowerMAX_OS:*:*) echo powerpc-harris-powermax - exit ;; + exit 0 ;; Night_Hawk:Power_UNIX:*:*) echo powerpc-harris-powerunix - exit ;; + exit 0 ;; m88k:CX/UX:7*:*) echo m88k-harris-cxux7 - exit ;; + exit 0 ;; m88k:*:4*:R4*) echo m88k-motorola-sysv4 - exit ;; + exit 0 ;; m88k:*:3*:R3*) echo m88k-motorola-sysv3 - exit ;; + exit 0 ;; AViiON:dgux:*:*) # DG/UX returns AViiON for all architectures UNAME_PROCESSOR=`/usr/bin/uname -p` @@ -470,29 +496,29 @@ else echo i586-dg-dgux${UNAME_RELEASE} fi - exit ;; + exit 0 ;; M88*:DolphinOS:*:*) # DolphinOS (SVR3) echo m88k-dolphin-sysv3 - exit ;; + exit 0 ;; M88*:*:R3*:*) # Delta 88k system running SVR3 echo m88k-motorola-sysv3 - exit ;; + exit 0 ;; XD88*:*:*:*) # Tektronix XD88 system running UTekV (SVR3) echo m88k-tektronix-sysv3 - exit ;; + exit 0 ;; Tek43[0-9][0-9]:UTek:*:*) # Tektronix 4300 system running UTek (BSD) echo m68k-tektronix-bsd - exit ;; + exit 0 ;; *:IRIX*:*:*) echo mips-sgi-irix`echo ${UNAME_RELEASE}|sed -e 's/-/_/g'` - exit ;; + exit 0 ;; ????????:AIX?:[12].1:2) # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX. - echo romp-ibm-aix # uname -m gives an 8 hex-code CPU id - exit ;; # Note that: echo "'`uname -s`'" gives 'AIX ' + echo romp-ibm-aix # uname -m gives an 8 hex-code CPU id + exit 0 ;; # Note that: echo "'`uname -s`'" gives 'AIX ' i*86:AIX:*:*) echo i386-ibm-aix - exit ;; + exit 0 ;; ia64:AIX:*:*) if [ -x /usr/bin/oslevel ] ; then IBM_REV=`/usr/bin/oslevel` @@ -500,7 +526,7 @@ IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE} fi echo ${UNAME_MACHINE}-ibm-aix${IBM_REV} - exit ;; + exit 0 ;; *:AIX:2:3) if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then eval $set_cc_for_build @@ -515,18 +541,14 @@ exit(0); } EOF - if $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy` - then - echo "$SYSTEM_NAME" - else - echo rs6000-ibm-aix3.2.5 - fi + $CC_FOR_BUILD -o $dummy $dummy.c && $dummy && exit 0 + echo rs6000-ibm-aix3.2.5 elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then echo rs6000-ibm-aix3.2.4 else echo rs6000-ibm-aix3.2 fi - exit ;; + exit 0 ;; *:AIX:*:[45]) IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'` if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then @@ -540,28 +562,28 @@ IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE} fi echo ${IBM_ARCH}-ibm-aix${IBM_REV} - exit ;; + exit 0 ;; *:AIX:*:*) echo rs6000-ibm-aix - exit ;; + exit 0 ;; ibmrt:4.4BSD:*|romp-ibm:BSD:*) echo romp-ibm-bsd4.4 - exit ;; + exit 0 ;; ibmrt:*BSD:*|romp-ibm:BSD:*) # covers RT/PC BSD and echo romp-ibm-bsd${UNAME_RELEASE} # 4.3 with uname added to - exit ;; # report: romp-ibm BSD 4.3 + exit 0 ;; # report: romp-ibm BSD 4.3 *:BOSX:*:*) echo rs6000-bull-bosx - exit ;; + exit 0 ;; DPX/2?00:B.O.S.:*:*) echo m68k-bull-sysv3 - exit ;; + exit 0 ;; 9000/[34]??:4.3bsd:1.*:*) echo m68k-hp-bsd - exit ;; + exit 0 ;; hp300:4.4BSD:*:* | 9000/[34]??:4.3bsd:2.*:*) echo m68k-hp-bsd4.4 - exit ;; + exit 0 ;; 9000/[34678]??:HP-UX:*:*) HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'` case "${UNAME_MACHINE}" in @@ -623,19 +645,9 @@ esac if [ ${HP_ARCH} = "hppa2.0w" ] then - eval $set_cc_for_build - - # hppa2.0w-hp-hpux* has a 64-bit kernel and a compiler generating - # 32-bit code. hppa64-hp-hpux* has the same kernel and a compiler - # generating 64-bit code. GNU and HP use different nomenclature: - # - # $ CC_FOR_BUILD=cc ./config.guess - # => hppa2.0w-hp-hpux11.23 - # $ CC_FOR_BUILD="cc +DA2.0w" ./config.guess - # => hppa64-hp-hpux11.23 - - if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | - grep __LP64__ >/dev/null + # avoid double evaluation of $set_cc_for_build + test -n "$CC_FOR_BUILD" || eval $set_cc_for_build + if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E -) | grep __LP64__ >/dev/null then HP_ARCH="hppa2.0w" else @@ -643,11 +655,11 @@ fi fi echo ${HP_ARCH}-hp-hpux${HPUX_REV} - exit ;; + exit 0 ;; ia64:HP-UX:*:*) HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'` echo ia64-hp-hpux${HPUX_REV} - exit ;; + exit 0 ;; 3050*:HI-UX:*:*) eval $set_cc_for_build sed 's/^ //' << EOF >$dummy.c @@ -675,166 +687,158 @@ exit (0); } EOF - $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy` && - { echo "$SYSTEM_NAME"; exit; } + $CC_FOR_BUILD -o $dummy $dummy.c && $dummy && exit 0 echo unknown-hitachi-hiuxwe2 - exit ;; + exit 0 ;; 9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* ) echo hppa1.1-hp-bsd - exit ;; + exit 0 ;; 9000/8??:4.3bsd:*:*) echo hppa1.0-hp-bsd - exit ;; + exit 0 ;; *9??*:MPE/iX:*:* | *3000*:MPE/iX:*:*) echo hppa1.0-hp-mpeix - exit ;; + exit 0 ;; hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* ) echo hppa1.1-hp-osf - exit ;; + exit 0 ;; hp8??:OSF1:*:*) echo hppa1.0-hp-osf - exit ;; + exit 0 ;; i*86:OSF1:*:*) if [ -x /usr/sbin/sysversion ] ; then echo ${UNAME_MACHINE}-unknown-osf1mk else echo ${UNAME_MACHINE}-unknown-osf1 fi - exit ;; + exit 0 ;; parisc*:Lites*:*:*) echo hppa1.1-hp-lites - exit ;; + exit 0 ;; C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*) echo c1-convex-bsd - exit ;; + exit 0 ;; C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*) if getsysinfo -f scalar_acc then echo c32-convex-bsd else echo c2-convex-bsd fi - exit ;; + exit 0 ;; C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*) echo c34-convex-bsd - exit ;; + exit 0 ;; C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*) echo c38-convex-bsd - exit ;; + exit 0 ;; C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*) echo c4-convex-bsd - exit ;; + exit 0 ;; CRAY*Y-MP:*:*:*) echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' - exit ;; + exit 0 ;; CRAY*[A-Z]90:*:*:*) echo ${UNAME_MACHINE}-cray-unicos${UNAME_RELEASE} \ | sed -e 's/CRAY.*$[A-Z]90$/\1/' \ -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ \ -e 's/\.[^.]*$/.X/' - exit ;; + exit 0 ;; CRAY*TS:*:*:*) echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' - exit ;; + exit 0 ;; CRAY*T3E:*:*:*) echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' - exit ;; + exit 0 ;; CRAY*SV1:*:*:*) echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' - exit ;; + exit 0 ;; *:UNICOS/mp:*:*) echo craynv-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' - exit ;; + exit 0 ;; F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*) FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'` echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" - exit ;; + exit 0 ;; 5000:UNIX_System_V:4.*:*) FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'` echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" - exit ;; + exit 0 ;; i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*) echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE} - exit ;; + exit 0 ;; sparc*:BSD/OS:*:*) echo sparc-unknown-bsdi${UNAME_RELEASE} - exit ;; + exit 0 ;; *:BSD/OS:*:*) echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE} - exit ;; + exit 0 ;; *:FreeBSD:*:*) echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` - exit ;; + exit 0 ;; i*:CYGWIN*:*) echo ${UNAME_MACHINE}-pc-cygwin - exit ;; + exit 0 ;; i*:MINGW*:*) echo ${UNAME_MACHINE}-pc-mingw32 - exit ;; - i*:windows32*:*) - # uname -m includes "-pc" on this system. - echo ${UNAME_MACHINE}-mingw32 - exit ;; + exit 0 ;; i*:PW*:*) echo ${UNAME_MACHINE}-pc-pw32 - exit ;; - x86:Interix*:[345]*) + exit 0 ;; + x86:Interix*:[34]*) echo i586-pc-interix${UNAME_RELEASE}|sed -e 's/\..*//' - exit ;; + exit 0 ;; [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*) echo i${UNAME_MACHINE}-pc-mks - exit ;; + exit 0 ;; i*:Windows_NT*:* | Pentium*:Windows_NT*:*) # How do we know it's Interix rather than the generic POSIX subsystem? # It also conflicts with pre-2.0 versions of AT&T UWIN. Should we # UNAME_MACHINE based on the output of uname instead of i386? echo i586-pc-interix - exit ;; + exit 0 ;; i*:UWIN*:*) echo ${UNAME_MACHINE}-pc-uwin - exit ;; - amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*) - echo x86_64-unknown-cygwin - exit ;; + exit 0 ;; p*:CYGWIN*:*) echo powerpcle-unknown-cygwin - exit ;; + exit 0 ;; prep*:SunOS:5.*:*) echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` - exit ;; + exit 0 ;; *:GNU:*:*) # the GNU system echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'` - exit ;; + exit 0 ;; *:GNU/*:*:*) # other systems with GNU libc and userland echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu - exit ;; + exit 0 ;; i*86:Minix:*:*) echo ${UNAME_MACHINE}-pc-minix - exit ;; + exit 0 ;; arm*:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-gnu - exit ;; + exit 0 ;; cris:Linux:*:*) echo cris-axis-linux-gnu - exit ;; + exit 0 ;; crisv32:Linux:*:*) echo crisv32-axis-linux-gnu - exit ;; + exit 0 ;; frv:Linux:*:*) echo frv-unknown-linux-gnu - exit ;; + exit 0 ;; ia64:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-gnu - exit ;; + exit 0 ;; m32r*:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-gnu - exit ;; + exit 0 ;; m68*:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-gnu - exit ;; + exit 0 ;; mips:Linux:*:*) eval $set_cc_for_build sed 's/^ //' << EOF >$dummy.c @@ -851,8 +855,8 @@ #endif #endif EOF - eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '/^CPU/{s: ::g;p;}'`" - test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; } + eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=` + test x"${CPU}" != x && echo "${CPU}-unknown-linux-gnu" && exit 0 ;; mips64:Linux:*:*) eval $set_cc_for_build @@ -870,18 +874,15 @@ #endif #endif EOF - eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '/^CPU/{s: ::g;p;}'`" - test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; } + eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=` + test x"${CPU}" != x && echo "${CPU}-unknown-linux-gnu" && exit 0 ;; - or32:Linux:*:*) - echo or32-unknown-linux-gnu - exit ;; ppc:Linux:*:*) echo powerpc-unknown-linux-gnu - exit ;; + exit 0 ;; ppc64:Linux:*:*) echo powerpc64-unknown-linux-gnu - exit ;; + exit 0 ;; alpha:Linux:*:*) case `sed -n '/^cpu model/s/^.*: $.*$/\1/p' < /proc/cpuinfo` in EV5) UNAME_MACHINE=alphaev5 ;; @@ -895,7 +896,7 @@ objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC} - exit ;; + exit 0 ;; parisc:Linux:*:* | hppa:Linux:*:*) # Look for CPU level case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in @@ -903,28 +904,25 @@ PA8*) echo hppa2.0-unknown-linux-gnu ;; *) echo hppa-unknown-linux-gnu ;; esac - exit ;; + exit 0 ;; parisc64:Linux:*:* | hppa64:Linux:*:*) echo hppa64-unknown-linux-gnu - exit ;; + exit 0 ;; s390:Linux:*:* | s390x:Linux:*:*) echo ${UNAME_MACHINE}-ibm-linux - exit ;; + exit 0 ;; sh64*:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-gnu - exit ;; + exit 0 ;; sh*:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-gnu - exit ;; + exit 0 ;; sparc:Linux:*:* | sparc64:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-gnu - exit ;; - vax:Linux:*:*) - echo ${UNAME_MACHINE}-dec-linux-gnu - exit ;; + exit 0 ;; x86_64:Linux:*:*) echo x86_64-unknown-linux-gnu - exit ;; + exit 0 ;; i*86:Linux:*:*) # The BFD linker knows what the default object file format is, so # first see if it will tell us. cd to the root directory to prevent @@ -942,15 +940,15 @@ ;; a.out-i386-linux) echo "${UNAME_MACHINE}-pc-linux-gnuaout" - exit ;; + exit 0 ;; coff-i386) echo "${UNAME_MACHINE}-pc-linux-gnucoff" - exit ;; + exit 0 ;; "") # Either a pre-BFD a.out linker (linux-gnuoldld) or # one that does not give us useful --help. echo "${UNAME_MACHINE}-pc-linux-gnuoldld" - exit ;; + exit 0 ;; esac # Determine whether the default compiler is a.out or elf eval $set_cc_for_build @@ -967,7 +965,7 @@ LIBC=gnulibc1 # endif #else - #if defined(__INTEL_COMPILER) || defined(__PGI) + #ifdef __INTEL_COMPILER LIBC=gnu #else LIBC=gnuaout @@ -977,19 +975,16 @@ LIBC=dietlibc #endif EOF - eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '/^LIBC/{s: ::g;p;}'`" - test x"${LIBC}" != x && { - echo "${UNAME_MACHINE}-pc-linux-${LIBC}" - exit - } - test x"${TENTATIVE}" != x && { echo "${TENTATIVE}"; exit; } + eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=` + test x"${LIBC}" != x && echo "${UNAME_MACHINE}-pc-linux-${LIBC}" && exit 0 + test x"${TENTATIVE}" != x && echo "${TENTATIVE}" && exit 0 ;; i*86:DYNIX/ptx:4*:*) # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there. # earlier versions are messed up and put the nodename in both # sysname and nodename. echo i386-sequent-sysv4 - exit ;; + exit 0 ;; i*86:UNIX_SV:4.2MP:2.*) # Unixware is an offshoot of SVR4, but it has its own version # number series starting with 2... @@ -997,27 +992,27 @@ # I just have to hope. -- rms. # Use sysv4.2uw... so that sysv4* matches it. echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION} - exit ;; + exit 0 ;; i*86:OS/2:*:*) # If we were able to find `uname', then EMX Unix compatibility # is probably installed. echo ${UNAME_MACHINE}-pc-os2-emx - exit ;; + exit 0 ;; i*86:XTS-300:*:STOP) echo ${UNAME_MACHINE}-unknown-stop - exit ;; + exit 0 ;; i*86:atheos:*:*) echo ${UNAME_MACHINE}-unknown-atheos - exit ;; - i*86:syllable:*:*) + exit 0 ;; + i*86:syllable:*:*) echo ${UNAME_MACHINE}-pc-syllable - exit ;; + exit 0 ;; i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*) echo i386-unknown-lynxos${UNAME_RELEASE} - exit ;; + exit 0 ;; i*86:*DOS:*:*) echo ${UNAME_MACHINE}-pc-msdosdjgpp - exit ;; + exit 0 ;; i*86:*:4.*:* | i*86:SYSTEM_V:4.*:*) UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'` if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then @@ -1025,16 +1020,15 @@ else echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL} fi - exit ;; - i*86:*:5:[678]*) - # UnixWare 7.x, OpenUNIX and OpenServer 6. + exit 0 ;; + i*86:*:5:[78]*) case `/bin/uname -X | grep "^Machine"` in *486*) UNAME_MACHINE=i486 ;; *Pentium) UNAME_MACHINE=i586 ;; *Pent*|*Celeron) UNAME_MACHINE=i686 ;; esac echo ${UNAME_MACHINE}-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION} - exit ;; + exit 0 ;; i*86:*:3.2:*) if test -f /usr/options/cb.name; then UNAME_REL=`sed -n 's/.*Version //p' </usr/options/cb.name` @@ -1052,73 +1046,73 @@ else echo ${UNAME_MACHINE}-pc-sysv32 fi - exit ;; + exit 0 ;; pc:*:*:*) # Left here for compatibility: # uname -m prints for DJGPP always 'pc', but it prints nothing about # the processor, so we play safe by assuming i386. echo i386-pc-msdosdjgpp - exit ;; + exit 0 ;; Intel:Mach:3*:*) echo i386-pc-mach3 - exit ;; + exit 0 ;; paragon:*:*:*) echo i860-intel-osf1 - exit ;; + exit 0 ;; i860:*:4.*:*) # i860-SVR4 if grep Stardent /usr/include/sys/uadmin.h >/dev/null 2>&1 ; then echo i860-stardent-sysv${UNAME_RELEASE} # Stardent Vistra i860-SVR4 else # Add other i860-SVR4 vendors below as they are discovered. echo i860-unknown-sysv${UNAME_RELEASE} # Unknown i860-SVR4 fi - exit ;; + exit 0 ;; mini*:CTIX:SYS*5:*) # "miniframe" echo m68010-convergent-sysv - exit ;; + exit 0 ;; mc68k:UNIX:SYSTEM5:3.51m) echo m68k-convergent-sysv - exit ;; + exit 0 ;; M680?0:D-NIX:5.3:*) echo m68k-diab-dnix - exit ;; + exit 0 ;; M68*:*:R3V[5678]*:*) - test -r /sysV68 && { echo 'm68k-motorola-sysv'; exit; } ;; + test -r /sysV68 && echo 'm68k-motorola-sysv' && exit 0 ;; 3[345]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0 | S7501*:*:4.0:3.0) OS_REL='' test -r /etc/.relid \ && OS_REL=.`sed -n 's/[^ ]* [^ ]* $[0-9][0-9]$.*/\1/p' < /etc/.relid` /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ - && { echo i486-ncr-sysv4.3${OS_REL}; exit; } + && echo i486-ncr-sysv4.3${OS_REL} && exit 0 /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \ - && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;; + && echo i586-ncr-sysv4.3${OS_REL} && exit 0 ;; 3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*) /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ - && { echo i486-ncr-sysv4; exit; } ;; + && echo i486-ncr-sysv4 && exit 0 ;; m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*) echo m68k-unknown-lynxos${UNAME_RELEASE} - exit ;; + exit 0 ;; mc68030:UNIX_System_V:4.*:*) echo m68k-atari-sysv4 - exit ;; + exit 0 ;; TSUNAMI:LynxOS:2.*:*) echo sparc-unknown-lynxos${UNAME_RELEASE} - exit ;; + exit 0 ;; rs6000:LynxOS:2.*:*) echo rs6000-unknown-lynxos${UNAME_RELEASE} - exit ;; + exit 0 ;; PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.0*:*) echo powerpc-unknown-lynxos${UNAME_RELEASE} - exit ;; + exit 0 ;; SM[BE]S:UNIX_SV:*:*) echo mips-dde-sysv${UNAME_RELEASE} - exit ;; + exit 0 ;; RM*:ReliantUNIX-*:*:*) echo mips-sni-sysv4 - exit ;; + exit 0 ;; RM*:SINIX-*:*:*) echo mips-sni-sysv4 - exit ;; + exit 0 ;; *:SINIX-*:*:*) if uname -p 2>/dev/null >/dev/null ; then UNAME_MACHINE=`(uname -p) 2>/dev/null` @@ -1126,72 +1120,69 @@ else echo ns32k-sni-sysv fi - exit ;; + exit 0 ;; PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort # says <Richard.M.Bartel(a)ccMail.Census.GOV> echo i586-unisys-sysv4 - exit ;; + exit 0 ;; *:UNIX_System_V:4*:FTX*) # From Gerald Hewes <hewes(a)openmarket.com>. # How about differentiating between stratus architectures? -djm echo hppa1.1-stratus-sysv4 - exit ;; + exit 0 ;; *:*:*:FTX*) # From seanf(a)swdc.stratus.com. echo i860-stratus-sysv4 - exit ;; - i*86:VOS:*:*) - # From Paul.Green(a)stratus.com. - echo ${UNAME_MACHINE}-stratus-vos - exit ;; + exit 0 ;; *:VOS:*:*) # From Paul.Green(a)stratus.com. echo hppa1.1-stratus-vos - exit ;; + exit 0 ;; mc68*:A/UX:*:*) echo m68k-apple-aux${UNAME_RELEASE} - exit ;; + exit 0 ;; news*:NEWS-OS:6*:*) echo mips-sony-newsos6 - exit ;; + exit 0 ;; R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*) if [ -d /usr/nec ]; then echo mips-nec-sysv${UNAME_RELEASE} else echo mips-unknown-sysv${UNAME_RELEASE} fi - exit ;; + exit 0 ;; BeBox:BeOS:*:*) # BeOS running on hardware made by Be, PPC only. echo powerpc-be-beos - exit ;; + exit 0 ;; BeMac:BeOS:*:*) # BeOS running on Mac or Mac clone, PPC only. echo powerpc-apple-beos - exit ;; + exit 0 ;; BePC:BeOS:*:*) # BeOS running on Intel PC compatible. echo i586-pc-beos - exit ;; + exit 0 ;; SX-4:SUPER-UX:*:*) echo sx4-nec-superux${UNAME_RELEASE} - exit ;; + exit 0 ;; SX-5:SUPER-UX:*:*) echo sx5-nec-superux${UNAME_RELEASE} - exit ;; + exit 0 ;; SX-6:SUPER-UX:*:*) echo sx6-nec-superux${UNAME_RELEASE} - exit ;; + exit 0 ;; Power*:Rhapsody:*:*) echo powerpc-apple-rhapsody${UNAME_RELEASE} - exit ;; + exit 0 ;; *:Rhapsody:*:*) echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE} - exit ;; + exit 0 ;; *:Darwin:*:*) UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown case $UNAME_PROCESSOR in + *86) UNAME_PROCESSOR=i686 ;; unknown) UNAME_PROCESSOR=powerpc ;; esac echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE} - exit ;; + exit 0 ;; *:procnto*:*:* | *:QNX:[0123456789]*:*) UNAME_PROCESSOR=`uname -p` if test "$UNAME_PROCESSOR" = "x86"; then @@ -1199,25 +1190,22 @@ UNAME_MACHINE=pc fi echo ${UNAME_PROCESSOR}-${UNAME_MACHINE}-nto-qnx${UNAME_RELEASE} - exit ;; + exit 0 ;; *:QNX:*:4*) echo i386-pc-qnx - exit ;; - NSE-?:NONSTOP_KERNEL:*:*) - echo nse-tandem-nsk${UNAME_RELEASE} - exit ;; + exit 0 ;; NSR-?:NONSTOP_KERNEL:*:*) echo nsr-tandem-nsk${UNAME_RELEASE} - exit ;; + exit 0 ;; *:NonStop-UX:*:*) echo mips-compaq-nonstopux - exit ;; + exit 0 ;; BS2000:POSIX*:*:*) echo bs2000-siemens-sysv - exit ;; + exit 0 ;; DS/*:UNIX_System_V:*:*) echo ${UNAME_MACHINE}-${UNAME_SYSTEM}-${UNAME_RELEASE} - exit ;; + exit 0 ;; *:Plan9:*:*) # "uname -m" is not consistent, so use $cputype instead. 386 # is converted to i386 for consistency with other x86 @@ -1228,47 +1216,38 @@ UNAME_MACHINE="$cputype" fi echo ${UNAME_MACHINE}-unknown-plan9 - exit ;; + exit 0 ;; *:TOPS-10:*:*) echo pdp10-unknown-tops10 - exit ;; + exit 0 ;; *:TENEX:*:*) echo pdp10-unknown-tenex - exit ;; + exit 0 ;; KS10:TOPS-20:*:* | KL10:TOPS-20:*:* | TYPE4:TOPS-20:*:*) echo pdp10-dec-tops20 - exit ;; + exit 0 ;; XKL-1:TOPS-20:*:* | TYPE5:TOPS-20:*:*) echo pdp10-xkl-tops20 - exit ;; + exit 0 ;; *:TOPS-20:*:*) echo pdp10-unknown-tops20 - exit ;; + exit 0 ;; *:ITS:*:*) echo pdp10-unknown-its - exit ;; + exit 0 ;; SEI:*:*:SEIUX) echo mips-sei-seiux${UNAME_RELEASE} - exit ;; + exit 0 ;; *:DragonFly:*:*) echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` - exit ;; + exit 0 ;; *:*VMS:*:*) UNAME_MACHINE=`(uname -p) 2>/dev/null` case "${UNAME_MACHINE}" in - A*) echo alpha-dec-vms ; exit ;; - I*) echo ia64-dec-vms ; exit ;; - V*) echo vax-dec-vms ; exit ;; - esac ;; - *:XENIX:*:SysV) - echo i386-pc-xenix - exit ;; - i*86:skyos:*:*) - echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE}` | sed -e 's/ .*$//' - exit ;; - i*86:rdos:*:*) - echo ${UNAME_MACHINE}-pc-rdos - exit ;; + A*) echo alpha-dec-vms && exit 0 ;; + I*) echo ia64-dec-vms && exit 0 ;; + V*) echo vax-dec-vms && exit 0 ;; + esac esac #echo '(No uname command or uname output not recognized.)' 1>&2 @@ -1300,7 +1279,7 @@ #endif #if defined (__arm) && defined (__acorn) && defined (__unix) - printf ("arm-acorn-riscix\n"); exit (0); + printf ("arm-acorn-riscix"); exit (0); #endif #if defined (hp300) && !defined (hpux) @@ -1389,12 +1368,11 @@ } EOF -$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && SYSTEM_NAME=`$dummy` && - { echo "$SYSTEM_NAME"; exit; } +$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && $dummy && exit 0 # Apollos put the system type in the environment. -test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit; } +test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit 0; } # Convex versions that predate uname can use getsysinfo(1) @@ -1403,22 +1381,22 @@ case `getsysinfo -f cpu_type` in c1*) echo c1-convex-bsd - exit ;; + exit 0 ;; c2*) if getsysinfo -f scalar_acc then echo c32-convex-bsd else echo c2-convex-bsd fi - exit ;; + exit 0 ;; c34*) echo c34-convex-bsd - exit ;; + exit 0 ;; c38*) echo c38-convex-bsd - exit ;; + exit 0 ;; c4*) echo c4-convex-bsd - exit ;; + exit 0 ;; esac fi @@ -1429,9 +1407,7 @@ the operating system you are using. It is advised that you download the most up to date version of the config scripts from - http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.gue… -and - http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.sub + ftp://ftp.gnu.org/pub/gnu/config/ If the version you run ($0) is already up to date, please send the following data and any information you think might be Modified: freeswitch/trunk/libs/codec/lpc10/build/config.sub ============================================================================== --- freeswitch/trunk/libs/codec/lpc10/build/config.sub (original) +++ freeswitch/trunk/libs/codec/lpc10/build/config.sub Sun Mar 11 11:23:07 2007 @@ -1,9 +1,9 @@ #! /bin/sh # Configuration validation subroutine script. # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, -# 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. +# 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc. -timestamp='2005-12-11' +timestamp='2004-08-29' # This file is (in principle) common to ALL GNU software. # The presence of a machine in this file suggests that SOME GNU software @@ -21,15 +21,14 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA -# 02110-1301, USA. -# +# Foundation, Inc., 59 Temple Place - Suite 330, +# Boston, MA 02111-1307, USA. + # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a # configuration script generated by Autoconf, you may include it under # the same distribution terms that you use for the rest of that program. - # Please send patches to <config-patches(a)gnu.org>. Submit a context # diff and a properly formatted ChangeLog entry. # @@ -71,7 +70,7 @@ version="\ GNU config.sub ($timestamp) -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 +Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO @@ -84,11 +83,11 @@ while test $# -gt 0 ; do case $1 in --time-stamp | --time* | -t ) - echo "$timestamp" ; exit ;; + echo "$timestamp" ; exit 0 ;; --version | -v ) - echo "$version" ; exit ;; + echo "$version" ; exit 0 ;; --help | --h* | -h ) - echo "$usage"; exit ;; + echo "$usage"; exit 0 ;; -- ) # Stop option processing shift; break ;; - ) # Use stdin as input. @@ -100,7 +99,7 @@ *local*) # First pass through any local machine types. echo $1 - exit ;; + exit 0;; * ) break ;; @@ -119,9 +118,8 @@ # Here we must recognize all the valid KERNEL-OS combinations. maybe_os=`echo $1 | sed 's/^$.*$-$[^-]*-[^-]*$$/\2/'` case $maybe_os in - nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \ - uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \ - storm-chaos* | os2-emx* | rtmk-nova*) + nto-qnx* | linux-gnu* | linux-dietlibc | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | \ + kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | storm-chaos* | os2-emx* | rtmk-nova*) os=-$maybe_os basic_machine=`echo $1 | sed 's/^$.*$-$[^-]*-[^-]*$$/\1/'` ;; @@ -172,10 +170,6 @@ -hiux*) os=-hiuxwe2 ;; - -sco6) - os=-sco5v6 - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` - ;; -sco5) os=-sco3.2v5 basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` @@ -192,10 +186,6 @@ # Don't forget version if it is 3.2v4 or newer. basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` ;; - -sco5v6*) - # Don't forget version if it is 3.2v4 or newer. - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` - ;; -sco*) os=-sco3.2v2 basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` @@ -241,14 +231,13 @@ | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \ | am33_2.0 \ | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \ - | bfin \ | c4x | clipper \ | d10v | d30v | dlx | dsp16xx \ | fr30 | frv \ | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \ | i370 | i860 | i960 | ia64 \ | ip2k | iq2000 \ - | m32r | m32rle | m68000 | m68k | m88k | maxq | mcore \ + | m32r | m32rle | m68000 | m68k | m88k | mcore \ | mips | mipsbe | mipseb | mipsel | mipsle \ | mips16 \ | mips64 | mips64el \ @@ -257,7 +246,6 @@ | mips64vr4100 | mips64vr4100el \ | mips64vr4300 | mips64vr4300el \ | mips64vr5000 | mips64vr5000el \ - | mips64vr5900 | mips64vr5900el \ | mipsisa32 | mipsisa32el \ | mipsisa32r2 | mipsisa32r2el \ | mipsisa64 | mipsisa64el \ @@ -266,28 +254,23 @@ | mipsisa64sr71k | mipsisa64sr71kel \ | mipstx39 | mipstx39el \ | mn10200 | mn10300 \ - | mt \ | msp430 \ | ns16k | ns32k \ - | or32 \ + | openrisc | or32 \ | pdp10 | pdp11 | pj | pjl \ | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \ | pyramid \ - | sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \ + | sh | sh[1234] | sh[23]e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \ | sh64 | sh64le \ - | sparc | sparc64 | sparc64b | sparc86x | sparclet | sparclite \ - | sparcv8 | sparcv9 | sparcv9b \ + | sparc | sparc64 | sparc86x | sparclet | sparclite | sparcv8 | sparcv9 | sparcv9b \ | strongarm \ | tahoe | thumb | tic4x | tic80 | tron \ | v850 | v850e \ | we32k \ - | x86 | xscale | xscalee[bl] | xstormy16 | xtensa \ + | x86 | xscale | xstormy16 | xtensa \ | z8k) basic_machine=$basic_machine-unknown ;; - m32c) - basic_machine=$basic_machine-unknown - ;; m6811 | m68hc11 | m6812 | m68hc12) # Motorola 68HC11/12. basic_machine=$basic_machine-unknown @@ -295,9 +278,6 @@ ;; m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k) ;; - ms1) - basic_machine=mt-unknown - ;; # We use `pc' rather than `unknown' # because (1) that's what they normally are, and @@ -318,7 +298,7 @@ | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \ | arm-* | armbe-* | armle-* | armeb-* | armv*-* \ | avr-* \ - | bfin-* | bs2000-* \ + | bs2000-* \ | c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \ | clipper-* | craynv-* | cydra-* \ | d10v-* | d30v-* | dlx-* \ @@ -330,7 +310,7 @@ | ip2k-* | iq2000-* \ | m32r-* | m32rle-* \ | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \ - | m88110-* | m88k-* | maxq-* | mcore-* \ + | m88110-* | m88k-* | mcore-* \ | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \ | mips16-* \ | mips64-* | mips64el-* \ @@ -339,7 +319,6 @@ | mips64vr4100-* | mips64vr4100el-* \ | mips64vr4300-* | mips64vr4300el-* \ | mips64vr5000-* | mips64vr5000el-* \ - | mips64vr5900-* | mips64vr5900el-* \ | mipsisa32-* | mipsisa32el-* \ | mipsisa32r2-* | mipsisa32r2el-* \ | mipsisa64-* | mipsisa64el-* \ @@ -348,7 +327,6 @@ | mipsisa64sr71k-* | mipsisa64sr71kel-* \ | mipstx39-* | mipstx39el-* \ | mmix-* \ - | mt-* \ | msp430-* \ | none-* | np1-* | ns16k-* | ns32k-* \ | orion-* \ @@ -356,23 +334,20 @@ | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \ | pyramid-* \ | romp-* | rs6000-* \ - | sh-* | sh[1234]-* | sh[24]a-* | sh[23]e-* | sh[34]eb-* | shbe-* \ + | sh-* | sh[1234]-* | sh[23]e-* | sh[34]eb-* | shbe-* \ | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \ - | sparc-* | sparc64-* | sparc64b-* | sparc86x-* | sparclet-* \ - | sparclite-* \ + | sparc-* | sparc64-* | sparc86x-* | sparclet-* | sparclite-* \ | sparcv8-* | sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \ | tahoe-* | thumb-* \ | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \ | tron-* \ | v850-* | v850e-* | vax-* \ | we32k-* \ - | x86-* | x86_64-* | xps100-* | xscale-* | xscalee[bl]-* \ - | xstormy16-* | xtensa-* \ + | x86-* | x86_64-* | xps100-* | xscale-* | xstormy16-* \ + | xtensa-* \ | ymp-* \ | z8k-*) ;; - m32c-*) - ;; # Recognize the various machine names and aliases which stand # for a CPU type and a company and sometimes even an OS. 386bsd) @@ -514,10 +489,6 @@ basic_machine=m88k-motorola os=-sysv3 ;; - djgpp) - basic_machine=i586-pc - os=-msdosdjgpp - ;; dpx20 | dpx20-*) basic_machine=rs6000-bull os=-bosx @@ -708,9 +679,6 @@ basic_machine=i386-pc os=-msdos ;; - ms1-*) - basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'` - ;; mvs) basic_machine=i370-ibm os=-mvs @@ -786,8 +754,9 @@ basic_machine=hppa1.1-oki os=-proelf ;; - openrisc | openrisc-*) + or32 | or32-*) basic_machine=or32-unknown + os=-coff ;; os400) basic_machine=powerpc-ibm @@ -874,10 +843,6 @@ basic_machine=i586-unknown os=-pw32 ;; - rdos) - basic_machine=i386-pc - os=-rdos - ;; rom68k) basic_machine=m68k-rom68k os=-coff @@ -1064,10 +1029,6 @@ basic_machine=hppa1.1-winbond os=-proelf ;; - xbox) - basic_machine=i686-pc - os=-mingw32 - ;; xps | xps100) basic_machine=xps100-honeywell ;; @@ -1117,9 +1078,12 @@ we32k) basic_machine=we32k-att ;; - sh[1234] | sh[24]a | sh[34]eb | sh[1234]le | sh[23]ele) + sh3 | sh4 | sh[34]eb | sh[1234]le | sh[23]ele) basic_machine=sh-unknown ;; + sh64) + basic_machine=sh64-unknown + ;; sparc | sparcv8 | sparcv9 | sparcv9b) basic_machine=sparc-sun ;; @@ -1200,15 +1164,13 @@ | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ | -chorusos* | -chorusrdb* \ | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ - | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \ - | -uxpv* | -beos* | -mpeix* | -udk* \ + | -mingw32* | -linux-gnu* | -linux-uclibc* | -uxpv* | -beos* | -mpeix* | -udk* \ | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \ | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \ | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \ | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \ | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \ - | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \ - | -skyos* | -haiku* | -rdos*) + | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly*) # Remember, each alternative MUST END IN *, to match a version number. ;; -qnx*) @@ -1226,7 +1188,7 @@ os=`echo $os | sed -e 's|nto|nto-qnx|'` ;; -sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \ - | -windows* | -osx | -abug | -netware* | -os9* | -beos* | -haiku* \ + | -windows* | -osx | -abug | -netware* | -os9* | -beos* \ | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*) ;; -mac*) @@ -1335,9 +1297,6 @@ -kaos*) os=-kaos ;; - -zvmoe) - os=-zvmoe - ;; -none) ;; *) @@ -1415,9 +1374,6 @@ *-be) os=-beos ;; - *-haiku) - os=-haiku - ;; *-ibm) os=-aix ;; @@ -1589,7 +1545,7 @@ esac echo $basic_machine$os -exit +exit 0 # Local variables: # eval: (add-hook 'write-file-hooks 'time-stamp)

1 0