fix sdk build

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

diff --git a/openwrt/package/popt/Makefile b/openwrt/package/popt/Makefile
index 7297ce7..a30bdac 100644 (file)
--- a/openwrt/package/popt/Makefile
+++ b/openwrt/package/popt/Makefile
@@ -7,25 +7,18 @@ 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_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
 
 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
 

-include $(TOPDIR)/package/templates.mk
-
-$(eval $(call PKG_template,LIBPOPT,libpopt,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
-

 include $(TOPDIR)/package/rules.mk
 
 include $(TOPDIR)/package/rules.mk
 

-COMPILE_TARGETS += install-dev
-CLEAN_TARGETS += uninstall-dev
+$(eval $(call PKG_template,LIBPOPT,libpopt,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))

 
 

-$(PKG_BUILD_DIR)/.configured: $(PKG_BUILD_DIR)/.prepared
+$(PKG_BUILD_DIR)/.configured:

        (cd $(PKG_BUILD_DIR); rm -rf config.{cache,status} ; \
                $(TARGET_CONFIGURE_OPTS) \
                CFLAGS="$(TARGET_CFLAGS)" \
        (cd $(PKG_BUILD_DIR); rm -rf config.{cache,status} ; \
                $(TARGET_CONFIGURE_OPTS) \
                CFLAGS="$(TARGET_CFLAGS)" \


@@ -56,7 +49,7 @@ $(PKG_BUILD_DIR)/.configured: $(PKG_BUILD_DIR)/.prepared
        );
        touch $(PKG_BUILD_DIR)/.configured
 
        );
        touch $(PKG_BUILD_DIR)/.configured
 

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

        $(MAKE) -C $(PKG_BUILD_DIR)
        touch $(PKG_BUILD_DIR)/.built
 
        $(MAKE) -C $(PKG_BUILD_DIR)
        touch $(PKG_BUILD_DIR)/.built
 


@@ -66,11 +59,10 @@ $(STAGING_DIR)/usr/lib/libpopt.so: $(PKG_BUILD_DIR)/.built
                install
        rm -f $(STAGING_DIR)/usr/lib/libpopt.la
 
                install
        rm -f $(STAGING_DIR)/usr/lib/libpopt.la
 

-$(IPKG_LIBPOPT): $(IDIR_LIBPOPT)/CONTROL/control $(STAGING_DIR)/usr/lib/libpopt.so
+$(IPKG_LIBPOPT):

        mkdir -p $(IDIR_LIBPOPT)/usr/lib
        mkdir -p $(IDIR_LIBPOPT)/usr/lib

-       cp -fpR $(STAGING_DIR)/usr/lib/libpopt.so.* $(IDIR_LIBPOPT)/usr/lib/
+       cp -fpR $(PKG_BUILD_DIR)/.libs/libpopt.so.* $(IDIR_LIBPOPT)/usr/lib/

        $(RSTRIP) $(IDIR_LIBPOPT)
        $(RSTRIP) $(IDIR_LIBPOPT)

-       mkdir -p $(PACKAGE_DIR)

        $(IPKG_BUILD) $(IDIR_LIBPOPT) $(PACKAGE_DIR)
 
 install-dev: $(STAGING_DIR)/usr/lib/libpopt.so
        $(IPKG_BUILD) $(IDIR_LIBPOPT) $(PACKAGE_DIR)
 
 install-dev: $(STAGING_DIR)/usr/lib/libpopt.so


@@ -79,3 +71,6 @@ uninstall-dev:
        -$(MAKE) -C $(PKG_BUILD_DIR) \
                DESTDIR="$(STAGING_DIR)" \
                uninstall
        -$(MAKE) -C $(PKG_BUILD_DIR) \
                DESTDIR="$(STAGING_DIR)" \
                uninstall

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