aboutsummaryrefslogtreecommitdiffstats
path: root/target
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2007-01-14 23:37:40 +0000
committerFelix Fietkau <nbd@openwrt.org>2007-01-14 23:37:40 +0000
commit2cf3780bea997e6908ff493f20f04bdb5f128a47 (patch)
treed680bd5375024aa5e8b6a06b999f03a3655f14fc /target
parenta4ee82e1988661811cab300e22c38258271e13cb (diff)
downloadmaster-187ad058-2cf3780bea997e6908ff493f20f04bdb5f128a47.tar.gz
master-187ad058-2cf3780bea997e6908ff493f20f04bdb5f128a47.tar.bz2
master-187ad058-2cf3780bea997e6908ff493f20f04bdb5f128a47.zip
Fix config checks for Image Builder and SDK - only build them when requested.
Clear all packages from bin/packages at the beginning of package/compile when the Image Builder is selected, because the Image Builder can't handle multiple versions of the same package. git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6102 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target')
-rw-r--r--target/Makefile10
-rw-r--r--target/imagebuilder/Makefile4
-rw-r--r--target/sdk/Makefile5
3 files changed, 13 insertions, 6 deletions
diff --git a/target/Makefile b/target/Makefile
index 4853e3fbd2..3f97b9a14d 100644
--- a/target/Makefile
+++ b/target/Makefile
@@ -20,7 +20,15 @@ IMAGE_DIR:=linux/$(BOARD)-$(KERNEL)/image
download: $(patsubst %,%-download,$(TARGETS-y))
prepare: linux-prepare
compile: linux-compile image_compile
-install: image_clean linux-install sdk_install image_install imagebuilder_install
+install: image_clean linux-install image_install
+
+ifeq ($(CONFIG_SDK),y)
+install: sdk_install
+endif
+ifeq ($(CONFIG_IB),y)
+install: imagebuilder_install
+endif
+
clean: linux-clean sdk-clean imagebuilder-clean image_clean
prereq: FORCE
diff --git a/target/imagebuilder/Makefile b/target/imagebuilder/Makefile
index 439a103428..b59b265adc 100644
--- a/target/imagebuilder/Makefile
+++ b/target/imagebuilder/Makefile
@@ -18,7 +18,7 @@ IB_BUILD_DIR:=$(BUILD_DIR)/$(IB_NAME)
all: compile
-$(BIN_DIR)/$(IB_NAME).tar.bz2: FORCE
+$(BIN_DIR)/$(IB_NAME).tar.bz2: clean
rm -rf $(IB_BUILD_DIR)
mkdir -p $(IB_BUILD_DIR)/build_$(ARCH)/linux-$(KERNEL)-$(BOARD) $(IB_BUILD_DIR)/staging_dir_$(ARCH)/bin $(IB_BUILD_DIR)/target/linux
$(CP) \
@@ -43,5 +43,5 @@ prepare:
compile: $(BIN_DIR)/$(IB_NAME).tar.bz2
install: compile
-clean:
+clean: FORCE
rm -rf $(IB_BUILD_DIR) $(BIN_DIR)/$(IB_NAME).tar.bz2
diff --git a/target/sdk/Makefile b/target/sdk/Makefile
index 56a6c97ecd..d65b934c95 100644
--- a/target/sdk/Makefile
+++ b/target/sdk/Makefile
@@ -18,8 +18,7 @@ SDK_BUILD_DIR:=$(BUILD_DIR)/$(SDK_NAME)
all: compile
-$(BIN_DIR)/$(SDK_NAME).tar.bz2:
- rm -rf $(SDK_BUILD_DIR)
+$(BIN_DIR)/$(SDK_NAME).tar.bz2: clean
mkdir -p $(SDK_BUILD_DIR)/dl $(SDK_BUILD_DIR)/package
$(CP) $(INCLUDE_DIR) $(SCRIPT_DIR) $(TOPDIR)/docs $(SDK_BUILD_DIR)/
$(TAR) -cf - -C $(TOPDIR) --exclude=ccache/ staging_dir_$(ARCH) | \
@@ -45,7 +44,7 @@ $(BIN_DIR)/$(SDK_NAME).tar.bz2:
download:
prepare:
compile: $(BIN_DIR)/$(SDK_NAME).tar.bz2
-install:
+install: compile
clean:
rm -rf $(SDK_BUILD_DIR) $(BIN_DIR)/$(SDK_NAME).tar.bz2