From 43459c3f822235d48919ed612d3fdd758887bebb Mon Sep 17 00:00:00 2001 From: Mike Baker <mbm@openwrt.org> Date: Fri, 18 Aug 2006 21:21:06 +0000 Subject: [PATCH] Fix/clean several hundred package makefiles SVN-Revision: 4603 --- openwrt/package/arptables/Makefile | 2 +- openwrt/package/broadcom-wl/Makefile | 1 - openwrt/package/hostapd/Makefile | 7 +++---- openwrt/package/linux-atm/Makefile | 2 +- openwrt/package/pcmcia-cs/Makefile | 6 +----- openwrt/package/robocfg/Makefile | 6 ------ openwrt/package/zd1211/Makefile | 1 - 7 files changed, 6 insertions(+), 19 deletions(-) diff --git a/openwrt/package/arptables/Makefile b/openwrt/package/arptables/Makefile index 855169b7f9..40e9ac13b0 100644 --- 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 f7428188d3..ce447a4ac2 100644 --- 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 352d597669..a1161e11fe 100644 --- 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 56ca90a383..55b044862e 100644 --- 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 11f32a8923..fcdf71cd76 100644 --- 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 e43198de93..072735ef60 100644 --- 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 651621f7e8..0c94cd14df 100644 --- 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)" \ -- 2.25.1