From 42136877538fe79297345f554d033a41dc081daa Mon Sep 17 00:00:00 2001
From: nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Sat, 22 Oct 2005 01:40:50 +0000
Subject: add some more verbosity stuff

git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@2222 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 target/linux/image/Makefile    | 10 ++++++++++
 target/linux/image/jffs2.mk    | 22 +++++++++++-----------
 target/linux/image/squashfs.mk | 18 +++++++++---------
 3 files changed, 30 insertions(+), 20 deletions(-)

(limited to 'target/linux/image')

diff --git a/target/linux/image/Makefile b/target/linux/image/Makefile
index 1dd48c752..68b1bd39c 100644
--- a/target/linux/image/Makefile
+++ b/target/linux/image/Makefile
@@ -15,8 +15,16 @@ include ./tgz.mk
 endif
 
 prepare:
+	@$(PKG_TRACE) Preparing...
+	$(MAKE) prepare-targets $(MAKE_TRACE)
 compile:
+	@$(PKG_TRACE) Compiling...
+	$(MAKE) compile-targets $(MAKE_TRACE)
 install:
+	@$(PKG_TRACE) Installing...
+	$(MAKE) install-targets $(MAKE_TRACE)
+
+.PHONY: prepare compile install
 
 $(BOARD)-compile:
 	@$(TRACE) target/linux/image/$(BOARD)/prepare
@@ -38,4 +46,6 @@ install-prepare:
 
 rebuild: clean prepare compile install
 clean:
+	@$(PKG_TRACE) Cleaning...
+	$(MAKE) clean-targets $(MAKE_TRACE)
 
diff --git a/target/linux/image/jffs2.mk b/target/linux/image/jffs2.mk
index ab8cfbef3..6d6469dcd 100644
--- a/target/linux/image/jffs2.mk
+++ b/target/linux/image/jffs2.mk
@@ -2,24 +2,24 @@ JFFS2OPTS :=  --pad --little-endian --squash
 #JFFS2OPTS += -Xlzo -msize -Xlzari
 
 jffs2-prepare:
-	$(MAKE) -C jffs2 prepare
+	$(MAKE) -C jffs2 prepare $(MAKE_TRACE)
 
-jffs2-compile:
-	$(MAKE) -C jffs2 compile
+jffs2-compile: prepare-targets
+	$(MAKE) -C jffs2 compile $(MAKE_TRACE)
 
 jffs2-clean:
-	$(MAKE) -C jffs2 clean
+	$(MAKE) -C jffs2 clean $(MAKE_TRACE)
 	rm -f $(KDIR)/root.jffs2*
 
 $(KDIR)/root.jffs2-4MB: install-prepare
 	@rm -rf $(KDIR)/root/jffs
-	$(STAGING_DIR)/bin/mkfs.jffs2 $(JFFS2OPTS) -e 0x10000 -o $@ -d $(KDIR)/root
+	$(STAGING_DIR)/bin/mkfs.jffs2 $(JFFS2OPTS) -e 0x10000 -o $@ -d $(KDIR)/root $(MAKE_TRACE)
 
 $(KDIR)/root.jffs2-8MB: install-prepare
 	@rm -rf $(KDIR)/root/jffs
-	$(STAGING_DIR)/bin/mkfs.jffs2 $(JFFS2OPTS) -e 0x20000 -o $@ -d $(KDIR)/root
+	$(STAGING_DIR)/bin/mkfs.jffs2 $(JFFS2OPTS) -e 0x20000 -o $@ -d $(KDIR)/root $(MAKE_TRACE)
 
-jffs2-install: $(KDIR)/root.jffs2-4MB $(KDIR)/root.jffs2-8MB $(BOARD)-compile
+jffs2-install: compile-targets $(KDIR)/root.jffs2-4MB $(KDIR)/root.jffs2-8MB $(BOARD)-compile
 	$(TRACE) target/linux/image/$(BOARD)/install
 	$(MAKE) -C $(BOARD) install KERNEL="$(KERNEL)" FS="jffs2-4MB"
 	$(TRACE) target/linux/image/$(BOARD)/install
@@ -29,9 +29,9 @@ jffs2-install-ib:
 	mkdir -p $(IB_DIR)/staging_dir_$(ARCH)/bin
 	cp $(STAGING_DIR)/bin/mkfs.jffs2 $(IB_DIR)/staging_dir_$(ARCH)/bin
 
-prepare: jffs2-prepare
-compile: jffs2-compile
-install: jffs2-install
+prepare-targets: jffs2-prepare
+compile-targets: jffs2-compile
+install-targets: jffs2-install
 install-ib: jffs2-install-ib
-clean: jffs2-clean
+clean-targets: jffs2-clean
 
diff --git a/target/linux/image/squashfs.mk b/target/linux/image/squashfs.mk
index 00411c05e..30222c6ab 100644
--- a/target/linux/image/squashfs.mk
+++ b/target/linux/image/squashfs.mk
@@ -1,18 +1,18 @@
 squashfs-prepare:
-	$(MAKE) -C squashfs prepare
+	$(MAKE) -C squashfs prepare $(MAKE_TRACE)
 
-squashfs-compile:
-	$(MAKE) -C squashfs compile
+squashfs-compile: prepare-targets
+	$(MAKE) -C squashfs compile $(MAKE_TRACE)
 	
 squashfs-clean:
-	$(MAKE) -C squashfs clean
+	$(MAKE) -C squashfs clean $(MAKE_TRACE)
 	rm -f $(KDIR)/root.squashfs
 
 $(KDIR)/root.squashfs: install-prepare
 	@mkdir -p $(KDIR)/root/jffs
-	$(STAGING_DIR)/bin/mksquashfs-lzma $(KDIR)/root $@ -nopad -noappend -root-owned -le
+	$(STAGING_DIR)/bin/mksquashfs-lzma $(KDIR)/root $@ -nopad -noappend -root-owned -le $(MAKE_TRACE)
 
-squashfs-install: $(KDIR)/root.squashfs $(BOARD)-compile
+squashfs-install: install-targets $(KDIR)/root.squashfs $(BOARD)-compile
 	$(TRACE) target/linux/image/$(BOARD)/install
 	$(MAKE) -C $(BOARD) install KERNEL="$(KERNEL)" FS="squashfs"
 
@@ -20,8 +20,8 @@ squashfs-install-ib:
 	mkdir -p $(IB_DIR)/staging_dir_$(ARCH)/bin
 	cp $(STAGING_DIR)/bin/mksquashfs-lzma $(IB_DIR)/staging_dir_$(ARCH)/bin
 	
-prepare: squashfs-prepare
-compile: squashfs-compile
-install: squashfs-install
+prepare-targets: squashfs-prepare
+compile-targets: squashfs-compile
+install-targets: squashfs-install
 install-ib: squashfs-install-ib
 clean: squashfs-clean
-- 
cgit v1.2.3