[Eliot-dev] eliot/extras/contrib Makefile

[Olivier Teulière]

CVSROOT:        /cvsroot/eliot
Module name:    eliot
Changes by:     Olivier Teulière <ipkiss>       09/09/26 08:15:31

Modified files:
        extras/contrib : Makefile 

Log message:
        Updated build system for Windows

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/eliot/extras/contrib/Makefile?cvsroot=eliot&r1=1.5&r2=1.6

Patches:
Index: Makefile
===================================================================
RCS file: /cvsroot/eliot/eliot/extras/contrib/Makefile,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- Makefile    28 Jun 2009 13:56:16 -0000      1.5
+++ Makefile    26 Sep 2009 08:15:31 -0000      1.6
@@ -1,7 +1,7 @@
 ICONV_VERSION = 1.12
-LIBCONFIG_VERSION = 1.3.1
+LIBCONFIG_VERSION = 1.3.2
 BOOST_VERSION = 1_39_0
-QT_VERSION = 4.4.1
+QT_VERSION = 4.5.3
 
 PREFIX = $(shell pwd)/inst
 WGET = wget -c
@@ -20,14 +20,19 @@
        @echo "Usage: make all"
 
 
+$(PREFIX):
+       mkdir -p $@
+
 ### iconv ###
 
 ICONV_DIR = libiconv-$(ICONV_VERSION)
 ICONV_ARCHIVE = libiconv-$(ICONV_VERSION).tar.gz
 
-$(ICONV_DIR):
+$(ICONV_ARCHIVE): $(PREFIX)
        $(WGET) http://ftp.gnu.org/pub/gnu/libiconv/$(ICONV_ARCHIVE)
-       tar xzf $(ICONV_ARCHIVE)
+
+$(ICONV_DIR): $(ICONV_ARCHIVE)
+       tar xzf $<
 
 .iconv: $(ICONV_DIR)
        (cd $< && $(CONFIGURE) --enable-static --disable-shared && make && make 
install)
@@ -39,9 +44,11 @@
 LIBCONFIG_DIR = libconfig-$(LIBCONFIG_VERSION)
 LIBCONFIG_ARCHIVE = libconfig-$(LIBCONFIG_VERSION).tar.gz
 
-$(LIBCONFIG_DIR):
+$(LIBCONFIG_ARCHIVE): $(PREFIX)
        $(WGET) http://www.hyperrealm.com/libconfig/$(LIBCONFIG_ARCHIVE)
-       tar xvf $(LIBCONFIG_ARCHIVE)
+
+$(LIBCONFIG_DIR): $(LIBCONFIG_ARCHIVE)
+       tar xvf $<
 
 .libconfig: $(LIBCONFIG_DIR)
        (cd $< && CFLAGS=-DLIBCONFIG_STATIC CXXFLAGS=-DLIBCONFIG_STATIC 
$(CONFIGURE) --enable-static --disable-shared && make && make install)
@@ -53,9 +60,11 @@
 BOOST_DIR = boost_$(BOOST_VERSION)
 BOOST_ARCHIVE = boost_$(BOOST_VERSION).tar.bz2
 
-$(BOOST_DIR):
+$(BOOST_ARCHIVE): $(PREFIX)
        $(WGET) 
http://garr.dl.sourceforge.net/sourceforge/boost/$(BOOST_ARCHIVE)
-       tar xjf $(BOOST_ARCHIVE)
+
+$(BOOST_DIR): $(BOOST_ARCHIVE)
+       tar xjf $<
 
 # We don't build any library, because we don't need them (and it is really
 # hard to cross-compile with their crappy build system)
@@ -67,15 +76,18 @@
 
 ### Qt ###
 
-# FIXME: No automated way at the moment :-(
+# FIXME: No automated way to build it at the moment :-(
 QT_ARCHIVE = qt4-$(QT_VERSION)-win32-bin.tar.bz2
 QT_DIR = qt4-$(QT_VERSION)-win32-bin
 
-$(QT_DIR):
-       $(WGET) 
http://download.videolan.org/pub/videolan/testing/contrib/$(QT_ARCHIVE)
-       tar xjf $(QT_ARCHIVE)
+$(QT_ARCHIVE): $(PREFIX)
+       $(WGET) 
http://dl.sv.nongnu.org/releases-noredirect/eliot/other/$(QT_ARCHIVE)
+
+$(QT_DIR): $(QT_ARCHIVE)
+       tar xjf $<
 
 .qt: $(QT_DIR)
-       (cd $<; mkdir -p $(PREFIX)/bin; mkdir -p $(PREFIX)/include; mkdir -p 
$(PREFIX)/lib/pkgconfig; rm -f $(PREFIX)/lib/pkgconfig/Qt*; sed 
's,@@PREFIX@@,$(PREFIX),' lib/pkgconfig/QtCore.pc.in > 
$(PREFIX)/lib/pkgconfig/QtCore.pc; sed 's,@@PREFIX@@,$(PREFIX),' 
lib/pkgconfig/QtGui.pc.in > $(PREFIX)/lib/pkgconfig/QtGui.pc; cp -r include/* 
$(PREFIX)/include; cp lib/*a $(PREFIX)/lib; mkdir -p 
$(PREFIX)/share/qt4/translations; cp -r share/translations/* 
$(PREFIX)/share/qt4/translations)
+       #(cd $<; mkdir -p $(PREFIX)/bin; mkdir -p $(PREFIX)/include; mkdir -p 
$(PREFIX)/lib/pkgconfig; rm -f $(PREFIX)/lib/pkgconfig/Qt*; sed 
's,@@PREFIX@@,$(PREFIX),' lib/pkgconfig/QtCore.pc.in > 
$(PREFIX)/lib/pkgconfig/QtCore.pc; sed 's,@@PREFIX@@,$(PREFIX),' 
lib/pkgconfig/QtGui.pc.in > $(PREFIX)/lib/pkgconfig/QtGui.pc; cp -r include/* 
$(PREFIX)/include; cp lib/*a $(PREFIX)/lib; mkdir -p 
$(PREFIX)/share/qt4/translations; cp -r share/translations/* 
$(PREFIX)/share/qt4/translations)
+       (cd $<; cp -r bin include lib share $(PREFIX); sed 
's,@@PREFIX@@,$(PREFIX),' $(PREFIX)/lib/pkgconfig/QtCore.pc.in > 
$(PREFIX)/lib/pkgconfig/QtCore.pc; sed 's,@@PREFIX@@,$(PREFIX),' 
lib/pkgconfig/QtGui.pc.in > $(PREFIX)/lib/pkgconfig/QtGui.pc; rm 
$(PREFIX)/lib/pkgconfig/*.in)
        touch $@