Contribs: update GnuTLS to 3.2.18

[vlc] / extras / tools / tools.mak

diff --git a/extras/tools/tools.mak b/extras/tools/tools.mak
index a009a60b03ac220a5614622f15eeece41d60b98b..e249918f545e8ffee9d1754ba2571a05738fd756 100644 (file)
--- a/extras/tools/tools.mak
+++ b/extras/tools/tools.mak
@@ -51,7 +51,7 @@ yasm: yasm-$(YASM_VERSION).tar.gz
        $(MOVE)
 
 .yasm: yasm
-       (cd $<; ./configure --prefix=$(PREFIX) && make && make install)
+       (cd $<; ./configure --prefix=$(PREFIX) && $(MAKE) && $(MAKE) install)
        touch $@
 
 CLEAN_FILE += .yasm
@@ -68,7 +68,7 @@ cmake: cmake-$(CMAKE_VERSION).tar.gz
        $(MOVE)
 
 .cmake: cmake
-       (cd $<; ./configure --prefix=$(PREFIX) && make && make install)
+       (cd $<; ./configure --prefix=$(PREFIX) && $(MAKE) && $(MAKE) install)
        touch $@
 
 CLEAN_FILE += .cmake
@@ -84,8 +84,8 @@ libtool: libtool-$(LIBTOOL_VERSION).tar.gz
        $(UNPACK)
        $(MOVE)
 
-.libtool: libtool
-       (cd $<; ./configure --prefix=$(PREFIX) && make && make install)
+.libtool: libtool .automake
+       (cd $<; ./configure --prefix=$(PREFIX) && $(MAKE) && $(MAKE) install)
        ln -sf libtool $(PREFIX)/bin/glibtool
        ln -sf libtoolize $(PREFIX)/bin/glibtoolize
        touch $@
@@ -104,7 +104,7 @@ tar: tar-$(TAR_VERSION).tar.bz2
        $(MOVE)
 
 .tar: tar
-       (cd $<; ./configure --prefix=$(PREFIX) && make && make install)
+       (cd $<; ./configure --prefix=$(PREFIX) && $(MAKE) && $(MAKE) install)
        touch $@
 
 CLEAN_PKG += tar
@@ -121,7 +121,7 @@ xz: xz-$(XZ_VERSION).tar.bz2
        $(MOVE)
 
 .xz: xz
-       (cd $<; ./configure --prefix=$(PREFIX) && make && make install)
+       (cd $<; ./configure --prefix=$(PREFIX) && $(MAKE) && $(MAKE) install)
        touch $@
 
 CLEAN_PKG += xz
@@ -138,7 +138,7 @@ autoconf: autoconf-$(AUTOCONF_VERSION).tar.gz
        $(MOVE)
 
 .autoconf: autoconf .pkg-config
-       (cd $<; ./configure --prefix=$(PREFIX) && make && make install)
+       (cd $<; ./configure --prefix=$(PREFIX) && $(MAKE) && $(MAKE) install)
        touch $@
 
 CLEAN_FILE += .autoconf
@@ -155,7 +155,7 @@ automake: automake-$(AUTOMAKE_VERSION).tar.gz
        $(MOVE)
 
 .automake: automake .autoconf
-       (cd $<; ./configure --prefix=$(PREFIX) && make && make install)
+       (cd $<; ./configure --prefix=$(PREFIX) && $(MAKE) && $(MAKE) install)
        touch $@
 
 CLEAN_FILE += .automake
@@ -172,7 +172,7 @@ m4: m4-$(M4_VERSION).tar.gz
        $(MOVE)
 
 .m4: m4
-       (cd $<; ./configure --prefix=$(PREFIX) && make && make install)
+       (cd $<; ./configure --prefix=$(PREFIX) && $(MAKE) && $(MAKE) install)
        touch $@
 
 CLEAN_FILE += .m4
@@ -190,31 +190,13 @@ pkgconfig: pkg-config-$(PKGCFG_VERSION).tar.gz
        $(MOVE)
 
 .pkg-config: pkgconfig
-       (cd pkgconfig; ./configure --prefix=$(PREFIX) --disable-shared --enable-static && make && make install)
+       (cd pkgconfig; ./configure --prefix=$(PREFIX) --disable-shared --enable-static && $(MAKE) && $(MAKE) install)
        touch $@
 
 CLEAN_FILE += .pkg-config
 CLEAN_PKG += pkgconfig
 DISTCLEAN_PKG += pkg-config-$(PKGCFG_VERSION).tar.gz
 
-# openssl
-# we need to use -j1 here, since otherwise compilation fails (at least on Darwin)
-
-openssl-$(OPENSSL_VERSION).tar.gz:
-       $(call download,$(OPENSSL_URL))
-
-openssl: openssl-$(OPENSSL_VERSION).tar.gz
-       $(UNPACK)
-       $(MOVE)
-
-.openssl: openssl
-       (cd openssl; ./config --prefix=$(PREFIX) no-shared no-zlib && make -j1 && make test && make install)
-       touch $@
-
-CLEAN_FILE += .openssl
-CLEAN_PKG += openssl
-DISTCLEAN_PKG += openssl-$(OPENSSL_VERSION).tar.gz
-
 # gas-preprocessor
 gas-preprocessor-$(GAS_VERSION).tar.gz:
        $(call download,$(GAS_URL))
@@ -224,7 +206,8 @@ gas: gas-preprocessor-$(GAS_VERSION).tar.gz
        $(MOVE)
 
 .gas: gas
-       cp gas/gas-preprocessor.pl build/bin/
+       mkdir -p $(PREFIX)/bin
+       cp gas/gas-preprocessor.pl $(PREFIX)/build/bin/
        touch $@
 
 CLEAN_FILE += .gas
@@ -237,17 +220,71 @@ ragel-$(RAGEL_VERSION).tar.gz:
 
 ragel: ragel-$(RAGEL_VERSION).tar.gz
        $(UNPACK)
+       $(APPLY) ragel-6.8-javacodegen.patch
        $(MOVE)
 
+
 .ragel: ragel
-       $(APPLY) ragel-6.8-javacodegen.patch
-       (cd ragel; ./configure --prefix=$(PREFIX) --disable-shared --enable-static && make && make install)
+       (cd ragel; ./configure --prefix=$(PREFIX) --disable-shared --enable-static && $(MAKE) && $(MAKE) install)
        touch $@
 
 CLEAN_FILE += .ragel
 CLEAN_PKG += ragel
 DISTCLEAN_PKG += ragel-$(RAGEL_VERSION).tar.gz
 
+# GNU sed
+
+sed-$(SED_VERSION).tar.bz2:
+       $(call download,$(SED_URL))
+
+sed: sed-$(SED_VERSION).tar.bz2
+       $(UNPACK)
+       $(MOVE)
+
+.sed: sed
+       (cd $<; ./configure --prefix=$(PREFIX) && $(MAKE) && $(MAKE) install)
+       touch $@
+
+CLEAN_PKG += sed
+DISTCLEAN_PKG += sed-$(SED_VERSION).tar.bz2
+CLEAN_FILE += .sed
+
+# Apache ANT
+
+apache-ant-$(ANT_VERSION).tar.bz2:
+       $(call download,$(ANT_URL))
+
+ant: apache-ant-$(ANT_VERSION).tar.bz2
+       $(UNPACK)
+       $(MOVE)
+
+.ant: ant
+       (mkdir -p $(PREFIX)/bin && cp $</bin/* $(PREFIX)/bin/)
+       (mkdir -p $(PREFIX)/lib && cp $</lib/* $(PREFIX)/lib/)
+       touch $@
+
+CLEAN_PKG += ant
+DISTCLEAN_PKG += apache-ant-$(ANT_VERSION).tar.bz2
+CLEAN_FILE += .ant
+
+
+# Protobuf Protoc
+
+protobuf-$(PROTOBUF_VERSION).tar.bz2:
+       $(call download,$(PROTOBUF_URL))
+
+protobuf: protobuf-$(PROTOBUF_VERSION).tar.bz2
+       $(UNPACK)
+       $(MOVE)
+
+.protoc: protobuf
+       (cd $< && ./configure --prefix="$(PREFIX)" --disable-shared --enable-static && $(MAKE) && $(MAKE) install)
+       touch $@
+
+CLEAN_PKG += protobuf
+DISTCLEAN_PKG += protobuf-$(PROTOBUF_VERSION).tar.bz2
+CLEAN_FILE += .protoc
+
 #
 #
 #