[Freeswitch-branches] [commit] r2796 - in freeswitch/branches/tholo: . build libs/codec/g726 libs/codec/g7xx libs/codec/gsm libs/codec/ilbc libs/codec/lpc10

Freeswitch SVN tholo at freeswitch.org
Sat Sep 23 01:28:41 EDT 2006 

Author: tholo
Date: Sat Sep 23 01:28:39 2006
New Revision: 2796

Modified:
   freeswitch/branches/tholo/Makefile.am
   freeswitch/branches/tholo/Makefile.in
   freeswitch/branches/tholo/build/buildlib.sh
   freeswitch/branches/tholo/build/modmake.sh
   freeswitch/branches/tholo/libs/codec/g726/Makefile.am
   freeswitch/branches/tholo/libs/codec/g726/Makefile.in
   freeswitch/branches/tholo/libs/codec/g7xx/Makefile.am
   freeswitch/branches/tholo/libs/codec/g7xx/Makefile.in
   freeswitch/branches/tholo/libs/codec/gsm/Makefile.am
   freeswitch/branches/tholo/libs/codec/gsm/Makefile.in
   freeswitch/branches/tholo/libs/codec/ilbc/Makefile.am
   freeswitch/branches/tholo/libs/codec/ilbc/Makefile.in
   freeswitch/branches/tholo/libs/codec/lpc10/Makefile.am
   freeswitch/branches/tholo/libs/codec/lpc10/Makefile.in

Log:
Do not force use of "gmake" -- but propagate whichever command
was used to start the top-level make.  This way users on e.g.
Mac OS X won't have to create a special symlink to build, but
can instead just use the command "gnumake" (as opposed to
"make" og "gmake")


Modified: freeswitch/branches/tholo/Makefile.am
==============================================================================
--- freeswitch/branches/tholo/Makefile.am	(original)
+++ freeswitch/branches/tholo/Makefile.am	Sat Sep 23 01:28:39 2006
@@ -3,8 +3,6 @@
 EXTRA_DIST =
 SUBDIRS = 
 AUTOMAKE_OPTS = gnu foreign
-AM_MAKE=`which gmake 2>/dev/null || which make 2>/dev/null || echo make`
-MAKE=$(AM_MAKE)
 NAME=freeswitch
 PREFIX=$(prefix)
 APR_CONFIG=$(prefix)/bin/apr-1-config
@@ -191,7 +189,7 @@
 	@./build/addenv.sh build/freeswitch.env CFLAGS "-Werror $(AM_CFLAGS)"
 	@./build/addenv.sh build/freeswitch.env CC "$(CC)"
 	@./build/addenv.sh build/freeswitch.env CFGARGS "$(AM_CFGARGS)"
-	@cd src/mod && for i in `cat ../../modules.conf | grep -v \#` ; do echo making $$i ; $(PWD)/build/modmake.sh $(PWD) $$i || exit 1; done
+	@cd src/mod && for i in `cat ../../modules.conf | grep -v \#` ; do echo making $$i ; $(PWD)/build/modmake.sh $(MAKE) $(PWD) $$i || exit 1; done
 	@rm -f build/freeswitch.env
 
 modclean:
@@ -199,7 +197,7 @@
 	@./build/addenv.sh build/freeswitch.env MAKE "$(MAKE)"
 	@./build/addenv.sh build/freeswitch.env CC "$(CC)"
 	@./build/addenv.sh build/freeswitch.env DYNAMIC_LIB_EXTEN "$(DYNAMIC_LIB_EXTEN)"
-	@cd src/mod && for i in `find . -type d -name mod_\*` ; do echo making clean $$i ; $(PWD)/build/modmake.sh $(PWD) $$i clean || exit 1; done
+	@cd src/mod && for i in `find . -type d -name mod_\*` ; do echo making clean $$i ; $(PWD)/build/modmake.sh $(MAKE) $(PWD) $$i clean || exit 1; done
 	@rm -f build/freeswitch.env
 
 everything: install install_mod
@@ -231,7 +229,7 @@
 	@./build/addenv.sh build/freeswitch.env LDFLAGS "$(AM_LDFLAGS) -lfreeswitch"
 	@./build/addenv.sh build/freeswitch.env CFLAGS "-Werror $(AM_CFLAGS)"
 	@./build/addenv.sh build/freeswitch.env CC "$(CC)"
-	@cd src/mod && for i in `cat ../../modules.conf | grep -v \#` ; do echo making install $$i ; $(PWD)/build/modmake.sh $(PWD) $$i install || exit 1; done
+	@cd src/mod && for i in `cat ../../modules.conf | grep -v \#` ; do echo making install $$i ; $(PWD)/build/modmake.sh $(MAKE) $(PWD) $$i install || exit 1; done
 	@rm -f build/freeswitch.env
 	@echo done
 

Modified: freeswitch/branches/tholo/Makefile.in
==============================================================================
--- freeswitch/branches/tholo/Makefile.in	(original)
+++ freeswitch/branches/tholo/Makefile.in	Sat Sep 23 01:28:39 2006
@@ -243,8 +243,6 @@
 EXTRA_DIST = 
 SUBDIRS = 
 AUTOMAKE_OPTS = gnu foreign
-AM_MAKE = `which gmake 2>/dev/null || which make 2>/dev/null || echo make`
-MAKE = $(AM_MAKE)
 NAME = freeswitch
 PREFIX = $(prefix)
 APR_CONFIG = $(prefix)/bin/apr-1-config
@@ -1110,7 +1108,7 @@
 	@./build/addenv.sh build/freeswitch.env CFLAGS "-Werror $(AM_CFLAGS)"
 	@./build/addenv.sh build/freeswitch.env CC "$(CC)"
 	@./build/addenv.sh build/freeswitch.env CFGARGS "$(AM_CFGARGS)"
-	@cd src/mod && for i in `cat ../../modules.conf | grep -v \#` ; do echo making $$i ; $(PWD)/build/modmake.sh $(PWD) $$i || exit 1; done
+	@cd src/mod && for i in `cat ../../modules.conf | grep -v \#` ; do echo making $$i ; $(PWD)/build/modmake.sh $(MAKE) $(PWD) $$i || exit 1; done
 	@rm -f build/freeswitch.env
 
 modclean:
@@ -1118,7 +1116,7 @@
 	@./build/addenv.sh build/freeswitch.env MAKE "$(MAKE)"
 	@./build/addenv.sh build/freeswitch.env CC "$(CC)"
 	@./build/addenv.sh build/freeswitch.env DYNAMIC_LIB_EXTEN "$(DYNAMIC_LIB_EXTEN)"
-	@cd src/mod && for i in `find . -type d -name mod_\*` ; do echo making clean $$i ; $(PWD)/build/modmake.sh $(PWD) $$i clean || exit 1; done
+	@cd src/mod && for i in `find . -type d -name mod_\*` ; do echo making clean $$i ; $(PWD)/build/modmake.sh $(MAKE) $(PWD) $$i clean || exit 1; done
 	@rm -f build/freeswitch.env
 
 everything: install install_mod
@@ -1150,7 +1148,7 @@
 	@./build/addenv.sh build/freeswitch.env LDFLAGS "$(AM_LDFLAGS) -lfreeswitch"
 	@./build/addenv.sh build/freeswitch.env CFLAGS "-Werror $(AM_CFLAGS)"
 	@./build/addenv.sh build/freeswitch.env CC "$(CC)"
-	@cd src/mod && for i in `cat ../../modules.conf | grep -v \#` ; do echo making install $$i ; $(PWD)/build/modmake.sh $(PWD) $$i install || exit 1; done
+	@cd src/mod && for i in `cat ../../modules.conf | grep -v \#` ; do echo making install $$i ; $(PWD)/build/modmake.sh $(MAKE) $(PWD) $$i install || exit 1; done
 	@rm -f build/freeswitch.env
 	@echo done
 

Modified: freeswitch/branches/tholo/build/buildlib.sh
==============================================================================
--- freeswitch/branches/tholo/build/buildlib.sh	(original)
+++ freeswitch/branches/tholo/build/buildlib.sh	Sat Sep 23 01:28:39 2006
@@ -13,9 +13,9 @@
     . $root/build/freeswitch.env
 fi
 
-if [ -z $MAKE ] ; then
+if [ -z "$MAKE" ] ; then
     make=`which gmake 2>/dev/null`
-    if [ -z $MAKE ] ; then
+    if [ -z "$MAKE" ] ; then
 	make=make
     fi
 fi
@@ -23,7 +23,7 @@
 install=
 base=http://svn.freeswitch.org/downloads/libs
 
-if [ ! -z $1 ] && [ $1 = install ] ; then
+if [ ! -z "$1" ] && [ "$1" = install ] ; then
     install=1
     shift
 fi

Modified: freeswitch/branches/tholo/build/modmake.sh
==============================================================================
--- freeswitch/branches/tholo/build/modmake.sh	(original)
+++ freeswitch/branches/tholo/build/modmake.sh	Sat Sep 23 01:28:39 2006
@@ -1,4 +1,7 @@
 #!/bin/sh
+
+make=$1
+shift
 pwd=$1
 shift
 mod=$1
@@ -8,14 +11,8 @@
     . $pwd/build/freeswitch.env
 fi
 
-make=`which gmake`
-
-if [ -z $make ] ; then
-    make=`which make`
-fi
-
 end=`echo $mod | sed "s/^.*\///g"`
-if [ -z $end ] ; then
+if [ -z "$end" ] ; then
     end=$mod
 fi
 

Modified: freeswitch/branches/tholo/libs/codec/g726/Makefile.am
==============================================================================
--- freeswitch/branches/tholo/libs/codec/g726/Makefile.am	(original)
+++ freeswitch/branches/tholo/libs/codec/g726/Makefile.am	Sat Sep 23 01:28:39 2006
@@ -1,7 +1,6 @@
 EXTRA_DIST =
 SUBDIRS = 
 AUTOMAKE_OPTS= gnu
-MAKE=gmake
 NAME=libg726
 
 AM_CC=gcc

Modified: freeswitch/branches/tholo/libs/codec/g726/Makefile.in
==============================================================================
--- freeswitch/branches/tholo/libs/codec/g726/Makefile.in	(original)
+++ freeswitch/branches/tholo/libs/codec/g726/Makefile.in	Sat Sep 23 01:28:39 2006
@@ -202,7 +202,6 @@
 EXTRA_DIST = 
 SUBDIRS = 
 AUTOMAKE_OPTS = gnu
-MAKE = gmake
 NAME = libg726
 AM_CC = gcc
 AM_CFLAGS = -Wall -O3 -funroll-loops

Modified: freeswitch/branches/tholo/libs/codec/g7xx/Makefile.am
==============================================================================
--- freeswitch/branches/tholo/libs/codec/g7xx/Makefile.am	(original)
+++ freeswitch/branches/tholo/libs/codec/g7xx/Makefile.am	Sat Sep 23 01:28:39 2006
@@ -1,6 +1,5 @@
 AM_CFLAGS	= -I./src/include -fPIC -O3 -Dsingle -funroll-loops -fomit-frame-pointer
 AUTOMAKE_OPTS	= gnu
-MAKE		= gmake
 NAME		= libg7xx
 lib_LTLIBRARIES		= libg7xx.la
 libg7xx_la_SOURCES	= src/g711.c src/g722_decode.c src/g722_encode.c src/g726.c

Modified: freeswitch/branches/tholo/libs/codec/g7xx/Makefile.in
==============================================================================
--- freeswitch/branches/tholo/libs/codec/g7xx/Makefile.in	(original)
+++ freeswitch/branches/tholo/libs/codec/g7xx/Makefile.in	Sat Sep 23 01:28:39 2006
@@ -193,7 +193,6 @@
 target_alias = @target_alias@
 AM_CFLAGS = -I./src/include -fPIC -O3 -Dsingle -funroll-loops -fomit-frame-pointer
 AUTOMAKE_OPTS = gnu
-MAKE = gmake
 NAME = libg7xx
 lib_LTLIBRARIES = libg7xx.la
 libg7xx_la_SOURCES = src/g711.c src/g722_decode.c src/g722_encode.c src/g726.c

Modified: freeswitch/branches/tholo/libs/codec/gsm/Makefile.am
==============================================================================
--- freeswitch/branches/tholo/libs/codec/gsm/Makefile.am	(original)
+++ freeswitch/branches/tholo/libs/codec/gsm/Makefile.am	Sat Sep 23 01:28:39 2006
@@ -1,7 +1,6 @@
 EXTRA_DIST =
 SUBDIRS = 
 AUTOMAKE_OPTS= gnu
-MAKE=gmake
 NAME=libgsm
 
 AM_CC=gcc

Modified: freeswitch/branches/tholo/libs/codec/gsm/Makefile.in
==============================================================================
--- freeswitch/branches/tholo/libs/codec/gsm/Makefile.in	(original)
+++ freeswitch/branches/tholo/libs/codec/gsm/Makefile.in	Sat Sep 23 01:28:39 2006
@@ -204,7 +204,6 @@
 EXTRA_DIST = 
 SUBDIRS = 
 AUTOMAKE_OPTS = gnu
-MAKE = gmake
 NAME = libgsm
 AM_CC = gcc
 AM_CFLAGS = -I./inc -DNeedFunctionPrototypes=1 -funroll-loops  -fPIC -DSASR -DNDEBUG -DWAV49

Modified: freeswitch/branches/tholo/libs/codec/ilbc/Makefile.am
==============================================================================
--- freeswitch/branches/tholo/libs/codec/ilbc/Makefile.am	(original)
+++ freeswitch/branches/tholo/libs/codec/ilbc/Makefile.am	Sat Sep 23 01:28:39 2006
@@ -1,7 +1,6 @@
 EXTRA_DIST =
 SUBDIRS = 
 AUTOMAKE_OPTS= gnu
-MAKE=gmake
 NAME=libilbc
 
 AM_CC=gcc

Modified: freeswitch/branches/tholo/libs/codec/ilbc/Makefile.in
==============================================================================
--- freeswitch/branches/tholo/libs/codec/ilbc/Makefile.in	(original)
+++ freeswitch/branches/tholo/libs/codec/ilbc/Makefile.in	Sat Sep 23 01:28:39 2006
@@ -209,7 +209,6 @@
 EXTRA_DIST = 
 SUBDIRS = 
 AUTOMAKE_OPTS = gnu
-MAKE = gmake
 NAME = libilbc
 AM_CC = gcc
 AM_CFLAGS = -Wall -O3 -funroll-loops

Modified: freeswitch/branches/tholo/libs/codec/lpc10/Makefile.am
==============================================================================
--- freeswitch/branches/tholo/libs/codec/lpc10/Makefile.am	(original)
+++ freeswitch/branches/tholo/libs/codec/lpc10/Makefile.am	Sat Sep 23 01:28:39 2006
@@ -1,7 +1,6 @@
 EXTRA_DIST =
 SUBDIRS = 
 AUTOMAKE_OPTS= gnu
-MAKE=gmake
 NAME=libg7xx
 
 AM_CC=gcc

Modified: freeswitch/branches/tholo/libs/codec/lpc10/Makefile.in
==============================================================================
--- freeswitch/branches/tholo/libs/codec/lpc10/Makefile.in	(original)
+++ freeswitch/branches/tholo/libs/codec/lpc10/Makefile.in	Sat Sep 23 01:28:39 2006
@@ -216,7 +216,6 @@
 EXTRA_DIST = 
 SUBDIRS = 
 AUTOMAKE_OPTS = gnu
-MAKE = gmake
 NAME = liblpc10
 AM_CC = gcc
 AM_CFLAGS = -Wall -O3 -funroll-loops

More information about the Freeswitch-branches mailing list