From 2a45adfcdab92beb68f3263439be428832f57b16 Mon Sep 17 00:00:00 2001 From: Felix Fietkau Date: Tue, 25 Dec 2007 01:40:47 +0000 Subject: [PATCH] remove uninstalldev templates (no longer necessary) SVN-Revision: 9906 --- package/e2fsprogs/Makefile | 7 ------- package/fuse/Makefile | 6 ------ package/gmp/Makefile | 5 ----- package/iptables/Makefile | 12 ------------ package/keynote/Makefile | 5 ----- package/libjson-c/Makefile | 6 ------ package/libnl/Makefile | 3 --- package/libpcap/Makefile | 5 ----- package/linux-atm/Makefile | 5 ----- package/mac80211/Makefile | 4 ---- package/madwifi/Makefile | 4 ---- package/ncurses/Makefile | 15 --------------- package/nvram/Makefile | 4 ---- package/openssl/Makefile | 6 ------ package/wireless-tools/Makefile | 5 ----- package/zlib/Makefile | 5 ----- 16 files changed, 97 deletions(-) diff --git a/package/e2fsprogs/Makefile b/package/e2fsprogs/Makefile index 0186191a6d9..f93cf4accab 100644 --- a/package/e2fsprogs/Makefile +++ b/package/e2fsprogs/Makefile @@ -103,13 +103,6 @@ define Build/InstallDev install-libs endef -define Build/UninstallDev - -$(MAKE) -C $(PKG_BUILD_DIR) \ - BUILDCC="$(HOSTCC)" \ - DESTDIR="$(STAGING_DIR)" \ - uninstall-libs -endef - define Package/e2fsprogs/install $(INSTALL_DIR) $(1)/usr/sbin $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/e2fsck $(1)/usr/sbin/ diff --git a/package/fuse/Makefile b/package/fuse/Makefile index 2f249223f70..8d280e163e2 100644 --- a/package/fuse/Makefile +++ b/package/fuse/Makefile @@ -117,12 +117,6 @@ define Build/InstallDev $(SED) 's,-I$$$${includedir}/fuse,,g' $(1)/usr/lib/pkgconfig/fuse.pc $(SED) 's,-L$$$${libdir},,g' $(1)/usr/lib/pkgconfig/fuse.pc endef - -define Build/UninstallDev - rm -rf $(1)/usr/include/fuse{,.h} \ - $(1)/usr/lib/libfuse.{a,so*} \ - $(1)/usr/lib/pkgconfig/fuse.pc -endef define Package/fuse-utils/install $(INSTALL_DIR) $(1)/usr/bin diff --git a/package/gmp/Makefile b/package/gmp/Makefile index aff46a933e8..9915c06eada 100644 --- a/package/gmp/Makefile +++ b/package/gmp/Makefile @@ -45,11 +45,6 @@ define Build/InstallDev $(CP) $(PKG_INSTALL_DIR)/usr/lib/libgmp.{a,so*} $(1)/usr/lib/ endef -define Build/UninstallDev - rm -rf $(1)/usr/include/gmp* \ - $(1)/usr/lib/libgmp.{a,so*} -endef - define Package/libgmp/install $(INSTALL_DIR) $(1)/usr/lib $(CP) $(PKG_INSTALL_DIR)/usr/lib/libgmp.so.* $(1)/usr/lib/ diff --git a/package/iptables/Makefile b/package/iptables/Makefile index 80646cd667c..aefc7ddce89 100644 --- a/package/iptables/Makefile +++ b/package/iptables/Makefile @@ -235,18 +235,6 @@ define Build/InstallDev $(CP) $(PKG_BUILD_DIR)/libiptc/libiptc.a $(1)/usr/lib endef -define Build/UninstallDev - rm -rf $(1)/usr/include/libipq.h - rm -rf $(1)/usr/include/libipulog - rm -rf $(1)/usr/include/libipq - rm -rf $(1)/usr/include/libiptc - rm -rf $(1)/usr/include/linux/netfilter* - rm -rf $(1)/usr/include/iptables* - rm -rf $(1)/usr/include/ip6tables* - rm -rf $(1)/usr/lib/libipq.a - rm -rf $(1)/usr/lib/libiptc.a -endef - define Package/iptables/install $(INSTALL_DIR) $(1)/etc/config $(INSTALL_DATA) ./files/firewall.config $(1)/etc/config/firewall diff --git a/package/keynote/Makefile b/package/keynote/Makefile index 1aea7cbc608..5b27257b4a7 100644 --- a/package/keynote/Makefile +++ b/package/keynote/Makefile @@ -47,11 +47,6 @@ define Build/InstallDev $(CP) $(PKG_BUILD_DIR)/libkeynote.a $(1)/usr/lib/ endef -define Build/UninstallDev - rm -rf $(1)/usr/include/keynote \ - $(1)/usr/lib/libkeynote.a -endef - define Package/keynote/install $(INSTALL_DIR) $(1)/usr/sbin $(INSTALL_BIN) $(PKG_BUILD_DIR)/keynote $(1)/usr/sbin/ diff --git a/package/libjson-c/Makefile b/package/libjson-c/Makefile index bcb298418d0..f713cc61574 100644 --- a/package/libjson-c/Makefile +++ b/package/libjson-c/Makefile @@ -44,12 +44,6 @@ define Build/InstallDev $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/json.pc $(1)/usr/lib/pkgconfig/ endef -define Build/UninstallDev - rm -rf $(1)/usr/include/json \ - $(1)/usr/lib/libjson.{a,so*} \ - $(1)/usr/lib/pkgconfig/json.pc -endef - define Package/libjson/install $(INSTALL_DIR) $(1)/usr/lib $(CP) $(PKG_INSTALL_DIR)/usr/lib/libjson.so.* $(1)/usr/lib/ diff --git a/package/libnl/Makefile b/package/libnl/Makefile index 85a524861c1..3303260d4ed 100644 --- a/package/libnl/Makefile +++ b/package/libnl/Makefile @@ -43,9 +43,6 @@ ifneq ($(CONFIG_LINUX_2_6_23),) $(CP) $(PKG_BUILD_DIR)/include/linux $(1)/usr/include/libnl/ endef - define Build/UninstallDev - endef - define Package/libnl/install $(INSTALL_DIR) $(1)/usr/lib $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/libnl.so.1 $(1)/usr/lib/ diff --git a/package/libpcap/Makefile b/package/libpcap/Makefile index bd039f911df..d7956a61b83 100644 --- a/package/libpcap/Makefile +++ b/package/libpcap/Makefile @@ -54,11 +54,6 @@ define Build/InstallDev $(1)/usr/lib/ endef -define Build/UninstallDev - rm -rf $(1)/usr/include/pcap{,-bpf,-namedb}.h \ - $(1)/usr/lib/libpcap.{a,so*} -endef - define Package/libpcap/install $(INSTALL_DIR) $(1)/usr/lib $(CP) $(PKG_INSTALL_DIR)/usr/lib/libpcap.so.* $(1)/usr/lib/ diff --git a/package/linux-atm/Makefile b/package/linux-atm/Makefile index f67294e0810..4f9b4f612d9 100644 --- a/package/linux-atm/Makefile +++ b/package/linux-atm/Makefile @@ -67,11 +67,6 @@ ifneq ($(CONFIG_PACKAGE_linux-atm),) $(CP) $(PKG_INSTALL_DIR)/usr/lib/libatm.{a,so*} \ $(1)/usr/lib/ endef - - define Build/UninstallDev - rm -rf $(1)/usr/include/atm{,d,sap}.h \ - $(1)/usr/lib/libatm.{a,so*} - endef endif define Package/linux-atm/install diff --git a/package/mac80211/Makefile b/package/mac80211/Makefile index 42f8ad232bf..723ba77be5a 100644 --- a/package/mac80211/Makefile +++ b/package/mac80211/Makefile @@ -63,10 +63,6 @@ ifeq ($(CONFIG_LINUX_2_6_23),y) $(CP) $(PKG_BUILD_DIR)/net/mac80211/*.h $(PKG_BUILD_DIR)/include/* $(1)/usr/include/mac80211/ endef - define Build/UninstallDev - rm -rf $(1)/usr/include/mac80211 - endef - define KernelPackage/mac80211/install $(INSTALL_DIR) $(1)/lib/wifi $(INSTALL_DATA) ./files/lib/wifi/mac80211.sh $(1)/lib/wifi diff --git a/package/madwifi/Makefile b/package/madwifi/Makefile index 3f6be3f9ca3..3c72bc73072 100644 --- a/package/madwifi/Makefile +++ b/package/madwifi/Makefile @@ -155,10 +155,6 @@ define Build/InstallDev $(CP) $(PKG_BUILD_DIR)/net80211/*.h $(1)/usr/include/madwifi/net80211/ endef -define Build/UninstallDev - rm -rf $(1)/usr/include/madwifi -endef - define KernelPackage/madwifi/install $(INSTALL_DIR) $(1)/lib/wifi $(INSTALL_DATA) ./files/lib/wifi/madwifi.sh $(1)/lib/wifi diff --git a/package/ncurses/Makefile b/package/ncurses/Makefile index 6da4299e815..51a5a0a1abb 100644 --- a/package/ncurses/Makefile +++ b/package/ncurses/Makefile @@ -155,19 +155,4 @@ define Build/InstallDev $(CP) $(PKG_INSTALL_DIR)/usr/lib/lib{ncurses,panel,menu,form}.{a,so*} $(1)/usr/lib/ endef -define Build/UninstallDev - rm -rf \ - $(1)/usr/include/curses.h \ - $(1)/usr/include/ncurses.h \ - $(1)/usr/include/ncurses_dll.h \ - $(1)/usr/include/menu.h \ - $(1)/usr/include/panel.h \ - $(1)/usr/include/term{,cap}.h \ - $(1)/usr/include/unctrl.h \ - $(1)/usr/include/form.h \ - $(1)/usr/include/eti.h \ - $(1)/usr/lib/libcurses.so \ - $(1)/usr/lib/lib{ncurses,panel,menu,form}.{a,so*} -endef - $(eval $(call BuildPackage,libncurses)) diff --git a/package/nvram/Makefile b/package/nvram/Makefile index 2bcc3afcf44..6020bfc0549 100644 --- a/package/nvram/Makefile +++ b/package/nvram/Makefile @@ -34,10 +34,6 @@ define Build/InstallDev $(CP) $(PKG_BUILD_DIR)/lib{nvram,shared}*.so $(1)/usr/lib/ endef -define Build/UninstallDev - rm -f $(1)/usr/lib/lib{nvram,shared}*.so -endef - define Package/nvram/install $(INSTALL_DIR) $(1)/etc/init.d $(INSTALL_BIN) ./files/nvram.init $(1)/etc/init.d/nvram diff --git a/package/openssl/Makefile b/package/openssl/Makefile index 4a6dcdbe5e3..86c584b7eb6 100644 --- a/package/openssl/Makefile +++ b/package/openssl/Makefile @@ -118,12 +118,6 @@ define Build/InstallDev $(SED) 's,$(TARGET_LDFLAGS),,g' $(1)/usr/lib/pkgconfig/{openssl,libcrypto,libssl}.pc endef -define Build/UninstallDev - rm -rf $(1)/usr/include/openssl \ - $(1)/usr/lib/lib{crypto,ssl}.{a,so*} \ - $(1)/usr/lib/pkgconfig/{openssl,libcrypto,libssl}.pc -endef - define Package/libopenssl/install $(INSTALL_DIR) $(1)/usr/lib $(CP) $(PKG_INSTALL_DIR)/usr/lib/lib{crypto,ssl}.so.* $(1)/usr/lib/ diff --git a/package/wireless-tools/Makefile b/package/wireless-tools/Makefile index e66b2e3a490..79b6ee08fbd 100644 --- a/package/wireless-tools/Makefile +++ b/package/wireless-tools/Makefile @@ -55,11 +55,6 @@ define Build/InstallDev $(CP) $(PKG_BUILD_DIR)/libiw.so* $(1)/usr/lib/ ln -sf libiw.so.$(PKG_VERSION) $(1)/usr/lib/libiw.so endef - -define Build/UninstallDev - rm -f $(1)/usr/include/{iwlib,wireless}.h \ - $(1)/usr/lib/libiw.so* -endef define Package/wireless-tools/install $(INSTALL_DIR) $(1)/usr/sbin diff --git a/package/zlib/Makefile b/package/zlib/Makefile index 19dc3e65b12..9cf92197b7b 100644 --- a/package/zlib/Makefile +++ b/package/zlib/Makefile @@ -56,11 +56,6 @@ define Build/InstallDev $(CP) $(PKG_INSTALL_DIR)/usr/lib/libz.{a,so*} \ $(1)/usr/lib/ endef - -define Build/UninstallDev - rm -rf $(1)/usr/include/z{conf,lib}.h \ - $(1)/usr/lib/libz.{a,so*} -endef # libz.so is needed for openssl (zlib-dynamic) define Package/zlib/install