Makefile cleanup, remove unused variables and options

SVN-Revision: 5611

diff --git a/libs/avahi/Makefile b/libs/avahi/Makefile
index 09fb792ed5225b1e3ad4094ff0686a94800945aa..ab470233f8b745a09b3ef80b173ebbf59b5528a0 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 fbee87c7c3a6fe3544e5dc91cd54f34a631dbbce..33264c34210f32ed10ed3b5be4d6148f839ba67a 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 6f3524bde389276122ba02b2e2f06600d40e788b..27e62bcefd01bf96d26240eb18738db8840cf516 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 3df44eca35aeb4f9d031a1976b058d6d39df3795..77de1fc7336fc370baff5ba1fcc6d481345a301a 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 1904a60344ce5bf66b7b436d7629ca093077b498..ff81cce1a2df32a37646c74781618a3f0c6b021c 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 0ccf9d31c597bfe862bc785d06dc2a12725ded1f..d779a8547c8d28b4d86a3d7c0d8284e63d466f09 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 f7a1e81eb81ceed8ee55574205e4d21475d7c6ce..670c7ffe963d1a2307ba235138a3023452bd6be2 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 d7fef3d42473e3cc66987704d2dc235579217b80..8f9f7326b2f2be177666500fab8cab185e8804d6 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 2479b6c3bf618bc9ec01fbc3037936f1581318d7..dac1cda906ac9f7601266c3b22e13fa34a8a9129 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 e928ca88e73fdf3e25bcc0271aa49c5196304347..35721b0510649eee8766b5297fe9dfad604f1830 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 8e561be0c373f0494c6b097ded56bd5f2e54ec42..11a063fe166f9f5e48515f2a058bae655e8fd250 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 ca581ea95b6ae7a4fc8da645a5930cb6203fcfca..420edf9eec60d8a6e804c4536226c645cc929c0b 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 b7cd10c8776206267138a786cb434c2f82fa9e5d..354096639514d7908ae2bc7de9c15947f94190cb 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