Simplify configure and add target optimizations,

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

diff --git a/openwrt/package/gmp/Makefile b/openwrt/package/gmp/Makefile
index 10e95e7..975c445 100644 (file)
--- a/openwrt/package/gmp/Makefile
+++ b/openwrt/package/gmp/Makefile
@@ -7,12 +7,16 @@ PKG_VERSION:=4.1.4
 PKG_RELEASE:=1
 PKG_MD5SUM:=0aa7d3b3f5b5ec5951e7dddd6f65e891
 
 PKG_RELEASE:=1
 PKG_MD5SUM:=0aa7d3b3f5b5ec5951e7dddd6f65e891
 

-PKG_SOURCE_URL:=ftp://ftp.gnu.org/gnu/gmp/
+PKG_SOURCE_URL:=ftp://ftp.gnu.org/gnu/gmp/ \
+       ftp://ftp.belnet.be/mirror/ftp.gnu.org/gnu/gmp/ \
+       ftp://ftp.mirror.nl/pub/mirror/gnu/gmp/ \
+       http://mirror.switch.ch/ftp/mirror/gnu/gmp/

 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_CAT:=bzcat
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_CAT:=bzcat
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install

+

 include $(TOPDIR)/package/rules.mk
 
 $(eval $(call PKG_template,LIBGMP,libgmp,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
 include $(TOPDIR)/package/rules.mk
 
 $(eval $(call PKG_template,LIBGMP,libgmp,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))


@@ -44,15 +48,15 @@ $(PKG_BUILD_DIR)/.configured: $(PKG_BUILD_DIR)/.prepared
                  --enable-shared \
                  --enable-static \
        );
                  --enable-shared \
                  --enable-static \
        );

-       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)
+       rm -rf $(PKG_INSTALL_DIR)

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

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

 
 $(IPKG_LIBGMP):
        install -m0755 -d $(IDIR_LIBGMP)/usr/lib
 
 $(IPKG_LIBGMP):
        install -m0755 -d $(IDIR_LIBGMP)/usr/lib


@@ -63,15 +67,16 @@ $(IPKG_LIBGMP):
 $(STAGING_DIR)/usr/lib/libgmp.so: $(PKG_BUILD_DIR)/.built
        mkdir -p $(STAGING_DIR)/usr/include
        cp -fpR $(PKG_INSTALL_DIR)/usr/include/gmp* $(STAGING_DIR)/usr/include/
 $(STAGING_DIR)/usr/lib/libgmp.so: $(PKG_BUILD_DIR)/.built
        mkdir -p $(STAGING_DIR)/usr/include
        cp -fpR $(PKG_INSTALL_DIR)/usr/include/gmp* $(STAGING_DIR)/usr/include/

-       mkdir -p $(I_LIBPCAP_DEV)/usr/lib
+       mkdir -p $(STAGING_DIR)/usr/lib

        cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libgmp.{a,so*} $(STAGING_DIR)/usr/lib/
        cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libgmp.{a,so*} $(STAGING_DIR)/usr/lib/

-       touch $(STAGING_DIR)/usr/lib/libgmp.so
+       touch $@

 
 install-dev: $(STAGING_DIR)/usr/lib/libgmp.so
 
 uninstall-dev:
 
 install-dev: $(STAGING_DIR)/usr/lib/libgmp.so
 
 uninstall-dev:

-       rm -rf $(STAGING_DIR)/usr/include/gmp*
-       rm -rf $(STAGING_DIR)/usr/lib/libgmp.{a,so*}
+       rm -rf \
+               $(STAGING_DIR)/usr/include/gmp* \
+               $(STAGING_DIR)/usr/lib/libgmp.{a,so*} \

 
 compile: install-dev
 clean: uninstall-dev
 
 compile: install-dev
 clean: uninstall-dev