fix sdk build

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

diff --git a/openwrt/package/pcre/Makefile b/openwrt/package/pcre/Makefile
index b5ebd80..c084f00 100644 (file)
--- a/openwrt/package/pcre/Makefile
+++ b/openwrt/package/pcre/Makefile
@@ -7,25 +7,18 @@ PKG_VERSION:=5.0
 PKG_RELEASE:=3
 PKG_MD5SUM:=53976b62032fd5c76678274e5fd196b4
 
 PKG_RELEASE:=3
 PKG_MD5SUM:=53976b62032fd5c76678274e5fd196b4
 

-PKG_SOURCE_URL:= \
-       ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/ \
-       http://nthill.free.fr/openwrt/sources/$(PKG_NAME)/
+PKG_SOURCE_URL:=ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/

 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,LIBPCRE,libpcre,$(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,LIBPCRE,libpcre,$(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)" \


@@ -57,15 +50,16 @@ $(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)" \
                CC_FOR_BUILD="$(HOSTCC)" \
                LINK_FOR_BUILD="$(HOSTCC)" \
                CFLAGS_FOR_BUILD="" \
                dftables
        $(MAKE) -C "$(PKG_BUILD_DIR)" \
                CC_FOR_BUILD="$(HOSTCC)" \
                LINK_FOR_BUILD="$(HOSTCC)" \
                CFLAGS_FOR_BUILD="" \
                dftables

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

                $(TARGET_CONFIGURE_OPTS) \
                $(TARGET_CONFIGURE_OPTS) \

-               CFLAGS="$(TARGET_CFLAGS)"
+               CFLAGS="$(TARGET_CFLAGS)" \
+               all

        touch $(PKG_BUILD_DIR)/.built
 
 $(STAGING_DIR)/usr/lib/libpcre.so: $(PKG_BUILD_DIR)/.built
        touch $(PKG_BUILD_DIR)/.built
 
 $(STAGING_DIR)/usr/lib/libpcre.so: $(PKG_BUILD_DIR)/.built


@@ -74,11 +68,10 @@ $(STAGING_DIR)/usr/lib/libpcre.so: $(PKG_BUILD_DIR)/.built
                install
        rm -f $(STAGING_DIR)/usr/lib/libpcre*.la
 
                install
        rm -f $(STAGING_DIR)/usr/lib/libpcre*.la
 

-$(IPKG_LIBPCRE): $(IDIR_LIBPCRE)/CONTROL/control $(STAGING_DIR)/usr/lib/libpcre.so
+$(IPKG_LIBPCRE):

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

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

        $(RSTRIP) $(IDIR_LIBPCRE)
        $(RSTRIP) $(IDIR_LIBPCRE)

-       mkdir -p $(PACKAGE_DIR)

        $(IPKG_BUILD) $(IDIR_LIBPCRE) $(PACKAGE_DIR)
 
 install-dev: $(STAGING_DIR)/usr/lib/libpcre.so
        $(IPKG_BUILD) $(IDIR_LIBPCRE) $(PACKAGE_DIR)
 
 install-dev: $(STAGING_DIR)/usr/lib/libpcre.so


@@ -90,3 +83,6 @@ uninstall-dev:
          $(STAGING_DIR)/usr/lib/libpcre* \
          $(STAGING_DIR)/usr/lib/pkgconfig/libpcre.pc \
          $(STAGING_DIR)/usr/share/man/man*/pcre* \
          $(STAGING_DIR)/usr/lib/libpcre* \
          $(STAGING_DIR)/usr/lib/pkgconfig/libpcre.pc \
          $(STAGING_DIR)/usr/share/man/man*/pcre* \

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