Add libpcre dependency for atftp, closes #432

[openwrt.git] / package / expat / Makefile

diff --git a/package/expat/Makefile b/package/expat/Makefile
index 6ad7d85..47c8e81 100644 (file)
--- a/package/expat/Makefile
+++ b/package/expat/Makefile
@@ -18,7 +18,7 @@ include $(TOPDIR)/package/rules.mk
 
 $(eval $(call PKG_template,LIBEXPAT,libexpat,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
 
 
 $(eval $(call PKG_template,LIBEXPAT,libexpat,$(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)" \


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

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

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


@@ -59,17 +59,17 @@ $(PKG_BUILD_DIR)/.built: $(PKG_BUILD_DIR)/.configured
 
 $(IPKG_LIBEXPAT):
        install -m0755 -d $(IDIR_LIBEXPAT)/usr/lib
 
 $(IPKG_LIBEXPAT):
        install -m0755 -d $(IDIR_LIBEXPAT)/usr/lib

-       cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libexpat.so.* $(IDIR_LIBEXPAT)/usr/lib/
+       $(CP) $(PKG_INSTALL_DIR)/usr/lib/libexpat.so.* $(IDIR_LIBEXPAT)/usr/lib/

        $(RSTRIP) $(IDIR_LIBEXPAT)
        $(IPKG_BUILD) $(IDIR_LIBEXPAT) $(PACKAGE_DIR)
 
 $(STAGING_DIR)/usr/lib/libexpat.so: $(PKG_BUILD_DIR)/.built
        mkdir -p $(STAGING_DIR)/usr/bin
        $(RSTRIP) $(IDIR_LIBEXPAT)
        $(IPKG_BUILD) $(IDIR_LIBEXPAT) $(PACKAGE_DIR)
 
 $(STAGING_DIR)/usr/lib/libexpat.so: $(PKG_BUILD_DIR)/.built
        mkdir -p $(STAGING_DIR)/usr/bin

-       cp -fpR $(PKG_INSTALL_DIR)/usr/bin/xmlwf $(STAGING_DIR)/usr/bin/
+       $(CP) $(PKG_INSTALL_DIR)/usr/bin/xmlwf $(STAGING_DIR)/usr/bin/

        mkdir -p $(STAGING_DIR)/usr/include
        mkdir -p $(STAGING_DIR)/usr/include

-       cp -fpR $(PKG_INSTALL_DIR)/usr/include/expat*.h $(STAGING_DIR)/usr/include/
+       $(CP) $(PKG_INSTALL_DIR)/usr/include/expat*.h $(STAGING_DIR)/usr/include/

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

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

        touch $@
 
 install-dev: $(STAGING_DIR)/usr/lib/libexpat.so
        touch $@
 
 install-dev: $(STAGING_DIR)/usr/lib/libexpat.so


@@ -80,8 +80,8 @@ uninstall-dev:
                $(STAGING_DIR)/usr/include/expat*.h \
                $(STAGING_DIR)/usr/lib/libexpat.{a,so*} \
 
                $(STAGING_DIR)/usr/include/expat*.h \
                $(STAGING_DIR)/usr/lib/libexpat.{a,so*} \
 

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

 
 mostlyclean:
        make -C $(PKG_BUILD_DIR) clean
 
 mostlyclean:
        make -C $(PKG_BUILD_DIR) clean