From d4f2f2f363cf6041778b809bc726ad976c454bd1 Mon Sep 17 00:00:00 2001 From: Anthony Minessale Date: Tue, 13 Dec 2005 21:14:06 +0000 Subject: [PATCH] update git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@135 d0543943-73ff-0310-b7d9-9358b9ac24b2 --- Makefile.am | 2 +- Makefile.in | 2 +- generic_mod.mk => generic_mod.Linux.mk | 0 modmake.Linux.sh => modmake.sh | 2 +- 4 files changed, 3 insertions(+), 3 deletions(-) rename generic_mod.mk => generic_mod.Linux.mk (100%) rename modmake.Linux.sh => modmake.sh (76%) diff --git a/Makefile.am b/Makefile.am index c714497b57..d6ea4b4f8e 100644 --- a/Makefile.am +++ b/Makefile.am @@ -77,7 +77,7 @@ freeswitch_LDFLAGS = -static -lfreeswitch modules: $(NAME) @echo making modules - @cd src/mod && for i in $(shell cat modules.conf | grep -v \#) ; do echo making $$i ; LDFLAGS="$(AM_LDFLAGS) -lfreeswitch" CFLAGS="$(AM_CFLAGS)" CC="$(CC)" MOD="$$i" $(PWD)/modmake.`uname -s`.sh $(PWD) $$i || exit 1; done + @cd src/mod && for i in $(shell cat modules.conf | grep -v \#) ; do echo making $$i ; 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 [a-z]* ; do echo making clean $$i ; CFLAGS="$(CFLAGS)" CC="$(CC)" MOD="$$i" make -f $(PWD)/generic_mod.mk -C $$i clean || exit 1; done diff --git a/Makefile.in b/Makefile.in index 5822963584..6931eabf49 100644 --- a/Makefile.in +++ b/Makefile.in @@ -934,7 +934,7 @@ uninstall-info: uninstall-info-recursive modules: $(NAME) @echo making modules - @cd src/mod && for i in $(shell cat modules.conf | grep -v \#) ; do echo making $$i ; LDFLAGS="$(AM_LDFLAGS) -lfreeswitch" CFLAGS="$(AM_CFLAGS)" CC="$(CC)" MOD="$$i" $(PWD)/modmake.`uname -s`.sh $(PWD) $$i || exit 1; done + @cd src/mod && for i in $(shell cat modules.conf | grep -v \#) ; do echo making $$i ; 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 [a-z]* ; do echo making clean $$i ; CFLAGS="$(CFLAGS)" CC="$(CC)" MOD="$$i" make -f $(PWD)/generic_mod.mk -C $$i clean || exit 1; done diff --git a/generic_mod.mk b/generic_mod.Linux.mk similarity index 100% rename from generic_mod.mk rename to generic_mod.Linux.mk diff --git a/modmake.Linux.sh b/modmake.sh similarity index 76% rename from modmake.Linux.sh rename to modmake.sh index 8b582feb75..a56b16b5c5 100755 --- a/modmake.Linux.sh +++ b/modmake.sh @@ -13,6 +13,6 @@ fi if [ -f $mod/Makefile ] ; then $make -C $mod else -$make -f $pwd/generic_mod.mk -C $mod +$make -f $pwd/generic_mod.`uname -s`.mk -C $mod fi