another batch of V= stuff

git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@2244 3c298f89-4303-0410-b956-a3cf2f4a3e73

5 files changed, 8 insertions, 17 deletions

diff --git a/target/linux/Makefile b/target/linux/Makefile
index ae7545a464..fe3c6ca9f8 100644
--- a/target/linux/Makefile
+++ b/target/linux/Makefile
@@ -9,23 +9,23 @@ IB_DIR:=$(BUILD_DIR)/$(IB_NAME)
 define kernel_template
 
 $(1)/$(2)-clean:
-	$(TRACE) target/linux/linux-$(2)/clean
+	$(TRACE) target/linux/linux-$(1)/clean
 	$(MAKE) -C linux-$(1) KERNEL="$(1)" BOARD="$(2)" clean
 
 $(1)/$(2)-prepare:
-	$(TRACE) target/linux/linux-$(2)/prepare
+	$(TRACE) target/linux/linux-$(1)/prepare
 	$(MAKE) -C linux-$(1) KERNEL="$(1)" BOARD="$(2)" prepare
 
 $(1)/$(2)-compile:
-	$(TRACE) target/linux/linux-$(2)/compile
+	$(TRACE) target/linux/linux-$(1)/compile
 	$(MAKE) -C linux-$(1) KERNEL="$(1)" BOARD="$(2)" compile
 
 $(1)/$(2)-rebuild:
-	$(TRACE) target/linux/linux-$(2)/rebuild
+	$(TRACE) target/linux/linux-$(1)/rebuild
 	$(MAKE) -C linux-$(1) KERNEL="$(1)" BOARD="$(2)" rebuild
 
 $(1)/$(2)-install:
-	$(TRACE) target/linux/linux-$(2)/install
+	$(TRACE) target/linux/linux-$(1)/install
 	$(MAKE) -C linux-$(1) KERNEL="$(1)" BOARD="$(2)" install
 
 $(1)/$(2)-image: $(1)/$(2)-install
diff --git a/target/linux/linux-2.4/Makefile b/target/linux/linux-2.4/Makefile
index c3417bdcba..bd1dd6c5d3 100644
--- a/target/linux/linux-2.4/Makefile
+++ b/target/linux/linux-2.4/Makefile
@@ -204,7 +204,6 @@ $(PACKAGE_DIR):
 	mkdir -p $(PACKAGE_DIR)
 
 $(LINUX_DIR)/.unpacked: $(DL_DIR)/$(LINUX_SOURCE)
-	@$(PKG_TRACE) Preparing...
 	-mkdir -p $(LINUX_BUILD_DIR)
 	bzcat $(DL_DIR)/$(LINUX_SOURCE) | tar -C $(LINUX_BUILD_DIR) $(TAR_OPTIONS) -
 	rm -f $(LINUX_DIR)
@@ -217,7 +216,6 @@ $(LINUX_DIR)/.patched: $(LINUX_DIR)/.unpacked
 	touch $(LINUX_DIR)/.patched
 
 $(LINUX_DIR)/.configured: $(LINUX_DIR)/.patched
-	@$(PKG_TRACE) Configuring...
 	-cp $(LINUX_KCONFIG) $(LINUX_DIR)/.config
 	$(SED) "s,^CROSS_COMPILE.*,CROSS_COMPILE=$(KERNEL_CROSS),g;" \
 	  $(LINUX_DIR)/Makefile  \
@@ -269,7 +267,7 @@ $(KERNEL_IPKG):
 	if [ -f ./config/$(BOARD).modules ]; then \
 		cp ./config/$(BOARD).modules $(KERNEL_IDIR)/etc/modules; \
 	fi
-	$(IPKG_BUILD) $(KERNEL_IDIR) $(LINUX_BUILD_DIR)
+	$(IPKG_BUILD) $(KERNEL_IDIR) $(LINUX_BUILD_DIR) $(MAKE_TRACE)
 
 source: $(DL_DIR)/$(LINUX_SOURCE)
 prepare: $(LINUX_DIR)/.configured
diff --git a/target/linux/linux-2.6/Makefile b/target/linux/linux-2.6/Makefile
index 489f136935..75f6ea049d 100644
--- a/target/linux/linux-2.6/Makefile
+++ b/target/linux/linux-2.6/Makefile
@@ -179,11 +179,9 @@ $(PACKAGE_DIR):
 
 $(DL_DIR)/$(LINUX_SOURCE):
 	-mkdir -p $(DL_DIR)
-	@$(PKG_TRACE) Downloading...
 	$(SCRIPT_DIR)/download.pl $(DL_DIR) $(LINUX_SOURCE) $(LINUX_KERNEL_MD5SUM) $(LINUX_SITE) $(MAKE_TRACE)
 
 $(LINUX_DIR)/.unpacked: $(DL_DIR)/$(LINUX_SOURCE)
-	@$(PKG_TRACE) Preparing...
 	-mkdir -p $(LINUX_BUILD_DIR)
 	bzcat $(DL_DIR)/$(LINUX_SOURCE) | tar -C $(LINUX_BUILD_DIR) $(TAR_OPTIONS) -
 	rm -f $(LINUX_DIR)
@@ -196,7 +194,6 @@ $(LINUX_DIR)/.patched: $(LINUX_DIR)/.unpacked
 	touch $(LINUX_DIR)/.patched
 
 $(LINUX_DIR)/.configured: $(LINUX_DIR)/.patched
-	@$(PKG_TRACE) Configuring...
 	-cp $(LINUX_KCONFIG) $(LINUX_DIR)/.config
 	$(MAKE) -C $(LINUX_DIR) ARCH=$(LINUX_KARCH) oldconfig $(MAKE_TRACE)
 	touch $(LINUX_DIR)/.configured
@@ -230,7 +227,7 @@ $(KERNEL_IPKG):
 	if [ -f ./config/$(BOARD).modules ]; then \
 		cp ./config/$(BOARD).modules $(KERNEL_IDIR)/etc/modules; \
 	fi
-	$(IPKG_BUILD) $(KERNEL_IDIR) $(LINUX_BUILD_DIR)
+	$(IPKG_BUILD) $(KERNEL_IDIR) $(LINUX_BUILD_DIR) $(MAKE_TRACE)
 	
 $(STAMP_DIR)/.linux-compile: $(LINUX_DIR)/.modules_done
 	@mkdir -p $(STAMP_DIR)
diff --git a/target/linux/package/Makefile b/target/linux/package/Makefile
index c69705bfe4..97d20251e6 100644
--- a/target/linux/package/Makefile
+++ b/target/linux/package/Makefile
@@ -49,7 +49,7 @@ MAKEOPTS:=	BOARD="$(BOARD)" \
 	@$(CMD_TRACE) " done"
 	@$(END_TRACE)
 
-%-install: %-compile
+%-install:
 	@$(START_TRACE) "target/linux/package/$(patsubst %-install,%,$@)-install: "
 	$(MAKE) -C $(patsubst %-install,%,$@) \
 		$(MAKEOPTS) \
diff --git a/target/lzma/Makefile b/target/lzma/Makefile
index 17c029532b..8969e3d241 100644
--- a/target/lzma/Makefile
+++ b/target/lzma/Makefile
@@ -17,11 +17,9 @@ LZMA_ALONE_DIR=$(LZMA_DIR)/SRC/7zip/Compress/LZMA_Alone
 TARGETS=$(LZMA_LIB_DIR)/liblzma.a $(LZMA_ALONE_DIR)/lzma
 
 $(DL_DIR)/$(LZMA_SOURCE):
-	@$(PKG_TRACE) Downloading...
 	$(SCRIPT_DIR)/download.pl $(DL_DIR) $(LZMA_SOURCE) $(LZMA_MD5) $(LZMA_SITE) $(MAKE_TRACE)
 
 $(LZMA_DIR)/.unpacked: $(DL_DIR)/$(LZMA_SOURCE) 
-	@$(PKG_TRACE) Preparing...
 	@rm -rf $(LZMA_DIR) && mkdir -p $(LZMA_DIR)
 	unzip -q $^ -d $(LZMA_DIR)
 	patch -d $(LZMA_DIR) -p1 < lzma-406-zlib-stream.patch $(MAKE_TRACE)
@@ -29,7 +27,6 @@ $(LZMA_DIR)/.unpacked: $(DL_DIR)/$(LZMA_SOURCE)
 	
 $(LZMA_ALONE_DIR)/lzma $(LZMA_LIB_DIR)/liblzma.a: $(LZMA_DIR)/.built
 $(LZMA_DIR)/.built: $(LZMA_DIR)/.unpacked
-	@$(PKG_TRACE) Compiling...
 	$(MAKE) -C $(LZMA_LIB_DIR) $(MAKE_TRACE)
 	$(MAKE) -C $(LZMA_ALONE_DIR) $(MAKE_TRACE)
 	touch $@
@@ -40,7 +37,6 @@ lzma: $(TARGETS)
 lzma-source: $(DL_DIR)/$(LZMA_SOURCE)
 
 lzma-clean:
-	@$(PKG_TRACE) Cleaining...
 	-$(MAKE) -C $(LZMA_LIB_DIR) clean $(MAKE_TRACE)
 	-$(MAKE) -C $(LZMA_ALONE_DIR) clean $(MAKE_TRACE)
 	rm -f $(LZMA_DIR)/liblzma.a $(LZMA_DIR)/lzma