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
This commit is contained in:
Michael Jerris 2007-03-11 06:49:21 +00:00
parent 18cf58db24
commit 45fbc8d224
1 changed files with 10 additions and 1 deletions

View File

@ -1,4 +1,5 @@
EXTRA_DIST = EXTRA_DIST =
SUBDIRS =
AUTOMAKE_OPTS = gnu foreign AUTOMAKE_OPTS = gnu foreign
NAME=freeswitch NAME=freeswitch
PREFIX=$(prefix) PREFIX=$(prefix)
@ -36,7 +37,7 @@ src/switch_stun.c\
src/switch_log.c\ src/switch_log.c\
src/switch_xml.c src/switch_xml.c
library_includedir = $(PREFIX)/include library_includedir = $(PREFIX)/include
library_include_HEADERS = \ library_include_HEADERS = \
src/include/switch_am_config.h\ 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 CFLAGS "$(AM_CFLAGS)"
@./build/addenv.sh build/freeswitch.env CC "$(CC)" @./build/addenv.sh build/freeswitch.env CC "$(CC)"
@./build/addenv.sh build/freeswitch.env CFGARGS "$(AM_CFGARGS)" @./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 @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 @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 LDFLAGS "$(AM_LDFLAGS) -lfreeswitch"
@./build/addenv.sh build/freeswitch.env CFLAGS "$(AM_CFLAGS)" @./build/addenv.sh build/freeswitch.env CFLAGS "$(AM_CFLAGS)"
@./build/addenv.sh build/freeswitch.env CC "$(CC)" @./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 @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 @rm -f build/freeswitch.env
@echo done @echo done