From 597bc093bfbb629003ae05d32e1450edddc57b97 Mon Sep 17 00:00:00 2001 From: Anthony Minessale Date: Mon, 30 Jan 2006 21:04:19 +0000 Subject: [PATCH] more build stuff git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@505 d0543943-73ff-0310-b7d9-9358b9ac24b2 --- Makefile.am | 14 +++++++------- Makefile.in | 14 +++++++------- buildlib.sh | 19 ++++++++++++------- checkversion.sh | 2 +- src/mod/codecs/mod_g729/Makefile | 2 +- src/mod/codecs/mod_gsm/Makefile | 2 +- src/mod/codecs/mod_ilbc/Makefile | 2 +- src/mod/codecs/mod_speex/Makefile | 2 +- src/mod/dialplans/mod_pcre/Makefile | 2 +- src/mod/endpoints/mod_exosip/Makefile | 6 +++--- src/mod/endpoints/mod_iax/Makefile | 2 +- src/mod/endpoints/mod_portaudio/Makefile | 2 +- .../event_handlers/mod_xmpp_event/Makefile | 2 +- src/mod/formats/mod_sndfile/Makefile | 2 +- 14 files changed, 39 insertions(+), 34 deletions(-) diff --git a/Makefile.am b/Makefile.am index 3abe93772b..e78d3e1880 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,7 +1,7 @@ EXTRA_DIST = SUBDIRS = AUTOMAKE_OPTS= gnu -MAKE=gmake +MAKE=$(shell which gmake 2>/dev/null || which make) NAME=freeswitch PREFIX=$(prefix) APR_CONFIG=$(prefix)/bin/apr-1-config @@ -120,10 +120,10 @@ yesdepends: rm .nodepends .depend: - ./buildlib.sh . install sqlite-3.2.8.tar.gz --prefix=$(PREFIX) --disable-tcl --enable-threadsafe - ./buildlib.sh . install apr-1.2.2.tar.gz --prefix=$(PREFIX) - ./buildlib.sh . install apr-util-1.2.2.tar.gz --with-apr=../apr-1.2.2 --prefix=$(PREFIX) - ./buildlib.sh . install libresample-0.1.3.tgz --prefix=$(PREFIX) + MAKE=$(MAKE) ./buildlib.sh . install sqlite-3.2.8.tar.gz --prefix=$(PREFIX) --disable-tcl --enable-threadsafe + MAKE=$(MAKE) ./buildlib.sh . install apr-1.2.2.tar.gz --prefix=$(PREFIX) + MAKE=$(MAKE) ./buildlib.sh . install apr-util-1.2.2.tar.gz --with-apr=../apr-1.2.2 --prefix=$(PREFIX) + MAKE=$(MAKE) ./buildlib.sh . install libresample-0.1.3.tgz --prefix=$(PREFIX) cp libs/libresample-0.1.3/*.a $(PREFIX)/lib cp libs/libresample-0.1.3/include/* $(PREFIX)/include ranlib $(PREFIX)/lib/libresample.a @@ -134,10 +134,10 @@ depends: .depend modules: $(NAME) @echo making modules - @cd src/mod && for i in `cat ../../modules.conf | grep -v \#` ; do echo making $$i ; DYLD_LIBRARY_PATH="$(PREFIX)/lib:$DYLD_LIBRARY_PATH" LD_LIBRARY_PATH="$(PREFIX)/lib:$LD_LIBRARY_PATH" PREFIX="$(PREFIX)" BASE="$(PWD)" OSARCH="$(OSARCH)" SOLINK="$(SOLINK)" LDFLAGS="$(AM_LDFLAGS) -lfreeswitch" CFLAGS="$(AM_CFLAGS)" CC="$(CC)" MOD="$$i" $(PWD)/modmake.sh $(PWD) $$i || exit 1; done + @cd src/mod && for i in `cat ../../modules.conf | grep -v \#` ; do echo making $$i ; MAKE=$(MAKE) DYLD_LIBRARY_PATH="$(PREFIX)/lib:$DYLD_LIBRARY_PATH" LD_LIBRARY_PATH="$(PREFIX)/lib:$LD_LIBRARY_PATH" PREFIX="$(PREFIX)" BASE="$(PWD)" OSARCH="$(OSARCH)" SOLINK="$(SOLINK)" LDFLAGS="$(AM_LDFLAGS) -lfreeswitch" CFLAGS="$(AM_CFLAGS)" CC="$(CC)" MOD="$$i" $(PWD)/modmake.sh $(PWD) $$i || exit 1; done modclean: - @cd src/mod && for i in `find . -type d -name mod_\*` ; do echo making clean $$i ; SOLINK="$(SOLINK)" CFLAGS="$(CFLAGS)" CC="$(CC)" MOD="$$i" $(PWD)/modmake.sh $(PWD) $$i clean || exit 1; done + @cd src/mod && for i in `find . -type d -name mod_\*` ; do echo making clean $$i ; MAKE=$(MAKE) SOLINK="$(SOLINK)" CFLAGS="$(CFLAGS)" CC="$(CC)" MOD="$$i" $(PWD)/modmake.sh $(PWD) $$i clean || exit 1; done everything: install install_mod diff --git a/Makefile.in b/Makefile.in index 39e64f4e53..7af5dff2d3 100644 --- a/Makefile.in +++ b/Makefile.in @@ -230,7 +230,7 @@ target_alias = @target_alias@ EXTRA_DIST = SUBDIRS = AUTOMAKE_OPTS = gnu -MAKE = gmake +MAKE = $(shell which gmake 2>/dev/null || which make) NAME = freeswitch PREFIX = $(prefix) APR_CONFIG = $(prefix)/bin/apr-1-config @@ -998,10 +998,10 @@ yesdepends: rm .nodepends .depend: - ./buildlib.sh . install sqlite-3.2.8.tar.gz --prefix=$(PREFIX) --disable-tcl --enable-threadsafe - ./buildlib.sh . install apr-1.2.2.tar.gz --prefix=$(PREFIX) - ./buildlib.sh . install apr-util-1.2.2.tar.gz --with-apr=../apr-1.2.2 --prefix=$(PREFIX) - ./buildlib.sh . install libresample-0.1.3.tgz --prefix=$(PREFIX) + MAKE=$(MAKE) ./buildlib.sh . install sqlite-3.2.8.tar.gz --prefix=$(PREFIX) --disable-tcl --enable-threadsafe + MAKE=$(MAKE) ./buildlib.sh . install apr-1.2.2.tar.gz --prefix=$(PREFIX) + MAKE=$(MAKE) ./buildlib.sh . install apr-util-1.2.2.tar.gz --with-apr=../apr-1.2.2 --prefix=$(PREFIX) + MAKE=$(MAKE) ./buildlib.sh . install libresample-0.1.3.tgz --prefix=$(PREFIX) cp libs/libresample-0.1.3/*.a $(PREFIX)/lib cp libs/libresample-0.1.3/include/* $(PREFIX)/include ranlib $(PREFIX)/lib/libresample.a @@ -1011,10 +1011,10 @@ depends: .depend modules: $(NAME) @echo making modules - @cd src/mod && for i in `cat ../../modules.conf | grep -v \#` ; do echo making $$i ; DYLD_LIBRARY_PATH="$(PREFIX)/lib:$DYLD_LIBRARY_PATH" LD_LIBRARY_PATH="$(PREFIX)/lib:$LD_LIBRARY_PATH" PREFIX="$(PREFIX)" BASE="$(PWD)" OSARCH="$(OSARCH)" SOLINK="$(SOLINK)" LDFLAGS="$(AM_LDFLAGS) -lfreeswitch" CFLAGS="$(AM_CFLAGS)" CC="$(CC)" MOD="$$i" $(PWD)/modmake.sh $(PWD) $$i || exit 1; done + @cd src/mod && for i in `cat ../../modules.conf | grep -v \#` ; do echo making $$i ; MAKE=$(MAKE) DYLD_LIBRARY_PATH="$(PREFIX)/lib:$DYLD_LIBRARY_PATH" LD_LIBRARY_PATH="$(PREFIX)/lib:$LD_LIBRARY_PATH" PREFIX="$(PREFIX)" BASE="$(PWD)" OSARCH="$(OSARCH)" SOLINK="$(SOLINK)" LDFLAGS="$(AM_LDFLAGS) -lfreeswitch" CFLAGS="$(AM_CFLAGS)" CC="$(CC)" MOD="$$i" $(PWD)/modmake.sh $(PWD) $$i || exit 1; done modclean: - @cd src/mod && for i in `find . -type d -name mod_\*` ; do echo making clean $$i ; SOLINK="$(SOLINK)" CFLAGS="$(CFLAGS)" CC="$(CC)" MOD="$$i" $(PWD)/modmake.sh $(PWD) $$i clean || exit 1; done + @cd src/mod && for i in `find . -type d -name mod_\*` ; do echo making clean $$i ; MAKE=$(MAKE) SOLINK="$(SOLINK)" CFLAGS="$(CFLAGS)" CC="$(CC)" MOD="$$i" $(PWD)/modmake.sh $(PWD) $$i clean || exit 1; done everything: install install_mod diff --git a/buildlib.sh b/buildlib.sh index e1ad1fe539..a23e6e8624 100755 --- a/buildlib.sh +++ b/buildlib.sh @@ -1,14 +1,19 @@ -#!/bin/bash +#!/bin/sh root=$1 shift if [ -f $root/.nodepends ] ; then - echo "***depends disabled*** use gmake yesdepends to re-enable" + echo "***depends disabled*** use $MAKE yesdepends to re-enable" exit 0 fi - +if [ -z $MAKE ] ; then + make=`which dmake 2>/dev/null` + if [ -z $MAKE ] ; then + make=make + fi +fi install= base=http://www.freeswitch.org/downloads/libs @@ -24,7 +29,7 @@ shift cd $root/libs/. CFLAGS= LDFLAGS= -GMAKEFLAGS= +MAKEFLAGS= if [ -d $tar ] ; then uncompressed=$tar @@ -52,18 +57,18 @@ if [ -f $uncompressed/.complete ] ; then fi cd $uncompressed -gmake clean 2>&1 +$MAKE clean 2>&1 sh ./configure $@ if [ $? == 0 ] ; then - gmake + $MAKE else echo ERROR exit 1 fi if [ ! -z $install ] ; then - gmake install + $MAKE install ldpath=`which ldconfig` if [ ! -z $ldpath ] ; then ldconfig 2>&1 diff --git a/checkversion.sh b/checkversion.sh index 04f7cfc5f7..e85c639fc6 100755 --- a/checkversion.sh +++ b/checkversion.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/sh if [ ! -z $1 ] ; then if [ $1 = force ] ; then diff --git a/src/mod/codecs/mod_g729/Makefile b/src/mod/codecs/mod_g729/Makefile index 5ee080cbc9..74f1c384f9 100644 --- a/src/mod/codecs/mod_g729/Makefile +++ b/src/mod/codecs/mod_g729/Makefile @@ -4,7 +4,7 @@ LDFLAGS +=-lg729 all: depends $(MODNAME).so depends: - $(BASE)/buildlib.sh $(BASE) install codec/libg729 --prefix=$(PREFIX) + MAKE=$(MAKE) $(BASE)/buildlib.sh $(BASE) install codec/libg729 --prefix=$(PREFIX) $(MODNAME).so: $(MODNAME).c $(CC) $(CFLAGS) -fPIC -c $(MODNAME).c -o $(MODNAME).o diff --git a/src/mod/codecs/mod_gsm/Makefile b/src/mod/codecs/mod_gsm/Makefile index cec9e27ff6..b8e3538d1b 100644 --- a/src/mod/codecs/mod_gsm/Makefile +++ b/src/mod/codecs/mod_gsm/Makefile @@ -3,7 +3,7 @@ LDFLAGS +=-lgsm all: depends $(MODNAME).so depends: - $(BASE)/buildlib.sh $(BASE) install codec/gsm --prefix=$(PREFIX) + MAKE=$(MAKE) $(BASE)/buildlib.sh $(BASE) install codec/gsm --prefix=$(PREFIX) $(MODNAME).so: $(MODNAME).c $(CC) $(CFLAGS) -fPIC -c $(MODNAME).c -o $(MODNAME).o diff --git a/src/mod/codecs/mod_ilbc/Makefile b/src/mod/codecs/mod_ilbc/Makefile index d989760f1a..4d14a5647e 100644 --- a/src/mod/codecs/mod_ilbc/Makefile +++ b/src/mod/codecs/mod_ilbc/Makefile @@ -3,7 +3,7 @@ LDFLAGS +=-lilbc all: depends $(MODNAME).so depends: - $(BASE)/buildlib.sh $(BASE) install codec/ilbc --prefix=$(PREFIX) + MAKE=$(MAKE) $(BASE)/buildlib.sh $(BASE) install codec/ilbc --prefix=$(PREFIX) $(MODNAME).so: $(MODNAME).c $(CC) $(CFLAGS) -fPIC -c $(MODNAME).c -o $(MODNAME).o diff --git a/src/mod/codecs/mod_speex/Makefile b/src/mod/codecs/mod_speex/Makefile index 0ef7857bb1..785c07bcfe 100644 --- a/src/mod/codecs/mod_speex/Makefile +++ b/src/mod/codecs/mod_speex/Makefile @@ -1,7 +1,7 @@ all: depends $(MODNAME).so depends: - $(BASE)/buildlib.sh $(BASE) install speex-1.1.11.1.tar.gz --prefix=$(PREFIX) + MAKE=$(MAKE) $(BASE)/buildlib.sh $(BASE) install speex-1.1.11.1.tar.gz --prefix=$(PREFIX) $(MODNAME).so: $(MODNAME).c $(CC) $(CFLAGS) -fPIC -c $(MODNAME).c -o $(MODNAME).o diff --git a/src/mod/dialplans/mod_pcre/Makefile b/src/mod/dialplans/mod_pcre/Makefile index 61efbdd2ad..bdad22b6bc 100644 --- a/src/mod/dialplans/mod_pcre/Makefile +++ b/src/mod/dialplans/mod_pcre/Makefile @@ -3,7 +3,7 @@ LDFLAGS += -lpcre -L/usr/local/lib all: depends $(MODNAME).so depends: - $(BASE)/buildlib.sh $(BASE) install pcre-6.4.tar.gz --prefix=$(PREFIX) + MAKE=$(MAKE) $(BASE)/buildlib.sh $(BASE) install pcre-6.4.tar.gz --prefix=$(PREFIX) $(MODNAME).so: $(MODNAME).c $(CC) $(CFLAGS) -fPIC -c $(MODNAME).c -o $(MODNAME).o diff --git a/src/mod/endpoints/mod_exosip/Makefile b/src/mod/endpoints/mod_exosip/Makefile index 3bbd37f922..9299735eeb 100644 --- a/src/mod/endpoints/mod_exosip/Makefile +++ b/src/mod/endpoints/mod_exosip/Makefile @@ -10,9 +10,9 @@ endif all: depends $(MODNAME).so depends: - $(BASE)/buildlib.sh $(BASE) install jrtplib --prefix=$(PREFIX) --disable-gst - $(BASE)/buildlib.sh $(BASE) install libosip2-2.2.2.tar.gz --prefix=$(PREFIX) - $(BASE)/buildlib.sh $(BASE) install libeXosip2-2.2.2.tar.gz --disable-josua --prefix=$(PREFIX) + MAKE=$(MAKE) $(BASE)/buildlib.sh $(BASE) install jrtplib --prefix=$(PREFIX) --disable-gst + MAKE=$(MAKE) $(BASE)/buildlib.sh $(BASE) install libosip2-2.2.2.tar.gz --prefix=$(PREFIX) + MAKE=$(MAKE) $(BASE)/buildlib.sh $(BASE) install libeXosip2-2.2.2.tar.gz --disable-josua --prefix=$(PREFIX) $(MODNAME).so: $(MODNAME).c diff --git a/src/mod/endpoints/mod_iax/Makefile b/src/mod/endpoints/mod_iax/Makefile index 198ef34357..fd355e65fa 100644 --- a/src/mod/endpoints/mod_iax/Makefile +++ b/src/mod/endpoints/mod_iax/Makefile @@ -3,7 +3,7 @@ LDFLAGS += -liax -L/usr/local/lib all: depends $(MODNAME).so depends: - $(BASE)/buildlib.sh $(BASE) install iax --enable-newjb --prefix=$(PREFIX) + MAKE=$(MAKE) $(BASE)/buildlib.sh $(BASE) install iax --enable-newjb --prefix=$(PREFIX) $(MODNAME).so: $(MODNAME).c $(CC) $(CFLAGS) -fPIC -c $(MODNAME).c -o $(MODNAME).o diff --git a/src/mod/endpoints/mod_portaudio/Makefile b/src/mod/endpoints/mod_portaudio/Makefile index 367b72a997..732a9d1da8 100644 --- a/src/mod/endpoints/mod_portaudio/Makefile +++ b/src/mod/endpoints/mod_portaudio/Makefile @@ -4,7 +4,7 @@ MYOBJS = pablio.o ringbuffer.o all: depends $(MODNAME).so depends: - $(BASE)/buildlib.sh $(BASE) install portaudio.tar.gz --prefix=$(PREFIX) + MAKE=$(MAKE) $(BASE)/buildlib.sh $(BASE) install portaudio.tar.gz --prefix=$(PREFIX) %.o: %.c $(CC) -fPIC $(CFLAGS) -c -o $@ $< diff --git a/src/mod/event_handlers/mod_xmpp_event/Makefile b/src/mod/event_handlers/mod_xmpp_event/Makefile index 0815fd5659..af038f7248 100644 --- a/src/mod/event_handlers/mod_xmpp_event/Makefile +++ b/src/mod/event_handlers/mod_xmpp_event/Makefile @@ -3,7 +3,7 @@ LDFLAGS += -liksemel -L/usr/local/lib all: depends $(MODNAME).so depends: - $(BASE)/buildlib.sh $(BASE) install iksemel-1.2.tar.gz --prefix=$(PREFIX) + MAKE=$(MAKE) $(BASE)/buildlib.sh $(BASE) install iksemel-1.2.tar.gz --prefix=$(PREFIX) $(MODNAME).so: $(MODNAME).c $(CC) $(CFLAGS) -fPIC -c $(MODNAME).c -o $(MODNAME).o diff --git a/src/mod/formats/mod_sndfile/Makefile b/src/mod/formats/mod_sndfile/Makefile index 08e686aec7..56649b478d 100644 --- a/src/mod/formats/mod_sndfile/Makefile +++ b/src/mod/formats/mod_sndfile/Makefile @@ -3,7 +3,7 @@ LDFLAGS += -lsndfile -L/usr/local/lib all: depends $(MODNAME).so depends: - $(BASE)/buildlib.sh $(BASE) install libsndfile-1.0.12.tar.gz --prefix=$(PREFIX) + MAKE=$(MAKE) $(BASE)/buildlib.sh $(BASE) install libsndfile-1.0.12.tar.gz --prefix=$(PREFIX) $(MODNAME).so: $(MODNAME).c $(CC) $(CFLAGS) -fPIC -c $(MODNAME).c -o $(MODNAME).o