From a7f962687005e09bf2ec54d3d43c04b1a0d6ca19 Mon Sep 17 00:00:00 2001 From: Nicolas Thill Date: Tue, 21 Nov 2006 22:01:26 +0000 Subject: [PATCH] Makefile cleanup, remove unused variables and options SVN-Revision: 5611 --- libs/avahi/Makefile | 1 - libs/howl/Makefile | 1 - libs/libiconv/Makefile | 1 - libs/libmcrypt/Makefile | 3 +-- libs/libupnp/Makefile | 1 - libs/popt/Makefile | 1 - net/autossh/Makefile | 1 - net/bmon/Makefile | 3 --- net/dhcp-forwarder/Makefile | 2 -- utils/gnupg/Makefile | 1 - utils/pciutils/Makefile | 1 - utils/rrdcollect/Makefile | 3 +-- utils/setpwc/Makefile | 1 - 13 files changed, 2 insertions(+), 18 deletions(-) diff --git a/libs/avahi/Makefile b/libs/avahi/Makefile index 09fb792ed5..ab470233f8 100644 --- a/libs/avahi/Makefile +++ b/libs/avahi/Makefile @@ -94,7 +94,6 @@ define Build/Configure $(call Build/Configure/Default, \ --enable-shared \ --enable-static \ - --with-gnu-ld \ --disable-glib \ --disable-qt3 \ --disable-qt4 \ diff --git a/libs/howl/Makefile b/libs/howl/Makefile index fbee87c7c3..33264c3421 100644 --- a/libs/howl/Makefile +++ b/libs/howl/Makefile @@ -85,7 +85,6 @@ define Build/Configure $(call Build/Configure/Default, \ --enable-shared \ --enable-static \ - --with-gnu-ld \ ); endef diff --git a/libs/libiconv/Makefile b/libs/libiconv/Makefile index 6f3524bde3..27e62bcefd 100644 --- a/libs/libiconv/Makefile +++ b/libs/libiconv/Makefile @@ -34,7 +34,6 @@ define Build/Configure --enable-shared \ --enable-static \ --disable-rpath \ - --with-gnu-ld \ ) endef diff --git a/libs/libmcrypt/Makefile b/libs/libmcrypt/Makefile index 3df44eca35..77de1fc733 100644 --- a/libs/libmcrypt/Makefile +++ b/libs/libmcrypt/Makefile @@ -36,7 +36,6 @@ define Build/Configure $(call Build/Configure/Default, \ --enable-shared \ --enable-static \ - --with-gnu-ld \ ) endef @@ -66,7 +65,7 @@ endef define Package/libmcrypt/install install -d -m0755 $(1)/usr/lib - $(CP) $(PKG_INSTALL_DIR)/usr/lib/libmcrypt.so.* $(1)/usr/lib + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libmcrypt.so.* $(1)/usr/lib/ endef $(eval $(call BuildPackage,libmcrypt)) diff --git a/libs/libupnp/Makefile b/libs/libupnp/Makefile index 1904a60344..ff81cce1a2 100644 --- a/libs/libupnp/Makefile +++ b/libs/libupnp/Makefile @@ -18,7 +18,6 @@ PKG_MD5SUM:=e72b3550bf064eedf080f16f09688891 PKG_CAT:=zcat PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) -PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install include $(INCLUDE_DIR)/package.mk diff --git a/libs/popt/Makefile b/libs/popt/Makefile index 0ccf9d31c5..d779a8547c 100644 --- a/libs/popt/Makefile +++ b/libs/popt/Makefile @@ -47,7 +47,6 @@ define Build/InstallDev $(CP) $(PKG_INSTALL_DIR)/usr/include/popt.h $(STAGING_DIR)/usr/include/ mkdir -p $(STAGING_DIR)/usr/lib $(CP) $(PKG_INSTALL_DIR)/usr/lib/libpopt.{a,so*} $(STAGING_DIR)/usr/lib/ - touch $(STAGING_DIR)/usr/lib/libpopt.so endef define Build/UninstallDev diff --git a/net/autossh/Makefile b/net/autossh/Makefile index f7a1e81eb8..670c7ffe96 100644 --- a/net/autossh/Makefile +++ b/net/autossh/Makefile @@ -18,7 +18,6 @@ PKG_MD5SUM:=0e7ec62eeca5d1b197f3ef2d0f0d417f PKG_CAT:=zcat PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) -PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install include $(INCLUDE_DIR)/package.mk diff --git a/net/bmon/Makefile b/net/bmon/Makefile index d7fef3d424..8f9f7326b2 100644 --- a/net/bmon/Makefile +++ b/net/bmon/Makefile @@ -18,7 +18,6 @@ PKG_MD5SUM:=3111a027907016c0902d67350c619df6 PKG_CAT:=zcat PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) -PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install include $(INCLUDE_DIR)/package.mk @@ -44,7 +43,6 @@ define Build/Configure ) endef - define Build/Compile $(call Build/Compile/Default,all) endef @@ -55,4 +53,3 @@ define Package/bmon/install endef $(eval $(call BuildPackage,bmon)) - diff --git a/net/dhcp-forwarder/Makefile b/net/dhcp-forwarder/Makefile index 2479b6c3bf..dac1cda906 100644 --- a/net/dhcp-forwarder/Makefile +++ b/net/dhcp-forwarder/Makefile @@ -36,8 +36,6 @@ endef # uses GNU configure define Build/Compile - rm -rf $(PKG_INSTALL_DIR) - mkdir -p $(PKG_INSTALL_DIR) $(MAKE) -C $(PKG_BUILD_DIR) \ cfg_filename="/etc/dhcp-fwd.conf" \ DESTDIR="$(PKG_INSTALL_DIR)" \ diff --git a/utils/gnupg/Makefile b/utils/gnupg/Makefile index e928ca88e7..35721b0510 100644 --- a/utils/gnupg/Makefile +++ b/utils/gnupg/Makefile @@ -34,7 +34,6 @@ endef define Build/Configure $(call Build/Configure/Default, \ --disable-rpath \ - --with-gnu-ld \ --disable-asm \ --disable-gnupg-iconv \ --disable-card-support \ diff --git a/utils/pciutils/Makefile b/utils/pciutils/Makefile index 8e561be0c3..11a063fe16 100644 --- a/utils/pciutils/Makefile +++ b/utils/pciutils/Makefile @@ -19,7 +19,6 @@ PKG_MD5SUM:=c18e2a5f04e9abae5a42439de294f086 PKG_CAT:=zcat PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) -PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install include $(INCLUDE_DIR)/package.mk diff --git a/utils/rrdcollect/Makefile b/utils/rrdcollect/Makefile index ca581ea95b..420edf9eec 100644 --- a/utils/rrdcollect/Makefile +++ b/utils/rrdcollect/Makefile @@ -22,7 +22,7 @@ PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install include $(INCLUDE_DIR)/package.mk -define Package/rrdcollect +define Package/rrdcollect/Default SECTION:=utils CATEGORY:=Utilities DESCRIPTION:=\ @@ -63,7 +63,6 @@ define Build/Configure --enable-shared \ --disable-static \ --disable-rpath \ - --with-gnu-ld \ --enable-exec \ --without-rrdtool \ --with-librrd \ diff --git a/utils/setpwc/Makefile b/utils/setpwc/Makefile index b7cd10c877..3540966395 100644 --- a/utils/setpwc/Makefile +++ b/utils/setpwc/Makefile @@ -18,7 +18,6 @@ PKG_MD5SUM:=a125d76f630c4aab940df5912f161965 PKG_CAT:=zcat PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) -PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install include $(INCLUDE_DIR)/package.mk -- 2.30.2