Add default compile target & use it for bridge and busybox
authorMike Baker <mbm@openwrt.org>
Fri, 21 Apr 2006 10:03:46 +0000 (10:03 +0000)
committerMike Baker <mbm@openwrt.org>
Fri, 21 Apr 2006 10:03:46 +0000 (10:03 +0000)
SVN-Revision: 3693

openwrt/package/bridge/Makefile
openwrt/package/busybox/Makefile
openwrt/package/rules.mk

index 18ea1dd2caf92346180b0246e0e4dde0e27aafdf..bd71165b6d220ef723197c724d29a460d678cbc5 100644 (file)
@@ -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/
index 812e12a8935baccf553289c6d8147273c1296170..3f061b82dbb753b207fc890bceb18a7a66169e74 100644 (file)
@@ -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
index 916bb0f277f3ec8443331a91f51dfd95d24aae91..17f6c61ef3917614269c4512eebcd3e0d6ef9655 100644 (file)
@@ -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