From e01b70e0b98336c876f8e102bf06bef9d6b73153 Mon Sep 17 00:00:00 2001 From: mbm Date: Fri, 21 Apr 2006 10:03:46 +0000 Subject: [PATCH] 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 --- package/bridge/Makefile | 4 ---- package/busybox/Makefile | 9 --------- package/rules.mk | 8 +++++++- 3 files changed, 7 insertions(+), 14 deletions(-) diff --git a/package/bridge/Makefile b/package/bridge/Makefile index 18ea1dd2c..bd71165b6 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 812e12a89..3f061b82d 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 916bb0f27..17f6c61ef 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 -- 2.35.1