Fix/clean several hundred package makefiles

SVN-Revision: 4603

diff --git a/openwrt/package/arptables/Makefile b/openwrt/package/arptables/Makefile
index 855169b7f9d32d3325482ef9415a1622b7d0c09f..40e9ac13b02940531c9ca98f7f56d53918f01551 100644 (file)
--- a/openwrt/package/arptables/Makefile
+++ b/openwrt/package/arptables/Makefile
@@ -33,7 +33,7 @@ define Build/Compile
        rm -rf $(PKG_INSTALL_DIR)
        mkdir -p $(PKG_INSTALL_DIR)
        $(MAKE) -C $(PKG_BUILD_DIR) \
-               CC="$(TARGET_CC)" LD="$(TARGET_CROSS)ld" \
+               $(TARGET_CONFIGURE_OPTS) \
                COPT_FLAGS="$(TARGET_CFLAGS)" \
                KERNEL_DIR="./include/linux"
 endef

diff --git a/openwrt/package/broadcom-wl/Makefile b/openwrt/package/broadcom-wl/Makefile
index f7428188d37a6729dc8fe3b98973ff7e5abe1ebd..ce447a4ac272c8fcb8e0476cc4d909a68cfc9ed8 100644 (file)
--- a/openwrt/package/broadcom-wl/Makefile
+++ b/openwrt/package/broadcom-wl/Makefile
@@ -87,7 +87,6 @@ define Build/Compile
        # Compile wlc
        $(MAKE) -C $(PKG_BUILD_DIR)/wlc \
                $(TARGET_CONFIGURE_OPTS) \
-               CC="$(TARGET_CC)" \
                CFLAGS="-I$(PKG_BUILD_DIR)/wlc/include $(TARGET_CFLAGS)" \
                all
 endef

diff --git a/openwrt/package/hostapd/Makefile b/openwrt/package/hostapd/Makefile
index 352d597669ae4f06d6f41337bc39743aebb0ed8c..a1161e11fe82810eca01a605d4b0cff8fb580532 100644 (file)
--- a/openwrt/package/hostapd/Makefile
+++ b/openwrt/package/hostapd/Makefile
@@ -87,11 +87,10 @@ define Package/Template
   define Build/Compile/$(2)
        $(call Build/CompileTarget,$(2))
   endef
- endif
-
- define Package/$(1)/install
+  define Package/$(1)/install
        $(call Package/InstallTemplate,$(1),$(2))
- endef
+  endef
+ endif
 endef
 
 define Build/Configure

diff --git a/openwrt/package/linux-atm/Makefile b/openwrt/package/linux-atm/Makefile
index 56ca90a383788fc331016b158184efe94700b148..55b044862e7896104ca1511c75c08664ff03c10c 100644 (file)
--- a/openwrt/package/linux-atm/Makefile
+++ b/openwrt/package/linux-atm/Makefile
@@ -38,7 +38,7 @@ DESCRIPTION:=ATM RFC2684 bridging utility
 endef
 
 define Build/Configure
-       $(call Build/Configure/Default,)
+       $(call Build/Configure/Default)
        # prevent autoheader invocation
        touch $(PKG_BUILD_DIR)/stamp-h.in
 endef

diff --git a/openwrt/package/pcmcia-cs/Makefile b/openwrt/package/pcmcia-cs/Makefile
index 11f32a89239e099527293316eada469c598c1a61..fcdf71cd76ac29fe9cf0dac87a5b1813a1447488 100644 (file)
--- a/openwrt/package/pcmcia-cs/Makefile
+++ b/openwrt/package/pcmcia-cs/Makefile
@@ -50,11 +50,7 @@ define Build/Configure
 endef
 
 define Build/Compile
-       rm -rf $(PKG_INSTALL_DIR)
-       mkdir -p $(PKG_INSTALL_DIR)
-       $(MAKE) -C $(PKG_BUILD_DIR) \
-               CFLAGS="$(TARGET_CFLAGS)" \
-               all install
+  $(call Build/Compile/Default,CFLAGS="$(TARGET_CFLAGS)" all install)
 endef
 
 define Package/pcmcia-cs/install

diff --git a/openwrt/package/robocfg/Makefile b/openwrt/package/robocfg/Makefile
index e43198de93bb63897d94aab67f392a24a60d4c09..072735ef6012aed9dce003bfb4751c15fd29a182 100644 (file)
--- a/openwrt/package/robocfg/Makefile
+++ b/openwrt/package/robocfg/Makefile
@@ -27,12 +27,6 @@ define Build/Prepare
        $(CP) ./src/* $(PKG_BUILD_DIR)/
 endef
 
-define Build/Compile
-       $(MAKE) -C $(PKG_BUILD_DIR) \
-               CC="$(TARGET_CC)" CFLAGS="$(TARGET_CFLAGS)" \
-               all
-endef
-
 define Package/robocfg/install
        install -d -m0755 $(1)/sbin
        install -m0755 $(PKG_BUILD_DIR)/robocfg $(1)/sbin/

diff --git a/openwrt/package/zd1211/Makefile b/openwrt/package/zd1211/Makefile
index 651621f7e849ae363c3d954b0eac980a7a13cd77..0c94cd14dfcedc800c5122836f7889b799d127e8 100644 (file)
--- a/openwrt/package/zd1211/Makefile
+++ b/openwrt/package/zd1211/Makefile
@@ -42,7 +42,6 @@ define Build/Compile
                CC="$(TARGET_CC)" \
                CPP="$(TARGET_CC)" \
                LD="$(TARGET_CROSS)ld" \
-               STAGING_DIR=$(STAGING_DIR) \
                KERNELVERSION="$(KERNEL)" \
                KERNEL_SOURCE="$(LINUX_DIR)" \
                KDIR="$(LINUX_DIR)" \