tweaks

diff --git a/build/Makefile.centos5 b/build/Makefile.centos5
index 17986156a23bbc9292296d97559d94bca5426aea..66ab2e79a53f12845aa69a75cd8147d6eb6f9b40 100644 (file)
--- a/build/Makefile.centos5
+++ b/build/Makefile.centos5
@@ -13,7 +13,7 @@ JPEG=v8d
 OPENSSL=1.0.1g
 SQLITE=autoconf-3080403
 PCRE=8.35
-CURL=7.36.0
+CURL=7.35.0
 SPEEX=1.2rc1
 LIBEDIT=20140213-3.1
 LDNS=1.6.17
@@ -33,64 +33,66 @@ freeswitch.git/bootstrap.sh: has-git
 install: freeswitch
        cd freeswitch.git && make install
 
-install-git:
-       rpm -i http://apt.sw.be/redhat/el5/en/x86_64/rpmforge/RPMS/rpmforge-release-0.3.6-1.el5.rf.x86_64.rpm
+install-git: .done
+.done:
+       rpm -i http://apt.sw.be/redhat/el5/en/x86_64/rpmforge/RPMS/rpmforge-release-0.3.6-1.el5.rf.x86_64.rpm || true
        yum update -y
        yum install -y git gcc-c++ wget ncurses-devel zlib-devel e2fsprogs-devel libtool automake autoconf
+       touch .done
 
-has-git: 
+has-git:
        @git --version || (echo "please install git by running 'make install-git'" && false)
 
 clean:
        @rm -rf openssl* ldns* jpeg* pcre* perl* pkg-config* speex* sqlite* libedit* curl* *~
        (cd freeswitch.git && git clean -fdx && git reset --hard HEAD && git pull)
 
-libjpeg: jpeg-8d/Makefile
+libjpeg: jpeg-8d/.done
 
-jpeg-8d/Makefile:
+jpeg-8d/.done:
        (test -d jpeg-8d) || (wget -4 -O jpegsrc.$(JPEG).tar.gz http://www.ijg.org/files/jpegsrc.$(JPEG).tar.gz && tar zxfv jpegsrc.$(JPEG).tar.gz)
-       (cd jpeg-8d && ./configure --prefix=$(PREFIX) && make && sudo make install)
+       (cd jpeg-8d && ./configure --prefix=$(PREFIX) && make && sudo make install && touch .done)
 
-openssl: openssl-$(OPENSSL)/Makefile
-openssl-$(OPENSSL)/Makefile: openssl-$(OPENSSL)
+openssl: openssl-$(OPENSSL)/.done
+openssl-$(OPENSSL)/.done: openssl-$(OPENSSL)
 openssl-$(OPENSSL):
        (test -d $@) || (wget -4 -O $@.tar.gz http://www.openssl.org/source/$@.tar.gz && tar zxfv $@.tar.gz)
-       (cd $@ && ./Configure --prefix=$(PREFIX) linux-x86_64 shared && make && sudo make install)
+       (cd $@ && ./Configure --prefix=$(PREFIX) linux-x86_64 shared && make && sudo make install && touch .done)
 
-sqlite: sqlite-$(SQLITE)/Makefile
-sqlite-$(SQLITE)/Makefile: sqlite-$(SQLITE)
+sqlite: sqlite-$(SQLITE)/.done
+sqlite-$(SQLITE)/.done: sqlite-$(SQLITE)
 sqlite-$(SQLITE):
        (test -d $@) || (wget -4 -O $@.tar.gz http://www.sqlite.org/2014/$@.tar.gz && tar zxfv $@.tar.gz)
-       (cd $@ && ./configure --prefix=$(PREFIX) && make && sudo make install)
+       (cd $@ && ./configure --prefix=$(PREFIX) && make && sudo make install && touch .done_sqlite && touch .done)
 
-pcre: pcre-$(PCRE)/Makefile
-pcre-$(PCRE)/Makefile: pcre-$(PCRE)
+pcre: pcre-$(PCRE)/.done
+pcre-$(PCRE)/.done: pcre-$(PCRE)
 pcre-$(PCRE):
        (test -d $@) || (wget -4 -O $@.tar.gz http://downloads.sourceforge.net/project/pcre/pcre/$(PCRE)/$@.tar.gz && tar zxfv $@.tar.gz)
-       (cd $@ && ./configure --prefix=$(PREFIX) && make && sudo make install)
+       (cd $@ && ./configure --prefix=$(PREFIX) && make && sudo make install && touch .done)
 
-curl: curl-$(CURL)/Makefile
-curl-$(CURL)/Makefile: curl-$(CURL)
+curl: curl-$(CURL)/.done
+curl-$(CURL)/.done: curl-$(CURL)
 curl-$(CURL):
-       (test -d $@) || (wget -4 -O $@.tar.gz http://www.execve.net/curl/$@.tar.gz && tar zxfv $@.tar.gz)
-       (cd $@ && ./configure --prefix=$(PREFIX) && make && sudo make install)
+       (test -d $@) || (wget -4 -O $@.tar.gz http://files.freeswitch.org/downloads/libs/$@.tar.gz && tar zxfv $@.tar.gz)
+       (cd $@ && ./configure --prefix=$(PREFIX) && make && sudo make install && touch .done)
 
-speex: speex-$(SPEEX)/Makefile
-speex-$(SPEEX)/Makefile: speex-$(SPEEX)
+speex: speex-$(SPEEX)/.done
+speex-$(SPEEX)/.done: speex-$(SPEEX)
 speex-$(SPEEX):
        (test -d $@) || (wget -4 -O $@.tar.gz http://downloads.xiph.org/releases/speex/$@.tar.gz && tar zxfv $@.tar.gz)
-       (cd $@ && ./configure --prefix=$(PREFIX) && make && sudo make install)
+       (cd $@ && ./configure --prefix=$(PREFIX) && make && sudo make install && touch .done)
 
-libedit: libedit-$(LIBEDIT)/Makefile
-libedit-$(LIBEDIT)/Makefile: libedit-$(LIBEDIT)
+libedit: libedit-$(LIBEDIT)/.done
+libedit-$(LIBEDIT)/.done: libedit-$(LIBEDIT)
 libedit-$(LIBEDIT):
        (test -d $@) || (wget -4 -O $@.tar.gz http://thrysoee.dk/editline/$@.tar.gz && tar zxfv $@.tar.gz)
-       (cd $@ && ./configure --prefix=$(PREFIX) && make && sudo make install)
+       (cd $@ && ./configure --prefix=$(PREFIX) && make && sudo make install && touch .done)
 
-ldns: ldns-$(LDNS)/Makefile
-ldns-$(LDNS)/Makefile: openssl ldns-$(LDNS)
+ldns: ldns-$(LDNS)/.done
+ldns-$(LDNS)/.done: ldns-$(LDNS)
 ldns-$(LDNS):
        (test -d $@) || (wget -4 -O $@.tar.gz http://www.nlnetlabs.nl/downloads/ldns/$@.tar.gz && tar zxfv $@.tar.gz)
-       (cd $@ && ./configure --with-ssl=$(PREFIX) --prefix=$(PREFIX) && make && sudo make install)
+       (cd $@ && ./configure --with-ssl=$(PREFIX) --prefix=$(PREFIX) && make && sudo make install && touch .done)
 
 deps: libjpeg openssl sqlite pcre curl speex libedit ldns

diff --git a/build/Makefile.solaris11 b/build/Makefile.solaris11
index 2a2da59e7f559c8695c01f72e42dd28bb4e76a97..eaaf686b6821db72f629e43d0ed13f62c86b9b94 100644 (file)
--- a/build/Makefile.solaris11
+++ b/build/Makefile.solaris11
@@ -12,7 +12,7 @@ JP=v8d
 SSL=1.0.1h
 SQLITE=autoconf-3080403
 PCRE=8.35
-CURL=7.36.0
+CURL=7.35.0
 SPEEX=1.2rc1
 LIBEDIT=20140213-3.1
 LDNS=1.6.17
@@ -45,64 +45,65 @@ clean:
        @rm -rf openssl* ldns* jpeg* pcre* perl* pkg-config* speex* sqlite* libedit* curl* *~
        (cd freeswitch.git && git clean -fdx && git reset --hard HEAD && git pull)
 
-libjpeg: jpeg-8d/Makefile
+libjpeg: jpeg-8d/.done
 
-jpeg-8d/Makefile:
+jpeg-8d/.done:
        (test -d jpeg-8d) || (wget -4 -O jpegsrc.$(JP).tar.gz http://www.ijg.org/files/jpegsrc.$(JP).tar.gz && tar zxfv jpegsrc.$(JP).tar.gz)
-       (cd jpeg-8d && CFLAGS=-m64 LDFLAGS=-m64 ./configure --prefix=$(PREFIX) && gmake && sudo gmake install)
+       (cd jpeg-8d && CFLAGS=-m64 LDFLAGS=-m64 ./configure --prefix=$(PREFIX) && gmake && sudo gmake install && touch .done)
 
-openssl: openssl-$(SSL)/Makefile
-openssl-$(SSL)/Makefile: openssl-$(SSL)
+openssl: openssl-$(SSL)/.done
+openssl-$(SSL)/.done: openssl-$(SSL)
 openssl-$(SSL):
        (test -d $@) || (wget -4 -O $@.tar.gz http://www.openssl.org/source/$@.tar.gz && tar zxfv $@.tar.gz)
-       (cd $@ && CFLAGS=-m64 LDFLAGS=-m64 ./Configure --prefix=$(PREFIX) solaris64-x86_64-gcc shared && gmake && sudo gmake install)
+       (cd $@ && CFLAGS=-m64 LDFLAGS=-m64 ./Configure --prefix=$(PREFIX) solaris64-x86_64-gcc shared && gmake && sudo gmake install && touch .done)
 
-sqlite: sqlite-$(SQLITE)/Makefile
-sqlite-$(SQLITE)/Makefile: sqlite-$(SQLITE)
+sqlite: sqlite-$(SQLITE)/.done
+sqlite-$(SQLITE)/.done: sqlite-$(SQLITE)
 sqlite-$(SQLITE):
        (test -d $@) || (wget -4 -O $@.tar.gz http://www.sqlite.org/2014/$@.tar.gz && tar zxfv $@.tar.gz)
-       (cd $@ && CFLAGS=-m64 LDFLAGS=-m64 ./configure --prefix=$(PREFIX) && gmake && sudo gmake install)
+       (cd $@ && CFLAGS=-m64 LDFLAGS=-m64 ./configure --prefix=$(PREFIX) && gmake && sudo gmake install && touch .done)
 
-pcre: pcre-$(PCRE)/Makefile
-pcre-$(PCRE)/Makefile: pcre-$(PCRE)
+pcre: pcre-$(PCRE)/.done
+pcre-$(PCRE)/.done: pcre-$(PCRE)
 pcre-$(PCRE):
        (test -d $@) || (wget -4 -O $@.tar.gz http://downloads.sourceforge.net/project/pcre/pcre/$(PCRE)/$@.tar.gz && tar zxfv $@.tar.gz)
-       (cd $@ && CXXFLAGS=-m64 CFLAGS=-m64 LDFLAGS=-m64 ./configure --prefix=$(PREFIX) && gmake && sudo gmake install)
+       (cd $@ && CXXFLAGS=-m64 CFLAGS=-m64 LDFLAGS=-m64 ./configure --prefix=$(PREFIX) && gmake && sudo gmake install && touch .done)
 
-curl: curl-$(CURL)/Makefile
-curl-$(CURL)/Makefile: curl-$(CURL)
+curl: curl-$(CURL)/.done
+curl-$(CURL)/.done: curl-$(CURL)
 curl-$(CURL):
-       (test -d $@) || (wget -4 -O $@.tar.gz http://www.execve.net/curl/$@.tar.gz && tar zxfv $@.tar.gz)
-       (cd $@ && CFLAGS=-m64 LDFLAGS=-m64 ./configure --prefix=$(PREFIX) && gmake && sudo gmake install)
+       (test -d $@) || (wget -4 -O $@.tar.gz http://files.freeswitch.org/downloads/libs/$@.tar.gz && tar zxfv $@.tar.gz)
+       (cd $@ && CFLAGS=-m64 LDFLAGS=-m64 ./configure --prefix=$(PREFIX) && gmake && sudo gmake install && touch .done)
 
-speex: speex-$(SPEEX)/Makefile
-speex-$(SPEEX)/Makefile: speex-$(SPEEX)
+speex: speex-$(SPEEX)/.done
+speex-$(SPEEX)/.done: speex-$(SPEEX)
 speex-$(SPEEX):
        (test -d $@) || (wget -4 -O $@.tar.gz http://downloads.xiph.org/releases/speex/$@.tar.gz && tar zxfv $@.tar.gz)
-       (cd $@ && CFLAGS=-m64 LDFLAGS=-m64 ./configure --prefix=$(PREFIX) && gmake && sudo gmake install)
+       (cd $@ && CFLAGS=-m64 LDFLAGS=-m64 ./configure --prefix=$(PREFIX) && gmake && sudo gmake install && touch .done)
 
-libedit: libedit-$(LIBEDIT)/Makefile
-libedit-$(LIBEDIT)/Makefile: libedit-$(LIBEDIT)
+libedit: libedit-$(LIBEDIT)/.done
+libedit-$(LIBEDIT)/.done: libedit-$(LIBEDIT)
 libedit-$(LIBEDIT):
        (test -d $@) || (wget -4 -O $@.tar.gz http://thrysoee.dk/editline/$@.tar.gz && tar zxfv $@.tar.gz)
-       (cd $@ && CFLAGS=-m64 LDFLAGS=-m64 ./configure --prefix=$(PREFIX) && gmake && sudo gmake install)
+       (cd $@ && CFLAGS=-m64 LDFLAGS=-m64 ./configure --prefix=$(PREFIX) && gmake && sudo gmake install && touch .done)
 
-ldns: openssl ldns-$(LDNS)/Makefile
-ldns-$(LDNS)/Makefile: ldns-$(LDNS)
+ldns: openssl ldns-$(LDNS)/.done
+ldns-$(LDNS)/.done: ldns-$(LDNS)
 ldns-$(LDNS):
        (test -d $@) || (wget -4 -O $@.tar.gz http://www.nlnetlabs.nl/downloads/ldns/$@.tar.gz && tar zxfv $@.tar.gz)
-       (cd $@ && CFLAGS=-m64 LDFLAGS=-m64 ./configure --with-ssl=$(PREFIX) --prefix=$(PREFIX) && gmake && sudo gmake install)
+       (cd $@ && CFLAGS=-m64 LDFLAGS=-m64 ./configure --with-ssl=$(PREFIX) --prefix=$(PREFIX) && gmake && sudo gmake install && touch .done)
 
-pkg-config: openssl pkg-config-$(PKGCFG)/Makefile
-pkg-config-$(PKGCFG)/Makefile: pkg-config-$(PKGCFG)
+pkg-config: openssl pkg-config-$(PKGCFG)/.done
+pkg-config-$(PKGCFG)/.done: pkg-config-$(PKGCFG)
 pkg-config-$(PKGCFG):
        (test -d $@) || (wget -4 -O $@.tar.gz http://pkgconfig.freedesktop.org/releases/$@.tar.gz && tar zxfv $@.tar.gz)
-       (cd $@ && CFLAGS=-m64 LDFLAGS=-m64 ./configure --with-internal-glib --prefix=$(PREFIX) && sudo gmake uninstall && gmake && sudo gmake install)
+       (cd $@ && CFLAGS=-m64 LDFLAGS=-m64 ./configure --with-internal-glib --prefix=$(PREFIX) && sudo gmake uninstall && gmake && sudo gmake install && \
+       touch .done)
 
-perl: openssl perl-$(PERL)/Makefile
-perl-$(PERL)/Makefile: perl-$(PERL)
+perl: openssl perl-$(PERL)/.done
+perl-$(PERL)/.done: perl-$(PERL)
 perl-$(PERL):
        (test -d $@) || (wget -4 -O $@.tar.gz http://www.cpan.org/src/5.0/$@.tar.gz && tar zxfv $@.tar.gz)
-       (cd $@ && CFLAGS=-m64 LDFLAGS=-m64 ./configure.gnu -Dcc=gcc --prefix=$(PREFIX) && gmake && sudo gmake install)
+       (cd $@ && CFLAGS=-m64 LDFLAGS=-m64 ./configure.gnu -Dcc=gcc --prefix=$(PREFIX) && gmake && sudo gmake install && touch .done)
 
-deps: libjpeg openssl sqlite pcre curl speex libedit ldns pkg-config perl
+deps: has-git libjpeg openssl sqlite pcre curl speex libedit ldns pkg-config perl