From 45fbc8d224b20336ef4afe3529b832a498898f89 Mon Sep 17 00:00:00 2001 From: Michael Jerris Date: Sun, 11 Mar 2007 06:49:21 +0000 Subject: [PATCH] merge a few more cleanups from my branch. More changes coming shortly. git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@4521 d0543943-73ff-0310-b7d9-9358b9ac24b2 --- Makefile.am | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/Makefile.am b/Makefile.am index e843af3df2..845d71cdb0 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,4 +1,5 @@ EXTRA_DIST = +SUBDIRS = AUTOMAKE_OPTS = gnu foreign NAME=freeswitch PREFIX=$(prefix) @@ -36,7 +37,7 @@ src/switch_stun.c\ src/switch_log.c\ src/switch_xml.c -library_includedir = $(PREFIX)/include +library_includedir = $(PREFIX)/include library_include_HEADERS = \ src/include/switch_am_config.h\ @@ -143,6 +144,10 @@ modules: $(NAME) @./build/addenv.sh build/freeswitch.env CFLAGS "$(AM_CFLAGS)" @./build/addenv.sh build/freeswitch.env CC "$(CC)" @./build/addenv.sh build/freeswitch.env CFGARGS "$(AM_CFGARGS)" + @./build/addenv.sh build/freeswitch.env LINK "$(LINK)" + @./build/addenv.sh build/freeswitch.env LTCOMPILE "$(LTCOMPILE)" + @./build/addenv.sh build/freeswitch.env LIBTOOL "$(LIBTOOL)" + @./build/addenv.sh build/freeswitch.env LTINSTALL "$(LTINSTALL)" @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 @@ -191,6 +196,10 @@ install_mod: modules @./build/addenv.sh build/freeswitch.env LDFLAGS "$(AM_LDFLAGS) -lfreeswitch" @./build/addenv.sh build/freeswitch.env CFLAGS "$(AM_CFLAGS)" @./build/addenv.sh build/freeswitch.env CC "$(CC)" + @./build/addenv.sh build/freeswitch.env LINK "$(LINK)" + @./build/addenv.sh build/freeswitch.env LTCOMPILE "$(LTCOMPILE)" + @./build/addenv.sh build/freeswitch.env LTINSTALL "$(LTINSTALL)" + @./build/addenv.sh build/freeswitch.env LIBTOOL "$(LIBTOOL)" @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