Build system cleanup, initial piece of automatic build test system (thanks xachen)

minor mod- I kept build.sh in the root dir for now.

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@560 d0543943-73ff-0310-b7d9-9358b9ac24b2

diff --git a/Makefile.am b/Makefile.am
index 14beb1068a6a94527af9e3c238f2eb85e6ef4547..a54e0812d795fdbd4ff6339d3b2f7b71f18791cc 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -108,10 +108,10 @@ CLEANFILES = src/include/switch_version.h
 
 
 version: Makefile
-       ./checkversion.sh
+       ./build/checkversion.sh
 
 newversion: Makefile
-       ./checkversion.sh force
+       ./build/checkversion.sh force
        $(MAKE)
 
 .nodepends:
@@ -123,10 +123,10 @@ yesdepends:
        rm .nodepends
 
 .depend:
-       MAKE=$(MAKE) ./buildlib.sh . install sqlite-3.2.8.tar.gz --prefix=$(PREFIX) --disable-tcl --enable-threadsafe
-       MAKE=$(MAKE) ./buildlib.sh . install apr-1.2.2.tar.gz --prefix=$(PREFIX)
-       MAKE=$(MAKE) ./buildlib.sh . install apr-util-1.2.2.tar.gz --with-apr=../apr-1.2.2 --prefix=$(PREFIX)
-       MAKE=$(MAKE) ./buildlib.sh . libresample-0.1.3.tgz --prefix=$(PREFIX)
+       MAKE=$(MAKE) ./build/buildlib.sh . install sqlite-3.2.8.tar.gz --prefix=$(PREFIX) --disable-tcl --enable-threadsafe
+       MAKE=$(MAKE) ./build/buildlib.sh . install apr-1.2.2.tar.gz --prefix=$(PREFIX)
+       MAKE=$(MAKE) ./build/buildlib.sh . install apr-util-1.2.2.tar.gz --with-apr=../apr-1.2.2 --prefix=$(PREFIX)
+       MAKE=$(MAKE) ./build/buildlib.sh . libresample-0.1.3.tgz --prefix=$(PREFIX)
        cp libs/libresample-0.1.3/*.a $(PREFIX)/lib
        cp libs/libresample-0.1.3/include/* $(PREFIX)/include
        ranlib $(PREFIX)/lib/libresample.a
@@ -137,10 +137,10 @@ depends: .depend
 
 modules: $(NAME)
        @echo making modules
-       @cd src/mod && for i in `cat ../../modules.conf | grep -v \#` ; do echo making $$i ; MAKE=$(MAKE) DYLD_LIBRARY_PATH="$(PREFIX)/lib:$DYLD_LIBRARY_PATH" LD_LIBRARY_PATH="$(PREFIX)/lib:$LD_LIBRARY_PATH" PREFIX="$(PREFIX)" BASE="$(PWD)" OSARCH="$(OSARCH)" SOLINK="$(SOLINK)" LDFLAGS="$(AM_LDFLAGS) -lfreeswitch" CFLAGS="$(AM_CFLAGS)" CC="$(CC)" MOD="$$i" $(PWD)/modmake.sh $(PWD) $$i || exit 1; done
+       @cd src/mod && for i in `cat ../../modules.conf | grep -v \#` ; do echo making $$i ; MAKE=$(MAKE) DYLD_LIBRARY_PATH="$(PREFIX)/lib:$DYLD_LIBRARY_PATH" LD_LIBRARY_PATH="$(PREFIX)/lib:$LD_LIBRARY_PATH" PREFIX="$(PREFIX)" BASE="$(PWD)" OSARCH="$(OSARCH)" SOLINK="$(SOLINK)" LDFLAGS="$(AM_LDFLAGS) -lfreeswitch" CFLAGS="$(AM_CFLAGS)" CC="$(CC)" MOD="$$i" $(PWD)/build/modmake.sh $(PWD) $$i || exit 1; done
 
 modclean:
-       @cd src/mod && for i in `find . -type d -name mod_\*` ; do echo making clean $$i ; MAKE=$(MAKE) SOLINK="$(SOLINK)" CFLAGS="$(CFLAGS)" CC="$(CC)" MOD="$$i" $(PWD)/modmake.sh $(PWD) $$i clean || exit 1; done
+       @cd src/mod && for i in `find . -type d -name mod_\*` ; do echo making clean $$i ; MAKE=$(MAKE) SOLINK="$(SOLINK)" CFLAGS="$(CFLAGS)" CC="$(CC)" MOD="$$i" $(PWD)/build/modmake.sh $(PWD) $$i clean || exit 1; done
 
 everything: install install_mod
 
@@ -156,7 +156,7 @@ install_mod: modules
        @mkdir -p $(PREFIX) $(PREFIX)/conf $(PREFIX)/mod $(PREFIX)/db $(PREFIX)/bin
        @if [ -f .libs/$(NAME) ] ; then /bin/cp -p .libs/$(NAME) $(PREFIX)/bin ; else /bin/cp -p ./$(NAME) $(PREFIX)/bin ; fi
        @echo Installing Modules
-       @cd src/mod && for i in `cat ../../modules.conf | grep -v \#` ; do echo making clean $$i ; PREFIX=$(PREFIX) MOD="$$i" $(PWD)/modmake.sh $(PWD) $$i install || exit 1; done
+       @cd src/mod && for i in `cat ../../modules.conf | grep -v \#` ; do echo making clean $$i ; PREFIX=$(PREFIX) MOD="$$i" $(PWD)/build/modmake.sh $(PWD) $$i install || exit 1; done
        @echo done
 
 dox:

diff --git a/Makefile.in b/Makefile.in
index 12060548752cb0b6ef53538ca6135e24aa161ae7..e17c839031827ce100671addeec5ab0d5a6d9fff 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -984,10 +984,10 @@ uninstall-info: uninstall-info-recursive
 
 
 version: Makefile
-       ./checkversion.sh
+       ./build/checkversion.sh
 
 newversion: Makefile
-       ./checkversion.sh force
+       ./build/checkversion.sh force
        $(MAKE)
 
 .nodepends:
@@ -999,10 +999,10 @@ yesdepends:
        rm .nodepends
 
 .depend:
-       MAKE=$(MAKE) ./buildlib.sh . install sqlite-3.2.8.tar.gz --prefix=$(PREFIX) --disable-tcl --enable-threadsafe
-       MAKE=$(MAKE) ./buildlib.sh . install apr-1.2.2.tar.gz --prefix=$(PREFIX)
-       MAKE=$(MAKE) ./buildlib.sh . install apr-util-1.2.2.tar.gz --with-apr=../apr-1.2.2 --prefix=$(PREFIX)
-       MAKE=$(MAKE) ./buildlib.sh . libresample-0.1.3.tgz --prefix=$(PREFIX)
+       MAKE=$(MAKE) ./build/buildlib.sh . install sqlite-3.2.8.tar.gz --prefix=$(PREFIX) --disable-tcl --enable-threadsafe
+       MAKE=$(MAKE) ./build/buildlib.sh . install apr-1.2.2.tar.gz --prefix=$(PREFIX)
+       MAKE=$(MAKE) ./build/buildlib.sh . install apr-util-1.2.2.tar.gz --with-apr=../apr-1.2.2 --prefix=$(PREFIX)
+       MAKE=$(MAKE) ./build/buildlib.sh . libresample-0.1.3.tgz --prefix=$(PREFIX)
        cp libs/libresample-0.1.3/*.a $(PREFIX)/lib
        cp libs/libresample-0.1.3/include/* $(PREFIX)/include
        ranlib $(PREFIX)/lib/libresample.a
@@ -1012,10 +1012,10 @@ depends: .depend
 
 modules: $(NAME)
        @echo making modules
-       @cd src/mod && for i in `cat ../../modules.conf | grep -v \#` ; do echo making $$i ; MAKE=$(MAKE) DYLD_LIBRARY_PATH="$(PREFIX)/lib:$DYLD_LIBRARY_PATH" LD_LIBRARY_PATH="$(PREFIX)/lib:$LD_LIBRARY_PATH" PREFIX="$(PREFIX)" BASE="$(PWD)" OSARCH="$(OSARCH)" SOLINK="$(SOLINK)" LDFLAGS="$(AM_LDFLAGS) -lfreeswitch" CFLAGS="$(AM_CFLAGS)" CC="$(CC)" MOD="$$i" $(PWD)/modmake.sh $(PWD) $$i || exit 1; done
+       @cd src/mod && for i in `cat ../../modules.conf | grep -v \#` ; do echo making $$i ; MAKE=$(MAKE) DYLD_LIBRARY_PATH="$(PREFIX)/lib:$DYLD_LIBRARY_PATH" LD_LIBRARY_PATH="$(PREFIX)/lib:$LD_LIBRARY_PATH" PREFIX="$(PREFIX)" BASE="$(PWD)" OSARCH="$(OSARCH)" SOLINK="$(SOLINK)" LDFLAGS="$(AM_LDFLAGS) -lfreeswitch" CFLAGS="$(AM_CFLAGS)" CC="$(CC)" MOD="$$i" $(PWD)/build/modmake.sh $(PWD) $$i || exit 1; done
 
 modclean:
-       @cd src/mod && for i in `find . -type d -name mod_\*` ; do echo making clean $$i ; MAKE=$(MAKE) SOLINK="$(SOLINK)" CFLAGS="$(CFLAGS)" CC="$(CC)" MOD="$$i" $(PWD)/modmake.sh $(PWD) $$i clean || exit 1; done
+       @cd src/mod && for i in `find . -type d -name mod_\*` ; do echo making clean $$i ; MAKE=$(MAKE) SOLINK="$(SOLINK)" CFLAGS="$(CFLAGS)" CC="$(CC)" MOD="$$i" $(PWD)/build/modmake.sh $(PWD) $$i clean || exit 1; done
 
 everything: install install_mod
 
@@ -1031,7 +1031,7 @@ install_mod: modules
        @mkdir -p $(PREFIX) $(PREFIX)/conf $(PREFIX)/mod $(PREFIX)/db $(PREFIX)/bin
        @if [ -f .libs/$(NAME) ] ; then /bin/cp -p .libs/$(NAME) $(PREFIX)/bin ; else /bin/cp -p ./$(NAME) $(PREFIX)/bin ; fi
        @echo Installing Modules
-       @cd src/mod && for i in `cat ../../modules.conf | grep -v \#` ; do echo making clean $$i ; PREFIX=$(PREFIX) MOD="$$i" $(PWD)/modmake.sh $(PWD) $$i install || exit 1; done
+       @cd src/mod && for i in `cat ../../modules.conf | grep -v \#` ; do echo making clean $$i ; PREFIX=$(PREFIX) MOD="$$i" $(PWD)/build/modmake.sh $(PWD) $$i install || exit 1; done
        @echo done
 
 dox:

diff --git a/build/build.sh b/build/build.sh
new file mode 100755 (executable)
index 0000000..864dbea
--- /dev/null
+++ b/build/build.sh
@@ -0,0 +1 @@
+cd .. && make depends && make install modules install_mod 

diff --git a/buildlib.sh b/build/buildlib.sh
similarity index 100%
rename from buildlib.sh
rename to build/buildlib.sh

diff --git a/checkversion.sh b/build/checkversion.sh
similarity index 100%
rename from checkversion.sh
rename to build/checkversion.sh

diff --git a/modmake.sh b/build/modmake.sh
similarity index 100%
rename from modmake.sh
rename to build/modmake.sh

diff --git a/build/thisbuild-init.sh b/build/thisbuild-init.sh
new file mode 100755 (executable)
index 0000000..fcebfa6
--- /dev/null
+++ b/build/thisbuild-init.sh
@@ -0,0 +1,11 @@
+#!/bin/sh
+
+# This script is used so the thisbuild compile project can have multiple
+# architectures compile the software to check portability. Please leave
+# this file in tact! - Justin
+
+./build.sh 2>&1
+ojnk=$?
+
+echo "Return Code: $ojnk"
+

diff --git a/src/mod/codecs/mod_g729/Makefile b/src/mod/codecs/mod_g729/Makefile
index 74f1c384f99f8f490c5e1195215243d61c1a6c1e..41f9ed7fe7eea471871b410cbd811e42dd5fe0d7 100644 (file)
--- a/src/mod/codecs/mod_g729/Makefile
+++ b/src/mod/codecs/mod_g729/Makefile
@@ -4,7 +4,7 @@ LDFLAGS +=-lg729
 all:   depends $(MODNAME).so
 
 depends:
-       MAKE=$(MAKE) $(BASE)/buildlib.sh $(BASE) install codec/libg729 --prefix=$(PREFIX)
+       MAKE=$(MAKE) $(BASE)/build/buildlib.sh $(BASE) install codec/libg729 --prefix=$(PREFIX)
 
 $(MODNAME).so: $(MODNAME).c
        $(CC) $(CFLAGS) -fPIC -c $(MODNAME).c -o $(MODNAME).o

diff --git a/src/mod/codecs/mod_gsm/Makefile b/src/mod/codecs/mod_gsm/Makefile
index b8e3538d1ba764601002d1e141f6614fc7a72f17..ecde72dba7d69a069b1aaa86f65a22092734cb5d 100644 (file)
--- a/src/mod/codecs/mod_gsm/Makefile
+++ b/src/mod/codecs/mod_gsm/Makefile
@@ -3,7 +3,7 @@ LDFLAGS +=-lgsm
 all:   depends $(MODNAME).so
 
 depends:
-       MAKE=$(MAKE) $(BASE)/buildlib.sh $(BASE) install codec/gsm --prefix=$(PREFIX)
+       MAKE=$(MAKE) $(BASE)/build/buildlib.sh $(BASE) install codec/gsm --prefix=$(PREFIX)
 
 $(MODNAME).so: $(MODNAME).c
        $(CC) $(CFLAGS) -fPIC -c $(MODNAME).c -o $(MODNAME).o

diff --git a/src/mod/codecs/mod_ilbc/Makefile b/src/mod/codecs/mod_ilbc/Makefile
index 4d14a5647e7b2dd177d13bf36336541ed7399cf3..d0bb991cb6252cc4bb002dcfb612cd8b10131500 100644 (file)
--- a/src/mod/codecs/mod_ilbc/Makefile
+++ b/src/mod/codecs/mod_ilbc/Makefile
@@ -3,7 +3,7 @@ LDFLAGS +=-lilbc
 all:   depends $(MODNAME).so
 
 depends:
-       MAKE=$(MAKE) $(BASE)/buildlib.sh $(BASE) install codec/ilbc --prefix=$(PREFIX)
+       MAKE=$(MAKE) $(BASE)/build/buildlib.sh $(BASE) install codec/ilbc --prefix=$(PREFIX)
 
 $(MODNAME).so: $(MODNAME).c
        $(CC) $(CFLAGS) -fPIC -c $(MODNAME).c -o $(MODNAME).o

diff --git a/src/mod/codecs/mod_speex/Makefile b/src/mod/codecs/mod_speex/Makefile
index 785c07bcfec709dbe4f3fbb67472a8ffa94c245b..48a0222b43001edb1dd804d18e72ef03757b576b 100644 (file)
--- a/src/mod/codecs/mod_speex/Makefile
+++ b/src/mod/codecs/mod_speex/Makefile
@@ -1,7 +1,7 @@
 all:   depends $(MODNAME).so
 
 depends:
-       MAKE=$(MAKE) $(BASE)/buildlib.sh $(BASE) install speex-1.1.11.1.tar.gz --prefix=$(PREFIX)
+       MAKE=$(MAKE) $(BASE)/build/buildlib.sh $(BASE) install speex-1.1.11.1.tar.gz --prefix=$(PREFIX)
 
 $(MODNAME).so: $(MODNAME).c
        $(CC) $(CFLAGS) -fPIC -c $(MODNAME).c -o $(MODNAME).o

diff --git a/src/mod/dialplans/mod_pcre/Makefile b/src/mod/dialplans/mod_pcre/Makefile
index bdad22b6bcea450f4c370a5515a8a8bc7074977e..14ab8522153deaf2a56ef5b348d961ddbcc895bd 100644 (file)
--- a/src/mod/dialplans/mod_pcre/Makefile
+++ b/src/mod/dialplans/mod_pcre/Makefile
@@ -3,7 +3,7 @@ LDFLAGS += -lpcre -L/usr/local/lib
 all:   depends $(MODNAME).so
 
 depends:
-       MAKE=$(MAKE) $(BASE)/buildlib.sh $(BASE) install pcre-6.4.tar.gz --prefix=$(PREFIX)
+       MAKE=$(MAKE) $(BASE)/build/buildlib.sh $(BASE) install pcre-6.4.tar.gz --prefix=$(PREFIX)
 
 $(MODNAME).so: $(MODNAME).c
        $(CC) $(CFLAGS) -fPIC -c $(MODNAME).c -o $(MODNAME).o 

diff --git a/src/mod/endpoints/mod_exosip/Makefile b/src/mod/endpoints/mod_exosip/Makefile
index 9299735eeb8ab4e9bc330eb49854dbe047f77813..1ccf2e3f00f4aa985d736043ad5d0594b736f73b 100644 (file)
--- a/src/mod/endpoints/mod_exosip/Makefile
+++ b/src/mod/endpoints/mod_exosip/Makefile
@@ -10,9 +10,9 @@ endif
 all:   depends $(MODNAME).so
 
 depends:
-       MAKE=$(MAKE) $(BASE)/buildlib.sh $(BASE) install jrtplib --prefix=$(PREFIX) --disable-gst
-       MAKE=$(MAKE) $(BASE)/buildlib.sh $(BASE) install libosip2-2.2.2.tar.gz --prefix=$(PREFIX)
-       MAKE=$(MAKE) $(BASE)/buildlib.sh $(BASE) install libeXosip2-2.2.2.tar.gz --disable-josua --prefix=$(PREFIX)
+       MAKE=$(MAKE) $(BASE)/build/buildlib.sh $(BASE) install jrtplib --prefix=$(PREFIX) --disable-gst
+       MAKE=$(MAKE) $(BASE)/build/buildlib.sh $(BASE) install libosip2-2.2.2.tar.gz --prefix=$(PREFIX)
+       MAKE=$(MAKE) $(BASE)/build/buildlib.sh $(BASE) install libeXosip2-2.2.2.tar.gz --disable-josua --prefix=$(PREFIX)
 
 
 $(MODNAME).so: $(MODNAME).c

diff --git a/src/mod/endpoints/mod_iax/Makefile b/src/mod/endpoints/mod_iax/Makefile
index fd355e65fac1f5ab4eb81b1f4d26c3a6788eb67d..33feebad9efb73ab5ad8dab2443801ef7cf65921 100644 (file)
--- a/src/mod/endpoints/mod_iax/Makefile
+++ b/src/mod/endpoints/mod_iax/Makefile
@@ -3,7 +3,7 @@ LDFLAGS += -liax -L/usr/local/lib
 all:   depends $(MODNAME).so
 
 depends:
-       MAKE=$(MAKE) $(BASE)/buildlib.sh $(BASE) install iax --enable-newjb --prefix=$(PREFIX)
+       MAKE=$(MAKE) $(BASE)/build/buildlib.sh $(BASE) install iax --enable-newjb --prefix=$(PREFIX)
 
 $(MODNAME).so: $(MODNAME).c
        $(CC) $(CFLAGS) -fPIC -c $(MODNAME).c -o $(MODNAME).o 

diff --git a/src/mod/endpoints/mod_portaudio/Makefile b/src/mod/endpoints/mod_portaudio/Makefile
index 732a9d1da8e8dd6d09ba09163a293f4dd484e634..a46332cdb2f77c230e237999fc236b650cf532a7 100644 (file)
--- a/src/mod/endpoints/mod_portaudio/Makefile
+++ b/src/mod/endpoints/mod_portaudio/Makefile
@@ -4,7 +4,7 @@ MYOBJS = pablio.o ringbuffer.o
 all:   depends $(MODNAME).so
 
 depends:
-       MAKE=$(MAKE) $(BASE)/buildlib.sh $(BASE) install portaudio.tar.gz --prefix=$(PREFIX)
+       MAKE=$(MAKE) $(BASE)/build/buildlib.sh $(BASE) install portaudio.tar.gz --prefix=$(PREFIX)
 %.o:  %.c
        $(CC) -fPIC $(CFLAGS) -c -o $@ $<
 

diff --git a/src/mod/event_handlers/mod_xmpp_event/Makefile b/src/mod/event_handlers/mod_xmpp_event/Makefile
index af038f7248f807d27d44ead896b59c0ad483603f..7716982650bf844749e0d1ab4ac44c5b7c2656c5 100644 (file)
--- a/src/mod/event_handlers/mod_xmpp_event/Makefile
+++ b/src/mod/event_handlers/mod_xmpp_event/Makefile
@@ -3,7 +3,7 @@ LDFLAGS += -liksemel -L/usr/local/lib
 all:   depends $(MODNAME).so
 
 depends:
-       MAKE=$(MAKE) $(BASE)/buildlib.sh $(BASE) install iksemel-1.2.tar.gz --prefix=$(PREFIX)
+       MAKE=$(MAKE) $(BASE)/build/buildlib.sh $(BASE) install iksemel-1.2.tar.gz --prefix=$(PREFIX)
 
 $(MODNAME).so: $(MODNAME).c
        $(CC) $(CFLAGS) -fPIC -c $(MODNAME).c -o $(MODNAME).o 

diff --git a/src/mod/formats/mod_sndfile/Makefile b/src/mod/formats/mod_sndfile/Makefile
index 56649b478df1df601e4dda3692f83f9283aad7cd..1eb595d036d34b8a86fab2c1f9d3c267ae3ecf64 100644 (file)
--- a/src/mod/formats/mod_sndfile/Makefile
+++ b/src/mod/formats/mod_sndfile/Makefile
@@ -3,7 +3,7 @@ LDFLAGS += -lsndfile -L/usr/local/lib
 all:   depends $(MODNAME).so
 
 depends:
-       MAKE=$(MAKE) $(BASE)/buildlib.sh $(BASE) install libsndfile-1.0.12.tar.gz --prefix=$(PREFIX)
+       MAKE=$(MAKE) $(BASE)/build/buildlib.sh $(BASE) install libsndfile-1.0.12.tar.gz --prefix=$(PREFIX)
 
 $(MODNAME).so: $(MODNAME).c
        $(CC) $(CFLAGS) -fPIC -c $(MODNAME).c -o $(MODNAME).o