Simplify configure and add target optimizations,

[openwrt.git] / openwrt / package / glib / Makefile

diff --git a/openwrt/package/glib/Makefile b/openwrt/package/glib/Makefile
index 5b35fa1..473e8b6 100644 (file)
--- a/openwrt/package/glib/Makefile
+++ b/openwrt/package/glib/Makefile
@@ -7,7 +7,10 @@ PKG_VERSION := 1.2.10
 PKG_RELEASE := 1
 PKG_MD5SUM := 6fe30dad87c77b91b632def29dd69ef9
 
 PKG_RELEASE := 1
 PKG_MD5SUM := 6fe30dad87c77b91b632def29dd69ef9
 

-PKG_SOURCE_URL := ftp://ftp.gtk.org/pub/gtk/v1.2
+PKG_SOURCE_URL := ftp://ftp.gtk.org/pub/gtk/v1.2 \
+       http://ftp.gwdg.de/pub/misc/grafik/gimp/gtk/v1.2/ \
+       http://ftp.esat.net/mirrors/ftp.gimp.org/pub/gtk/v1.2/ \
+       http://www.mirrorservice.org/sites/ftp.gimp.org/pub/gtk/v1.2/

 PKG_SOURCE := $(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_CAT := zcat
 
 PKG_SOURCE := $(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_CAT := zcat
 


@@ -66,15 +69,15 @@ $(PKG_BUILD_DIR)/.configured: $(PKG_BUILD_DIR)/.prepared
                  --enable-shared=yes \
                  --enable-static=yes \
        );
                  --enable-shared=yes \
                  --enable-static=yes \
        );

-       touch $(PKG_BUILD_DIR)/.configured
+       touch $@

 
 $(PKG_BUILD_DIR)/.built: $(PKG_BUILD_DIR)/.configured
 
 $(PKG_BUILD_DIR)/.built: $(PKG_BUILD_DIR)/.configured

-       $(MAKE) -C $(PKG_BUILD_DIR) \
-               $(TARGET_CONFIGURE_OPTS)
+       rm -rf $(PKG_INSTALL_DIR)
+       mkdir -p $(PKG_INSTALL_DIR)

        $(MAKE) -C $(PKG_BUILD_DIR) \
                DESTDIR="$(PKG_INSTALL_DIR)" \
                install
        $(MAKE) -C $(PKG_BUILD_DIR) \
                DESTDIR="$(PKG_INSTALL_DIR)" \
                install

-       touch $(PKG_BUILD_DIR)/.built
+       touch $@

 
 $(IPKG_GLIB1):
        install -m0755 -d $(IDIR_GLIB1)/usr/lib
 
 $(IPKG_GLIB1):
        install -m0755 -d $(IDIR_GLIB1)/usr/lib


@@ -107,4 +110,4 @@ uninstall-dev:
        rm -rf $(STAGING_DIR)/usr/lib/pkgconfig/g{lib,module,thread}.pc
 
 compile: install-dev
        rm -rf $(STAGING_DIR)/usr/lib/pkgconfig/g{lib,module,thread}.pc
 
 compile: install-dev

-clean: uninstall-dev
\ No newline at end of file
+clean: uninstall-dev