summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormbm <mbm@3c298f89-4303-0410-b956-a3cf2f4a3e73>2006-08-18 21:21:06 +0000
committermbm <mbm@3c298f89-4303-0410-b956-a3cf2f4a3e73>2006-08-18 21:21:06 +0000
commitae98e0cfbcade9b099afc6f7bcbbaa1ed9d5448c (patch)
treeb24a2ff228ace9eaf2dd4af0aa0bff455301cb3f
parent4c66f72328d338b0e6f01c9cadc3cc0fe26ae2e0 (diff)
Fix/clean several hundred package makefiles
git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@4603 3c298f89-4303-0410-b956-a3cf2f4a3e73
-rw-r--r--package/arptables/Makefile2
-rw-r--r--package/broadcom-wl/Makefile1
-rw-r--r--package/hostapd/Makefile7
-rw-r--r--package/linux-atm/Makefile2
-rw-r--r--package/pcmcia-cs/Makefile6
-rw-r--r--package/robocfg/Makefile6
-rw-r--r--package/zd1211/Makefile1
7 files changed, 6 insertions, 19 deletions
diff --git a/package/arptables/Makefile b/package/arptables/Makefile
index 855169b7f9..40e9ac13b0 100644
--- a/package/arptables/Makefile
+++ b/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/package/broadcom-wl/Makefile b/package/broadcom-wl/Makefile
index f7428188d3..ce447a4ac2 100644
--- a/package/broadcom-wl/Makefile
+++ b/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/package/hostapd/Makefile b/package/hostapd/Makefile
index 352d597669..a1161e11fe 100644
--- a/package/hostapd/Makefile
+++ b/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/package/linux-atm/Makefile b/package/linux-atm/Makefile
index 56ca90a383..55b044862e 100644
--- a/package/linux-atm/Makefile
+++ b/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/package/pcmcia-cs/Makefile b/package/pcmcia-cs/Makefile
index 11f32a8923..fcdf71cd76 100644
--- a/package/pcmcia-cs/Makefile
+++ b/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/package/robocfg/Makefile b/package/robocfg/Makefile
index e43198de93..072735ef60 100644
--- a/package/robocfg/Makefile
+++ b/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/package/zd1211/Makefile b/package/zd1211/Makefile
index 651621f7e8..0c94cd14df 100644
--- a/package/zd1211/Makefile
+++ b/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)" \