Makefile cleanup, remove unused variables and options

git-svn-id: svn://svn.openwrt.org/openwrt/packages@5611 3c298f89-4303-0410-b956-a3cf2f4a3e73

diff --git a/libs/avahi/Makefile b/libs/avahi/Makefile
index 09fb792..ab47023 100644 (file)
--- 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 fbee87c..33264c3 100644 (file)
--- 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 6f3524b..27e62bc 100644 (file)
--- 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 3df44ec..77de1fc 100644 (file)
--- 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 1904a60..ff81cce 100644 (file)
--- 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 0ccf9d3..d779a85 100644 (file)
--- 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 f7a1e81..670c7ff 100644 (file)
--- 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 d7fef3d..8f9f732 100644 (file)
--- 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 2479b6c..dac1cda 100644 (file)
--- 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 e928ca8..35721b0 100644 (file)
--- 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 8e561be..11a063f 100644 (file)
--- 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 ca581ea..420edf9 100644 (file)
--- 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 b7cd10c..3540966 100644 (file)
--- 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