From: Mike Baker <mbm@openwrt.org>
Date: Fri, 21 Apr 2006 10:03:46 +0000 (+0000)
Subject: Add default compile target & use it for bridge and busybox
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=170f0e635c21e459495016d7acb5da00c9634363;p=openwrt%2Fstaging%2Frmilecki.git

Add default compile target & use it for bridge and busybox

SVN-Revision: 3693
---

diff --git a/openwrt/package/bridge/Makefile b/openwrt/package/bridge/Makefile
index 18ea1dd2caf..bd71165b6d2 100644
--- a/openwrt/package/bridge/Makefile
+++ b/openwrt/package/bridge/Makefile
@@ -29,10 +29,6 @@ define Build/Configure
 $(call Build/Configure/Default,--with-linux-headers=$(LINUX_DIR))
 endef
 
-define Build/Compile
-	$(MAKE) -C $(PKG_BUILD_DIR)
-endef
-
 define Package/busybox/install
 	mkdir -p $(IDIR_BRIDGE)/usr/sbin
 	$(CP) $(PKG_BUILD_DIR)/brctl/brctl $(IDIR_BRIDGE)/usr/sbin/
diff --git a/openwrt/package/busybox/Makefile b/openwrt/package/busybox/Makefile
index 812e12a8935..3f061b82dbb 100644
--- a/openwrt/package/busybox/Makefile
+++ b/openwrt/package/busybox/Makefile
@@ -30,15 +30,6 @@ define Build/Configure
 	yes '' | $(MAKE) CC=$(TARGET_CC) CROSS="$(TARGET_CROSS)" -C $(PKG_BUILD_DIR) oldconfig
 endef
 
-define Build/Compile
-	$(MAKE) -C $(PKG_BUILD_DIR) \
-		CC=$(TARGET_CC) \
-		CROSS="$(TARGET_CROSS)" \
-		PREFIX="$(IDIR_BUSYBOX)" \
-		EXTRA_CFLAGS="$(TARGET_CFLAGS)" \
-		ARCH="$(ARCH)" 
-endef
-
 define Package/busybox/install
 	$(MAKE) CC=$(TARGET_CC) CROSS="$(TARGET_CROSS)" PREFIX="$(1)" \
 		EXTRA_CFLAGS="$(TARGET_CFLAGS)" -C $(PKG_BUILD_DIR) install
diff --git a/openwrt/package/rules.mk b/openwrt/package/rules.mk
index 916bb0f277f..17f6c61ef39 100644
--- a/openwrt/package/rules.mk
+++ b/openwrt/package/rules.mk
@@ -213,7 +213,13 @@ define Build/Configure
 endef
 
 define Build/Compile/Default
-# TODO: add configurable default command
+	$(MAKE) -C $(PKG_BUILD_DIR) \
+		CC=$(TARGET_CC) \
+		CROSS="$(TARGET_CROSS)" \
+		PREFIX="$$(IDIR_$(1))" \
+		EXTRA_CFLAGS="$(TARGET_CFLAGS)" \
+		ARCH="$(ARCH)" \
+		DESTDIR="$$(IDIR_$(1))"
 endef
 
 define Build/Compile