Simplify configure and add target optimizations,

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

diff --git a/openwrt/package/popt/Makefile b/openwrt/package/popt/Makefile
index 5d67b80..87cb45c 100644 (file)
--- a/openwrt/package/popt/Makefile
+++ b/openwrt/package/popt/Makefile
@@ -7,28 +7,19 @@ PKG_VERSION:=1.7
 PKG_RELEASE:=4
 PKG_MD5SUM:=5988e7aeb0ae4dac8d83561265984cc9
 
 PKG_RELEASE:=4
 PKG_MD5SUM:=5988e7aeb0ae4dac8d83561265984cc9
 

-PKG_SOURCE_URL:=\
-       ftp://ftp.rpm.org/pub/rpm/dist/rpm-4.1.x/ \
-       http://nthill.free.fr/openwrt/sources/$(PKG_NAME)/
+PKG_SOURCE_URL:=ftp://ftp.rpm.org/pub/rpm/dist/rpm-4.1.x/

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

+PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install

 
 

-IPKG_LIBPOPT:=$(PACKAGE_DIR)/lib$(PKG_NAME)_$(PKG_VERSION)-$(PKG_RELEASE)_$(ARCH).ipk
-IDIR_LIBPOPT:=$(PKG_BUILD_DIR)/ipkg/lib$(PKG_NAME)
-INFO_LIBPOPT:=$(IPKG_STATE_DIR)/info/lib$(PKG_NAME).list
+include $(TOPDIR)/package/rules.mk

 
 

-$(DL_DIR)/$(PKG_SOURCE):
-       $(SCRIPT_DIR)/download.pl $(DL_DIR) $(PKG_SOURCE) $(PKG_MD5SUM) $(PKG_SOURCE_URL)
+$(eval $(call PKG_template,LIBPOPT,libpopt,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))

 
 

-$(PKG_BUILD_DIR)/.prepared: $(DL_DIR)/$(PKG_SOURCE)
-       $(PKG_CAT) $(DL_DIR)/$(PKG_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
-#      $(PATCH) $(PKG_BUILD_DIR) ./patches
-       touch $(PKG_BUILD_DIR)/.prepared
-
-$(PKG_BUILD_DIR)/.configured: $(PKG_BUILD_DIR)/.prepared
-       (cd $(PKG_BUILD_DIR); rm -rf config.cache config.status; \
+$(PKG_BUILD_DIR)/.configured:
+       (cd $(PKG_BUILD_DIR); rm -rf config.{cache,status} ; \

                $(TARGET_CONFIGURE_OPTS) \
                CFLAGS="$(TARGET_CFLAGS)" \
                CPPFLAGS="-I$(STAGING_DIR)/usr/include" \
                $(TARGET_CONFIGURE_OPTS) \
                CFLAGS="$(TARGET_CFLAGS)" \
                CPPFLAGS="-I$(STAGING_DIR)/usr/include" \


@@ -51,41 +42,40 @@ $(PKG_BUILD_DIR)/.configured: $(PKG_BUILD_DIR)/.prepared
                --mandir=/usr/share/man \
                --sbindir=/usr/sbin \
                --sysconfdir=/etc \
                --mandir=/usr/share/man \
                --sbindir=/usr/sbin \
                --sysconfdir=/etc \

-               $(DISABLE_NLS) \
-               $(DISABLE_LARGEFILE) \
+                 $(DISABLE_LARGEFILE) \
+                 $(DISABLE_NLS) \

                --enable-shared \
                --enable-static \
        );
                --enable-shared \
                --enable-static \
        );

-       touch $(PKG_BUILD_DIR)/.configured
-
-$(PKG_BUILD_DIR)/.built: $(PKG_BUILD_DIR)/.configured
-       $(MAKE) -C $(PKG_BUILD_DIR)
-       touch $(PKG_BUILD_DIR)/.built
+       touch $@

 
 

-$(STAGING_DIR)/usr/lib/libpopt.so: $(PKG_BUILD_DIR)/.built
+$(PKG_BUILD_DIR)/.built:
+       rm -rf $(PKG_INSTALL_DIR)
+       mkdir -p $(PKG_INSTALL_DIR)

        $(MAKE) -C $(PKG_BUILD_DIR) \
        $(MAKE) -C $(PKG_BUILD_DIR) \

-               DESTDIR="$(STAGING_DIR)" \
-               install
-       rm -f $(STAGING_DIR)/usr/lib/libpopt.la
+               DESTDIR="$(PKG_INSTALL_DIR)" \
+               all install
+       touch $@

 
 

-$(IPKG_LIBPOPT): $(STAGING_DIR)/usr/lib/libpopt.so
-       $(SCRIPT_DIR)/make-ipkg-dir.sh $(IDIR_LIBPOPT) lib$(PKG_NAME).control $(PKG_VERSION)-$(PKG_RELEASE) $(ARCH)
-       mkdir -p $(IDIR_LIBPOPT)/usr/lib
-       cp -fp $(STAGING_DIR)/usr/lib/libpopt.so.* $(IDIR_LIBPOPT)/usr/lib/
-       $(STRIP) $(IDIR_LIBPOPT)/usr/lib/*.so*
-       mkdir -p $(PACKAGE_DIR)
+$(IPKG_LIBPOPT):
+       install -d -m0755 $(IDIR_LIBPOPT)/usr/lib
+       cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libpopt.so.* $(IDIR_LIBPOPT)/usr/lib/
+       $(RSTRIP) $(IDIR_LIBPOPT)

        $(IPKG_BUILD) $(IDIR_LIBPOPT) $(PACKAGE_DIR)
 
        $(IPKG_BUILD) $(IDIR_LIBPOPT) $(PACKAGE_DIR)
 

-$(INFO_LIBPOPT): $(IPKG_LIBPOPT)
-       $(IPKG) install $(IPKG_LIBPOPT)
+$(STAGING_DIR)/usr/lib/libpopt.so: $(PKG_BUILD_DIR)/.built
+       mkdir -p $(STAGING_DIR)/usr/include
+       cp -fpR $(PKG_INSTALL_DIR)/usr/include/popt.h $(STAGING_DIR)/usr/include/
+       mkdir -p $(STAGING_DIR)/usr/lib
+       cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libpopt.{a,so*} $(STAGING_DIR)/usr/lib/
+       touch $(STAGING_DIR)/usr/lib/libpopt.so
+
+install-dev: $(STAGING_DIR)/usr/lib/libpopt.so

 
 

-source: $(DL_DIR)/$(PKG_SOURCE)
-prepare: $(PKG_BUILD_DIR)/.prepared
-compile: $(IPKG_LIBPOPT)
-install: $(INFO_LIBPOPT)
+uninstall-dev:
+       rm -rf \
+         $(STAGING_DIR)/usr/include/popt.h \
+         $(STAGING_DIR)/usr/lib/libpopt.{a,so*} \

 
 

-clean:
-       -$(MAKE) -C $(PKG_BUILD_DIR) \
-               DESTDIR="$(STAGING_DIR)" \
-               uninstall
-       rm -rf $(PKG_BUILD_DIR) $(IPKG_LIBPOPT)
+compile: install-dev
+clean: uninstall-dev