retronetworking
/
freeswitch
13
0
Fork 0
Code Pull Requests Releases Activity

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")

Merged from tholo's branch http://svn.freeswitch.org/svn/freeswitch/branches/tholo rev 2796, thanks tholo.

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@2815 d0543943-73ff-0310-b7d9-9358b9ac24b2
This commit is contained in:
Michael Jerris 2006-09-23 23:27:44 +00:00
parent 96e6e873bf
commit 50571597c5
14 changed files with 13 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Makefile.am
View File

@ -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 @@ modules: $(NAME)
@./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 @@ modclean:
@./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 @@ install_mod: modules
@./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

8
Makefile.in
View File

@ -243,8 +243,6 @@ target_alias = @target_alias@
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 @@ modules: $(NAME)
@./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 @@ modclean:
@./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 @@ install_mod: modules
@./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

6
build/buildlib.sh
View File

@ -13,9 +13,9 @@ if [ -f $root/build/freeswitch.env ] ; then
. $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 @@ fi
install=
base=http://svn.freeswitch.org/downloads/libs
if [ ! -z $1 ] && [ $1 = install ] ; then
if [ ! -z "$1" ] && [ "$1" = install ] ; then
install=1
shift
fi

11
build/modmake.sh
View File

@ -1,4 +1,7 @@
#!/bin/sh
make=$1
shift
pwd=$1
shift
mod=$1
@ -8,14 +11,8 @@ if [ -f $pwd/build/freeswitch.env ] ; then
. $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

1
libs/codec/g726/Makefile.am
View File

@ -1,7 +1,6 @@
EXTRA_DIST =
SUBDIRS =
AUTOMAKE_OPTS= gnu
MAKE=gmake
NAME=libg726
AM_CC=gcc

1
libs/codec/g726/Makefile.in
View File

@ -202,7 +202,6 @@ target_alias = @target_alias@
EXTRA_DIST =
SUBDIRS =
AUTOMAKE_OPTS = gnu
MAKE = gmake
NAME = libg726
AM_CC = gcc
AM_CFLAGS = -Wall -O3 -funroll-loops

1
libs/codec/g7xx/Makefile.am
View File

@ -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

1
libs/codec/g7xx/Makefile.in
View File

@ -193,7 +193,6 @@ sysconfdir = @sysconfdir@
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

1
libs/codec/gsm/Makefile.am
View File

@ -1,7 +1,6 @@
EXTRA_DIST =
SUBDIRS =
AUTOMAKE_OPTS= gnu
MAKE=gmake
NAME=libgsm
AM_CC=gcc

1
libs/codec/gsm/Makefile.in
View File

@ -204,7 +204,6 @@ target_alias = @target_alias@
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

1
libs/codec/ilbc/Makefile.am
View File

@ -1,7 +1,6 @@
EXTRA_DIST =
SUBDIRS =
AUTOMAKE_OPTS= gnu
MAKE=gmake
NAME=libilbc
AM_CC=gcc

1
libs/codec/ilbc/Makefile.in
View File

@ -209,7 +209,6 @@ target_alias = @target_alias@
EXTRA_DIST =
SUBDIRS =
AUTOMAKE_OPTS = gnu
MAKE = gmake
NAME = libilbc
AM_CC = gcc
AM_CFLAGS = -Wall -O3 -funroll-loops

1
libs/codec/lpc10/Makefile.am
View File

@ -1,7 +1,6 @@
EXTRA_DIST =
SUBDIRS =
AUTOMAKE_OPTS= gnu
MAKE=gmake
NAME=libg7xx
AM_CC=gcc

1
libs/codec/lpc10/Makefile.in
View File

@ -216,7 +216,6 @@ target_alias = @target_alias@
EXTRA_DIST =
SUBDIRS =
AUTOMAKE_OPTS = gnu
MAKE = gmake
NAME = liblpc10
AM_CC = gcc
AM_CFLAGS = -Wall -O3 -funroll-loops