From bab4efad53ecef261da2a6b6fc4cd1e834636da6 Mon Sep 17 00:00:00 2001 From: nbd 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@2241 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- openwrt/target/linux/package/Makefile | 16 ++++++++++++---- openwrt/target/linux/package/diag/Makefile | 8 +++----- openwrt/target/linux/package/openwrt/Makefile | 2 +- 3 files changed, 16 insertions(+), 10 deletions(-) (limited to 'openwrt/target/linux/package') diff --git a/openwrt/target/linux/package/Makefile b/openwrt/target/linux/package/Makefile index dc031fc470..c69705bfe4 100644 --- a/openwrt/target/linux/package/Makefile +++ b/openwrt/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/openwrt/target/linux/package/diag/Makefile b/openwrt/target/linux/package/diag/Makefile index 826fd07a82..42765aedfe 100644 --- a/openwrt/target/linux/package/diag/Makefile +++ b/openwrt/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/openwrt/target/linux/package/openwrt/Makefile b/openwrt/target/linux/package/openwrt/Makefile index f55b91d78b..72c87044ad 100644 --- a/openwrt/target/linux/package/openwrt/Makefile +++ b/openwrt/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