Fix BitchX compilation, remove previous declarations of some variables, closes #425

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

diff --git a/openwrt/package/libtasn1/Makefile b/openwrt/package/libtasn1/Makefile
index 1919d12..9402aa5 100644 (file)
--- a/openwrt/package/libtasn1/Makefile
+++ b/openwrt/package/libtasn1/Makefile
@@ -20,11 +20,9 @@ PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
 
 include $(TOPDIR)/package/rules.mk
 
-BR2_PACKAGE_LIBTASN1=m
-
 $(eval $(call PKG_template,LIBTASN1,libtasn1,$(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} ; \
                touch configure.ac ; \
                touch acinclude.m4 ; \
@@ -62,7 +60,7 @@ $(PKG_BUILD_DIR)/.configured: $(PKG_BUILD_DIR)/.prepared
        );
        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) \
@@ -70,21 +68,21 @@ $(PKG_BUILD_DIR)/.built: $(PKG_BUILD_DIR)/.configured
                all install
        touch $@
 
-$(IPKG_LIBTASN1): $(STAGING_DIR)/usr/lib/libtasn1.so
+$(IPKG_LIBTASN1):
        install -m0755 -d $(IDIR_LIBTASN1)/usr/lib
-       cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libtasn1.so.* $(IDIR_LIBTASN1)/usr/lib/
+       $(CP) $(PKG_INSTALL_DIR)/usr/lib/libtasn1.so.* $(IDIR_LIBTASN1)/usr/lib/
        $(RSTRIP) $(IDIR_LIBTASN1)
        $(IPKG_BUILD) $(IDIR_LIBTASN1) $(PACKAGE_DIR)
 
 $(STAGING_DIR)/usr/lib/libtasn1.so: $(PKG_BUILD_DIR)/.built
        mkdir -p $(STAGING_DIR)/usr/bin
-       cp -fpR $(PKG_INSTALL_DIR)/usr/bin/libtasn1-config $(STAGING_DIR)/usr/bin/
+       $(CP) $(PKG_INSTALL_DIR)/usr/bin/libtasn1-config $(STAGING_DIR)/usr/bin/
        mkdir -p $(STAGING_DIR)/usr/include
-       cp -fpR $(PKG_INSTALL_DIR)/usr/include/libtasn1.h $(STAGING_DIR)/usr/include/
+       $(CP) $(PKG_INSTALL_DIR)/usr/include/libtasn1.h $(STAGING_DIR)/usr/include/
        mkdir -p $(STAGING_DIR)/usr/lib
-       cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libtasn1.{a,so*} $(STAGING_DIR)/usr/lib/
+       $(CP) $(PKG_INSTALL_DIR)/usr/lib/libtasn1.{a,so*} $(STAGING_DIR)/usr/lib/
        mkdir -p $(STAGING_DIR)/usr/share/aclocal
-       cp -fpR $(PKG_INSTALL_DIR)/usr/share/aclocal/libtasn1.m4 $(STAGING_DIR)/usr/share/aclocal/
+       $(CP) $(PKG_INSTALL_DIR)/usr/share/aclocal/libtasn1.m4 $(STAGING_DIR)/usr/share/aclocal/
        touch $@
 
 install-dev: $(STAGING_DIR)/usr/lib/libtasn1.so
@@ -96,9 +94,8 @@ uninstall-dev:
                $(STAGING_DIR)/usr/lib/libtasn1.{a,so*} \
                $(STAGING_DIR)/usr/share/aclocal/libtasn1.m4 \
 
-compile: install-dev
-
-clean: uninstall-dev
+compile-targets: install-dev
+clean-targets: uninstall-dev
 
 mostlyclean:
        make -C $(PKG_BUILD_DIR) clean