Fix/clean several hundred package makefiles

SVN-Revision: 4603
18 years ago · 43459c3f82
parent 55f3d75f84
commit 43459c3f82
7 changed files with 6 additions and 19 deletions
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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/
--- 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)" \