update

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@512 d0543943-73ff-0310-b7d9-9358b9ac24b2

diff --git a/Makefile.am b/Makefile.am
index 0657c7fe6c776fd801aaeede8f602339c1ded821..91dfe6770f18b0b6d1cdc0b096f7964fb7665714 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -110,7 +110,7 @@ version: Makefile
 
 newversion: Makefile
        ./checkversion.sh force
-       $(MAKE)
+       $(shell which gmake 2>/dev/null || which make)
 
 .nodepends:
        touch .nodepends
@@ -121,10 +121,10 @@ yesdepends:
        rm .nodepends
 
 .depend:
-       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)
+       MAKE=$(shell which gmake 2>/dev/null || which make) ./buildlib.sh . install sqlite-3.2.8.tar.gz --prefix=$(PREFIX) --disable-tcl --enable-threadsafe
+       MAKE=$(shell which gmake 2>/dev/null || which make) ./buildlib.sh . install apr-1.2.2.tar.gz --prefix=$(PREFIX)
+       MAKE=$(shell which gmake 2>/dev/null || which make) ./buildlib.sh . install apr-util-1.2.2.tar.gz --with-apr=../apr-1.2.2 --prefix=$(PREFIX)
+       MAKE=$(shell which gmake 2>/dev/null || which 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
@@ -135,10 +135,10 @@ depends: .depend
 
 modules: $(NAME)
        @echo making modules
-       @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
+       @cd src/mod && for i in `cat ../../modules.conf | grep -v \#` ; do echo making $$i ; MAKE=$(shell which gmake 2>/dev/null || which 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 ; MAKE=$(MAKE) 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=$(shell which gmake 2>/dev/null || which 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 0cb52a23b1586c778d7c1f3389bb942d160893b2..881423710a0ff0631ec0ee605b8e170ce546a107 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -988,7 +988,7 @@ version: Makefile
 
 newversion: Makefile
        ./checkversion.sh force
-       $(MAKE)
+       $(shell which gmake 2>/dev/null || which make)
 
 .nodepends:
        touch .nodepends
@@ -999,10 +999,10 @@ yesdepends:
        rm .nodepends
 
 .depend:
-       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)
+       MAKE=$(shell which gmake 2>/dev/null || which make) ./buildlib.sh . install sqlite-3.2.8.tar.gz --prefix=$(PREFIX) --disable-tcl --enable-threadsafe
+       MAKE=$(shell which gmake 2>/dev/null || which make) ./buildlib.sh . install apr-1.2.2.tar.gz --prefix=$(PREFIX)
+       MAKE=$(shell which gmake 2>/dev/null || which make) ./buildlib.sh . install apr-util-1.2.2.tar.gz --with-apr=../apr-1.2.2 --prefix=$(PREFIX)
+       MAKE=$(shell which gmake 2>/dev/null || which 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
@@ -1012,10 +1012,10 @@ depends: .depend
 
 modules: $(NAME)
        @echo making modules
-       @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
+       @cd src/mod && for i in `cat ../../modules.conf | grep -v \#` ; do echo making $$i ; MAKE=$(shell which gmake 2>/dev/null || which 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 ; MAKE=$(MAKE) 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=$(shell which gmake 2>/dev/null || which make) SOLINK="$(SOLINK)" CFLAGS="$(CFLAGS)" CC="$(CC)" MOD="$$i" $(PWD)/modmake.sh $(PWD) $$i clean || exit 1; done
 
 everything: install install_mod