aboutsummaryrefslogtreecommitdiffstats
path: root/package
diff options
context:
space:
mode:
authorMike Baker <mbm@openwrt.org>2006-04-21 10:03:46 +0000
committerMike Baker <mbm@openwrt.org>2006-04-21 10:03:46 +0000
commit3960174fa96b7284291d65d0c3d0f3c9c839956e (patch)
tree76b9aaa24ed9428ffe8825005a5ada7421cabc18 /package
parent38d10e52d5e640495087acc8a2dcbd773c436acb (diff)
downloadupstream-3960174fa96b7284291d65d0c3d0f3c9c839956e.tar.gz
upstream-3960174fa96b7284291d65d0c3d0f3c9c839956e.tar.bz2
upstream-3960174fa96b7284291d65d0c3d0f3c9c839956e.zip
Add default compile target & use it for bridge and busybox
git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@3693 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package')
-rw-r--r--package/bridge/Makefile4
-rw-r--r--package/busybox/Makefile9
-rw-r--r--package/rules.mk8
3 files changed, 7 insertions, 14 deletions
diff --git a/package/bridge/Makefile b/package/bridge/Makefile
index 18ea1dd2ca..bd71165b6d 100644
--- a/package/bridge/Makefile
+++ b/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/package/busybox/Makefile b/package/busybox/Makefile
index 812e12a893..3f061b82db 100644
--- a/package/busybox/Makefile
+++ b/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/package/rules.mk b/package/rules.mk
index 916bb0f277..17f6c61ef3 100644
--- a/package/rules.mk
+++ b/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