From 643ea4281e5a515e42a99cfccab9f703c308e213 Mon Sep 17 00:00:00 2001 From: Felix Fietkau Date: Sat, 22 Oct 2005 15:10:20 +0000 Subject: make log output a bit nicer git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@2241 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- Makefile | 2 +- package/Makefile | 20 +++++++++++++++----- package/rules.mk | 22 +++++++++------------- rules.mk | 6 ++++++ scripts/configtest.pl | 2 +- target/linux/Makefile | 7 +++++++ target/linux/image/Makefile | 4 ---- target/linux/linux-2.4/Makefile | 1 - target/linux/package/Makefile | 16 ++++++++++++---- target/linux/package/diag/Makefile | 8 +++----- target/linux/package/openwrt/Makefile | 2 +- 11 files changed, 55 insertions(+), 35 deletions(-) diff --git a/Makefile b/Makefile index 9d39a7b062..6dee969827 100644 --- a/Makefile +++ b/Makefile @@ -96,7 +96,7 @@ toolchain/%: # ############################################################# root_clean: - @$(TRACE) Cleaning... + @$(TRACE) root_clean rm -rf $(BUILD_DIR)/linux-*/root $(BUILD_DIR)/root target_clean: root_clean diff --git a/package/Makefile b/package/Makefile index 0bddabbc81..9053acb377 100644 --- a/package/Makefile +++ b/package/Makefile @@ -442,30 +442,40 @@ $(TARGET_DIR): %-prepare: $(STAMP_DIR) $(TARGET_DIR) @[ -f $(STAMP_DIR)/.$@ ] || { \ - $(TRACE) package/$(patsubst %-prepare,%,$@)/prepare; \ + $(START_TRACE) "package/$(patsubst %-prepare,%,$@)/prepare: "; \ $(MAKE) -C $(patsubst %-prepare,%,$@) prepare; \ + $(CMD_TRACE) " done"; \ + $(END_TRACE); \ } @touch $(STAMP_DIR)/.$@ %-compile: @[ -f $(STAMP_DIR)/.$@ ] || { \ - $(TRACE) package/$(patsubst %-compile,%,$@)/compile; \ + $(START_TRACE) "package/$(patsubst %-compile,%,$@)/compile: "; \ $(MAKE) -C $(patsubst %-compile,%,$@) compile; \ + $(CMD_TRACE) " done"; \ + $(END_TRACE); \ } @touch $(STAMP_DIR)/.$(patsubst %-compile,%,$@)-prepare @touch $(STAMP_DIR)/.$@ %-install: %-compile - @$(TRACE) package/$(patsubst %-install,%,$@)/install + @$(START_TRACE) "package/$(patsubst %-install,%,$@)/install: " @$(MAKE) -C $(patsubst %-install,%,$@) install + @$(CMD_TRACE) " done" + @$(END_TRACE) %-rebuild: - @$(TRACE) package/$(patsubst %-rebuild,%,$@)/rebuild + @$(START_TRACE) "package/$(patsubst %-rebuild,%,$@)/rebuild: " @rm -f $(STAMP_DIR)/.$(patsubst %-rebuild,%,$@)-* $(MAKE) -C $(patsubst %-rebuild,%,$@) rebuild + @$(CMD_TRACE) " done" + @$(END_TRACE) %-clean: - @$(TRACE) package/$(patsubst %-clean,%,$@)/clean + @$(START_TRACE) "package/$(patsubst %-clean,%,$@)/clean: " @$(MAKE) -C $(patsubst %-clean,%,$@) clean @rm -f $(STAMP_DIR)/.$(patsubst %-clean,%,$@)-* + @$(CMD_TRACE) " done" + @$(END_TRACE) diff --git a/package/rules.mk b/package/rules.mk index cd63983bd8..504eb1518f 100644 --- a/package/rules.mk +++ b/package/rules.mk @@ -37,7 +37,7 @@ endef ifneq ($(strip $(PKG_SOURCE)),) $(DL_DIR)/$(PKG_SOURCE): - @$(PKG_TRACE) Downloading... + @$(PKG_TRACE) "downloading... " $(SCRIPT_DIR)/download.pl "$(DL_DIR)" "$(PKG_SOURCE)" "$(PKG_MD5SUM)" $(PKG_SOURCE_URL) $(MAKE_TRACE) endif @@ -57,33 +57,29 @@ all: compile source: $(DL_DIR)/$(PKG_SOURCE) prepare: @[ -f $(PKG_BUILD_DIR)/.prepared ] || { \ - $(PKG_TRACE) Preparing...; \ + $(CMD_TRACE) "preparing... "; \ $(MAKE) $(PKG_BUILD_DIR)/.prepared $(MAKE_TRACE); \ } -configure: +configure: prepare @[ -f $(PKG_BUILD_DIR)/.configured ] || { \ - $(PKG_TRACE) Configuring...; \ + $(CMD_TRACE) "configuring... "; \ $(MAKE) $(PKG_BUILD_DIR)/.configured $(MAKE_TRACE); \ } compile-targets: -compile: prepare - @[ -f $(PKG_BUILD_DIR)/.configured ] || { \ - $(PKG_TRACE) Configuring...; \ - $(MAKE) $(PKG_BUILD_DIR)/.configured $(MAKE_TRACE); \ - } - @$(PKG_TRACE) Compiling... +compile: configure + @$(CMD_TRACE) "compiling... " @$(MAKE) compile-targets $(MAKE_TRACE) install-targets: install: - @$(PKG_TRACE) Installing... + @$(CMD_TRACE) "installing... " @$(MAKE) install-targets $(MAKE_TRACE) mostlyclean: rebuild: - $(PKG_TRACE) Rebuilding... + $(CMD_TRACE) "rebuilding... " @-$(MAKE) mostlyclean 2>&1 >/dev/null if [ -f $(PKG_BUILD_DIR)/.built ]; then \ $(MAKE) clean $(MAKE_TRACE); \ @@ -98,7 +94,7 @@ $(PACKAGE_DIR): clean-targets: clean: - @$(PKG_TRACE) Cleaning... + @$(CMD_TRACE) "cleaning... " @$(MAKE) clean-targets $(MAKE_TRACE) rm -rf $(PKG_BUILD_DIR) diff --git a/rules.mk b/rules.mk index fb963aba26..5cbad1e7e7 100644 --- a/rules.mk +++ b/rules.mk @@ -9,13 +9,19 @@ endif ifneq ($(V),0) TRACE:=echo "---> " +START_TRACE:=echo -n "---> " +END_TRACE:=echo else +START_TRACE:=: +END_TRACE:=: TRACE:=: endif ifeq (${shell [ "$(V)" -ge 5 ] && echo 1},) +CMD_TRACE:=: PKG_TRACE:=: else +CMD_TRACE:=echo -n PKG_TRACE:=echo "------> " endif diff --git a/scripts/configtest.pl b/scripts/configtest.pl index 709d2be74b..476bba7dce 100755 --- a/scripts/configtest.pl +++ b/scripts/configtest.pl @@ -1,6 +1,6 @@ #!/usr/bin/perl my %change = ( - 'BUSYBOX' => 'make package/busybox-clean', + '^BUSYBOX' => 'make package/busybox-clean', 'OPENVPN_' => 'make package/openvpn-clean', 'SYSCONF_' => 'make package/base-files-clean target_clean', '' => 'make target_clean' diff --git a/target/linux/Makefile b/target/linux/Makefile index 2362ad6dd2..ae7545a464 100644 --- a/target/linux/Makefile +++ b/target/linux/Makefile @@ -9,24 +9,31 @@ IB_DIR:=$(BUILD_DIR)/$(IB_NAME) define kernel_template $(1)/$(2)-clean: + $(TRACE) target/linux/linux-$(2)/clean $(MAKE) -C linux-$(1) KERNEL="$(1)" BOARD="$(2)" clean $(1)/$(2)-prepare: + $(TRACE) target/linux/linux-$(2)/prepare $(MAKE) -C linux-$(1) KERNEL="$(1)" BOARD="$(2)" prepare $(1)/$(2)-compile: + $(TRACE) target/linux/linux-$(2)/compile $(MAKE) -C linux-$(1) KERNEL="$(1)" BOARD="$(2)" compile $(1)/$(2)-rebuild: + $(TRACE) target/linux/linux-$(2)/rebuild $(MAKE) -C linux-$(1) KERNEL="$(1)" BOARD="$(2)" rebuild $(1)/$(2)-install: + $(TRACE) target/linux/linux-$(2)/install $(MAKE) -C linux-$(1) KERNEL="$(1)" BOARD="$(2)" install $(1)/$(2)-image: $(1)/$(2)-install + $(TRACE) target/linux/image/install $(MAKE) -C image KERNEL="$(1)" BOARD="$(2)" install $(1)/$(2)-install-ib: + $(TRACE) target/linux/image/install-ib $(MAKE) -C image KERNEL="$(1)" BOARD="$(2)" IB_DIR="$(IB_DIR)" install-ib echo '$$$$(eval $$$$(call image_template,$(2),$(1)))' >> $(IB_DIR)/kernel.mk diff --git a/target/linux/image/Makefile b/target/linux/image/Makefile index 68b1bd39c7..e44a46acdf 100644 --- a/target/linux/image/Makefile +++ b/target/linux/image/Makefile @@ -15,13 +15,10 @@ 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 @@ -46,6 +43,5 @@ install-prepare: rebuild: clean prepare compile install clean: - @$(PKG_TRACE) Cleaning... $(MAKE) clean-targets $(MAKE_TRACE) diff --git a/target/linux/linux-2.4/Makefile b/target/linux/linux-2.4/Makefile index c86221f4e5..c3417bdcba 100644 --- a/target/linux/linux-2.4/Makefile +++ b/target/linux/linux-2.4/Makefile @@ -274,7 +274,6 @@ $(KERNEL_IPKG): source: $(DL_DIR)/$(LINUX_SOURCE) prepare: $(LINUX_DIR)/.configured compile: - @$(PKG_TRACE) Compiling... $(MAKE) $(STAMP_DIR)/.linux-compile $(MAKE_TRACE) install: compile $(TARGET_MODULES_DIR) $(KERNEL_IPKG) diff --git a/target/linux/package/Makefile b/target/linux/package/Makefile index dc031fc470..c69705bfe4 100644 --- a/target/linux/package/Makefile +++ b/target/linux/package/Makefile @@ -34,24 +34,32 @@ MAKEOPTS:= BOARD="$(BOARD)" \ %-prepare: - @$(TRACE) target/linux/package/$(patsubst %-prepare,%,$@)-prepare + @$(START_TRACE) "target/linux/package/$(patsubst %-prepare,%,$@)/prepare: " $(MAKE) -C $(patsubst %-prepare,%,$@) \ $(MAKEOPTS) \ prepare + @$(CMD_TRACE) " done" + @$(END_TRACE) %-compile: - @$(TRACE) target/linux/package/$(patsubst %-compile,%,$@)-compile + @$(START_TRACE) "target/linux/package/$(patsubst %-compile,%,$@)-compile: " $(MAKE) -C $(patsubst %-compile,%,$@) \ $(MAKEOPTS) \ compile + @$(CMD_TRACE) " done" + @$(END_TRACE) %-install: %-compile - @$(TRACE) target/linux/package/$(patsubst %-install,%,$@)-install + @$(START_TRACE) "target/linux/package/$(patsubst %-install,%,$@)-install: " $(MAKE) -C $(patsubst %-install,%,$@) \ $(MAKEOPTS) \ install + @$(CMD_TRACE) " done" + @$(END_TRACE) %-clean: - @$(TRACE) target/linux/package/$(patsubst %-clean,%,$@)-clean + @$(START_TRACE) "target/linux/package/$(patsubst %-clean,%,$@)-clean: " @$(MAKE) -C $(patsubst %-clean,%,$@) clean + @$(CMD_TRACE) " done" + @$(END_TRACE) diff --git a/target/linux/package/diag/Makefile b/target/linux/package/diag/Makefile index 826fd07a82..42765aedfe 100644 --- a/target/linux/package/diag/Makefile +++ b/target/linux/package/diag/Makefile @@ -25,13 +25,11 @@ $(PKG_BUILD_DIR)/.prepared: mkdir -p $(PKG_BUILD_DIR) touch $@ -$(PKG_BUILD_DIR)/.built: $(PKG_BUILD_DIR)/diag.o +$(PKG_BUILD_DIR)/.built: + $(TARGET_CC) $(DIAG_FLAGS) -o $@ diag_led.c touch $@ -$(PKG_BUILD_DIR)/diag.o: $(PKG_BUILD_DIR)/.prepared - $(TARGET_CC) $(DIAG_FLAGS) -o $@ diag_led.c - -$(IPKG_KMOD_DIAG): $(PKG_BUILD_DIR)/diag.o +$(IPKG_KMOD_DIAG): mkdir -p $(IDIR_KMOD_DIAG)/lib/modules/$(LINUX_VERSION) cp $(PKG_BUILD_DIR)/diag.o $(IDIR_KMOD_DIAG)/lib/modules/$(LINUX_VERSION)/ $(IPKG_BUILD) $(IDIR_KMOD_DIAG) $(PACKAGE_DIR) diff --git a/target/linux/package/openwrt/Makefile b/target/linux/package/openwrt/Makefile index f55b91d78b..72c87044ad 100644 --- a/target/linux/package/openwrt/Makefile +++ b/target/linux/package/openwrt/Makefile @@ -42,7 +42,7 @@ $(IPKG_OPENWRT): $(IDIR_OPENWRT) $(RSTRIP) $(IDIR_OPENWRT) $(IPKG_BUILD) $(IDIR_OPENWRT) $(PACKAGE_DIR) -install: compile openwrt-install +install-targets: compile openwrt-install openwrt-install: $(IPKG) install $(IPKG_OPENWRT) -- cgit v1.2.3