summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormbm <mbm@3c298f89-4303-0410-b956-a3cf2f4a3e73>2006-08-04 05:30:27 +0000
committermbm <mbm@3c298f89-4303-0410-b956-a3cf2f4a3e73>2006-08-04 05:30:27 +0000
commit001227b7800328fe3db15d62e0948d25dfa596f6 (patch)
treeeef210eda4aebbb09ffdd1c051b1a61d2ba69aa7
parent8b379ad6296f23d04b8a73b70d6a88cb78634244 (diff)
more cleanup (make sure to pass TARGET_PATH and not just TARGET_CC)
git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@4432 3c298f89-4303-0410-b956-a3cf2f4a3e73
-rw-r--r--include/kernel-build.mk4
-rw-r--r--include/package.mk1
-rw-r--r--package/dnsmasq/Makefile2
-rw-r--r--package/dropbear/Makefile4
-rw-r--r--package/libpcap/Makefile1
-rw-r--r--package/linux-atm/Makefile6
-rw-r--r--package/mtd/Makefile6
-rw-r--r--package/ppp/Makefile2
-rw-r--r--package/wireless-tools/Makefile3
9 files changed, 10 insertions, 19 deletions
diff --git a/include/kernel-build.mk b/include/kernel-build.mk
index 38ea9a18eb..e3f2d5daed 100644
--- a/include/kernel-build.mk
+++ b/include/kernel-build.mk
@@ -66,7 +66,7 @@ else
endif
$(LINUX_DIR)/vmlinux: $(LINUX_DIR)/.linux-compile pkg-install ramdisk-config
- $(MAKE) -C $(LINUX_DIR) CROSS_COMPILE="$(KERNEL_CROSS)" ARCH=$(LINUX_KARCH) PATH=$(TARGET_PATH)
+ $(MAKE) -C $(LINUX_DIR) CROSS_COMPILE="$(KERNEL_CROSS)" ARCH=$(LINUX_KARCH) PATH="$(TARGET_PATH)"
$(LINUX_KERNEL): $(LINUX_DIR)/vmlinux
$(KERNEL_CROSS)objcopy -O binary -R .reginfo -R .note -R .comment -R .mdebug -S $< $@
@@ -75,7 +75,7 @@ $(LINUX_KERNEL): $(LINUX_DIR)/vmlinux
$(LINUX_DIR)/.modules_done:
rm -rf $(KERNEL_BUILD_DIR)/modules
$(MAKE) -C "$(LINUX_DIR)" CROSS_COMPILE="$(KERNEL_CROSS)" ARCH=$(LINUX_KARCH) PATH="$(TARGET_PATH)" modules
- $(MAKE) -C "$(LINUX_DIR)" CROSS_COMPILE="$(KERNEL_CROSS)" ARCH=$(LINUX_KARCH) DEPMOD=true INSTALL_MOD_PATH=$(KERNEL_BUILD_DIR)/modules modules_install
+ $(MAKE) -C "$(LINUX_DIR)" CROSS_COMPILE="$(KERNEL_CROSS)" ARCH=$(LINUX_KARCH) PATH="$(TARGET_PATH)" DEPMOD=true INSTALL_MOD_PATH=$(KERNEL_BUILD_DIR)/modules modules_install
touch $(LINUX_DIR)/.modules_done
modules: $(LINUX_DIR)/.modules_done
diff --git a/include/package.mk b/include/package.mk
index c0953ae701..fee715043c 100644
--- a/include/package.mk
+++ b/include/package.mk
@@ -285,7 +285,6 @@ endef
define Build/Compile/Default
$(MAKE) -C $(PKG_BUILD_DIR) \
$(TARGET_CONFIGURE_OPTS) \
- CC=$(TARGET_CC) \
CROSS="$(TARGET_CROSS)" \
EXTRA_CFLAGS="$(TARGET_CFLAGS) -I$(STAGING_DIR)/include -I$(STAGING_DIR)/usr/include" \
ARCH="$(ARCH)" \
diff --git a/package/dnsmasq/Makefile b/package/dnsmasq/Makefile
index 0efb349bc8..f6c2d36c52 100644
--- a/package/dnsmasq/Makefile
+++ b/package/dnsmasq/Makefile
@@ -36,7 +36,7 @@ endef
define Build/Compile
$(MAKE) -C $(PKG_BUILD_DIR) \
- CC="$(TARGET_CC)" CFLAGS="$(TARGET_CFLAGS)" \
+ $(TARGET_CONFIGURE_OPTS) \
BINDIR="/usr/sbin" MANDIR="/usr/man" \
all
endef
diff --git a/package/dropbear/Makefile b/package/dropbear/Makefile
index 48e69e466f..cfb2c4135e 100644
--- a/package/dropbear/Makefile
+++ b/package/dropbear/Makefile
@@ -81,11 +81,11 @@ endef
define Build/Compile
$(MAKE) -C $(PKG_BUILD_DIR) \
- LD="$(TARGET_CC)" \
+ $(TARGET_CONFIGURE_OPTS) \
PROGRAMS="dropbear dbclient dropbearkey scp" \
MULTI=1 SCPPROGRESS=1
$(MAKE) -C $(PKG_BUILD_DIR) \
- LD="$(TARGET_CC)" \
+ $(TARGET_CONFIGURE_OPTS) \
PROGRAMS="dropbearconvert"
endef
diff --git a/package/libpcap/Makefile b/package/libpcap/Makefile
index 1d9d4371fb..155748a472 100644
--- a/package/libpcap/Makefile
+++ b/package/libpcap/Makefile
@@ -71,6 +71,7 @@ define Build/Compile
mkdir -p $(PKG_INSTALL_DIR)
$(MAKE) -C $(PKG_BUILD_DIR) \
CCOPT="$(TARGET_CFLAGS) -I$(BUILD_DIR)/linux/include" \
+ PATH=$(TARGET_PATH) \
DESTDIR="$(PKG_INSTALL_DIR)" \
all install
endef
diff --git a/package/linux-atm/Makefile b/package/linux-atm/Makefile
index 0b8c59d4e1..56ca90a383 100644
--- a/package/linux-atm/Makefile
+++ b/package/linux-atm/Makefile
@@ -44,11 +44,7 @@ define Build/Configure
endef
define Build/Compile
- rm -rf $(PKG_INSTALL_DIR)
- mkdir -p $(PKG_INSTALL_DIR)
- $(MAKE) -C $(PKG_BUILD_DIR) \
- DESTDIR="$(PKG_INSTALL_DIR)" \
- all install
+ $(call Build/Compile/Default,DESTDIR="$(PKG_INSTALL_DIR)" all install)
endef
define Package/linux-atm/install
diff --git a/package/mtd/Makefile b/package/mtd/Makefile
index b3bf6023af..01b9adf98f 100644
--- a/package/mtd/Makefile
+++ b/package/mtd/Makefile
@@ -29,12 +29,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/mtd/install
install -d -m0755 $(1)/sbin
install -m0755 $(PKG_BUILD_DIR)/mtd $(1)/sbin/
diff --git a/package/ppp/Makefile b/package/ppp/Makefile
index a42af41d31..64351a5ca1 100644
--- a/package/ppp/Makefile
+++ b/package/ppp/Makefile
@@ -87,7 +87,7 @@ define Build/Compile
rm -rf $(PKG_INSTALL_DIR)
mkdir -p $(PKG_INSTALL_DIR)/usr
$(MAKE) -C $(PKG_BUILD_DIR) \
- CC="$(TARGET_CC)" \
+ $(TARGET_CONFIGURE_OPTS) \
COPTS="$(TARGET_CFLAGS)" \
PRECOMPILED_FILTER=1 \
STAGING_DIR="$(STAGING_DIR)" \
diff --git a/package/wireless-tools/Makefile b/package/wireless-tools/Makefile
index 5884424876..32e7fc05a9 100644
--- a/package/wireless-tools/Makefile
+++ b/package/wireless-tools/Makefile
@@ -35,7 +35,8 @@ define Build/Compile
rm -rf $(PKG_INSTALL_DIR)
mkdir -p $(PKG_INSTALL_DIR)
$(MAKE) -C $(PKG_BUILD_DIR) \
- CC="$(TARGET_CC)" CFLAGS="$(TARGET_CFLAGS) -I." \
+ $(TARGET_CONFIGURE_OPTS) \
+ CFLAGS="$(TARGET_CFLAGS) -I." \
libiw.so.28 iwmulticall
$(MAKE) -C $(PKG_BUILD_DIR) \
PREFIX="$(PKG_INSTALL_DIR)" \