]> git.ipfire.org Git - thirdparty/freeswitch.git/commitdiff
projects / thirdparty / freeswitch.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: c5c0733)
more build stuff
authorAnthony Minessale <anthony.minessale@gmail.com>
Mon, 30 Jan 2006 21:04:19 +0000 (21:04 +0000)
committerAnthony Minessale <anthony.minessale@gmail.com>
Mon, 30 Jan 2006 21:04:19 +0000 (21:04 +0000)
git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@505 d0543943-73ff-0310-b7d9-9358b9ac24b2

14 files changed:
Makefile.am patch | blob | blame | history
Makefile.in patch | blob | blame | history
buildlib.sh patch | blob | blame | history
checkversion.sh patch | blob | blame | history
src/mod/codecs/mod_g729/Makefile patch | blob | blame | history
src/mod/codecs/mod_gsm/Makefile patch | blob | blame | history
src/mod/codecs/mod_ilbc/Makefile patch | blob | blame | history
src/mod/codecs/mod_speex/Makefile patch | blob | blame | history
src/mod/dialplans/mod_pcre/Makefile patch | blob | blame | history
src/mod/endpoints/mod_exosip/Makefile patch | blob | blame | history
src/mod/endpoints/mod_iax/Makefile patch | blob | blame | history
src/mod/endpoints/mod_portaudio/Makefile patch | blob | blame | history
src/mod/event_handlers/mod_xmpp_event/Makefile patch | blob | blame | history
src/mod/formats/mod_sndfile/Makefile patch | blob | blame | history

diff --git a/Makefile.am b/Makefile.am
index 3abe93772bb376f7c10c40aa8e6382ab3a61cad6..e78d3e18803ff537c4282b2f409d1652ed1c06f2 100644 (file)
--- 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 39e64f4e53c8fd110b624d11a4a0fd67922cf107..7af5dff2d3177595e4087028af2bfa1f95ffc27b 100644 (file)
--- 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 e1ad1fe53941d292b80f4294fefb58c5d64f0129..a23e6e8624cbfeb8cb468be9149d1f3ccf302750 100755 (executable)
--- 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 04f7cfc5f7fc0daf6eff840331d32d26ca6a450a..e85c639fc6ffac4991125e2f4008d58e10e0e5fc 100755 (executable)
--- 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 5ee080cbc979f61132b465dcea4da2ba7d653da8..74f1c384f99f8f490c5e1195215243d61c1a6c1e 100644 (file)
--- 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 cec9e27ff69e70d2d2ad6dbb246b152d2f1de4f0..b8e3538d1ba764601002d1e141f6614fc7a72f17 100644 (file)
--- 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 d989760f1a1ad07cf93b614c034c998f147c204f..4d14a5647e7b2dd177d13bf36336541ed7399cf3 100644 (file)
--- 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 0ef7857bb142ac8d366f97d684539e205025bd06..785c07bcfec709dbe4f3fbb67472a8ffa94c245b 100644 (file)
--- 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 61efbdd2ade60b03cd000f0951a59ff051fc03ad..bdad22b6bcea450f4c370a5515a8a8bc7074977e 100644 (file)
--- 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 3bbd37f92289bdc3a32d592db65899f1cfdd5afa..9299735eeb8ab4e9bc330eb49854dbe047f77813 100644 (file)
--- 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 198ef34357c7bf03cdbbaf08d8184956c69e9d6f..fd355e65fac1f5ab4eb81b1f4d26c3a6788eb67d 100644 (file)
--- 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 367b72a997d6062fcd69662d4df7b7239470bdcb..732a9d1da8e8dd6d09ba09163a293f4dd484e634 100644 (file)
--- 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 0815fd5659c13438fef43ec787dc31bcbb3d649e..af038f7248f807d27d44ead896b59c0ad483603f 100644 (file)
--- 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 08e686aec743da767dc12d11fe75977e8d5c2511..56649b478df1df601e4dda3692f83f9283aad7cd 100644 (file)
--- 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 
Mirror of https://github.com/signalwire/freeswitch.git