KumiSystems/openwrtv4
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

fix trace targets to actually display correct target names

Browse source 
SVN-Revision: 2970
This commit is contained in:
Mike Baker 2006-01-14 01:57:24 +00:00
parent 2cb6a00ed0
commit 7549093723
5 changed files with 24 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
openwrt/package/Makefile
View file

@ -514,7 +514,7 @@ $(TARGET_DIR):
%-prepare: $(STAMP_DIR) $(TARGET_DIR) %-prepare: $(STAMP_DIR) $(TARGET_DIR)
@[ -f $(STAMP_DIR)/.$@ ] || { \ @[ -f $(STAMP_DIR)/.$@ ] || { \
$(START_TRACE) "package/$(patsubst %-prepare,%,$@)/prepare: "; \ $(START_TRACE) "package/$(patsubst %-prepare,%,$@)-prepare: "; \
$(MAKE) -C $(patsubst %-prepare,%,$@) prepare && { \ $(MAKE) -C $(patsubst %-prepare,%,$@) prepare && { \
touch $(STAMP_DIR)/.$@; \ touch $(STAMP_DIR)/.$@; \
$(CMD_TRACE) " done"; \ $(CMD_TRACE) " done"; \
@ -524,7 +524,7 @@ $(TARGET_DIR):
%-compile: %-compile:
@[ -f $(STAMP_DIR)/.$@ ] || { \ @[ -f $(STAMP_DIR)/.$@ ] || { \
$(START_TRACE) "package/$(patsubst %-compile,%,$@)/compile: "; \ $(START_TRACE) "package/$(patsubst %-compile,%,$@)-compile: "; \
$(MAKE) -C $(patsubst %-compile,%,$@) compile && { \ $(MAKE) -C $(patsubst %-compile,%,$@) compile && { \
touch $(STAMP_DIR)/.$(patsubst %-compile,%,$@)-prepare; \ touch $(STAMP_DIR)/.$(patsubst %-compile,%,$@)-prepare; \
touch $(STAMP_DIR)/.$@; \ touch $(STAMP_DIR)/.$@; \
@ -534,20 +534,20 @@ $(TARGET_DIR):
} }
%-install: %-compile %-install: %-compile
@$(START_TRACE) "package/$(patsubst %-install,%,$@)/install: " @$(START_TRACE) "package/$(patsubst %-install,%,$@)-install: "
@$(MAKE) -C $(patsubst %-install,%,$@) install @$(MAKE) -C $(patsubst %-install,%,$@) install
@$(CMD_TRACE) " done" @$(CMD_TRACE) " done"
@$(END_TRACE) @$(END_TRACE)
%-rebuild: %-rebuild:
@$(START_TRACE) "package/$(patsubst %-rebuild,%,$@)/rebuild: " @$(START_TRACE) "package/$(patsubst %-rebuild,%,$@)-rebuild: "
@rm -f $(STAMP_DIR)/.$(patsubst %-rebuild,%,$@)-* @rm -f $(STAMP_DIR)/.$(patsubst %-rebuild,%,$@)-*
$(MAKE) -C $(patsubst %-rebuild,%,$@) rebuild $(MAKE) -C $(patsubst %-rebuild,%,$@) rebuild
@$(CMD_TRACE) " done" @$(CMD_TRACE) " done"
@$(END_TRACE) @$(END_TRACE)
%-clean: %-clean:
@$(START_TRACE) "package/$(patsubst %-clean,%,$@)/clean: " @$(START_TRACE) "package/$(patsubst %-clean,%,$@)-clean: "
@$(MAKE) -C $(patsubst %-clean,%,$@) clean @$(MAKE) -C $(patsubst %-clean,%,$@) clean
@rm -f $(STAMP_DIR)/.$(patsubst %-clean,%,$@)-* @rm -f $(STAMP_DIR)/.$(patsubst %-clean,%,$@)-*
@$(CMD_TRACE) " done" @$(CMD_TRACE) " done"

10
openwrt/target/Makefile
View file

@ -17,19 +17,19 @@ image_clean:
rm -f $(BIN_DIR)/openwrt-* rm -f $(BIN_DIR)/openwrt-*
%-clean: %-clean:
@$(TRACE) target/$(patsubst %-clean,%,$@)/clean @$(TRACE) target/$(patsubst %-clean,%,$@)-clean
$(MAKE) -C $(patsubst %-clean,%,$@) clean $(MAKE) -C $(patsubst %-clean,%,$@) clean
%-prepare: %-prepare:
@$(TRACE) target/$(patsubst %-prepare,%,$@)/prepare @$(TRACE) target/$(patsubst %-prepare,%,$@)-prepare
$(MAKE) -C $(patsubst %-prepare,%,$@) prepare $(MAKE) -C $(patsubst %-prepare,%,$@) prepare
%-compile: %-prepare %-compile: %-prepare
@$(TRACE) target/$(patsubst %-compile,%,$@)/compile @$(TRACE) target/$(patsubst %-compile,%,$@)-compile
$(MAKE) -C $(patsubst %-compile,%,$@) compile $(MAKE) -C $(patsubst %-compile,%,$@) compile
%-rebuild: %-rebuild:
@$(TRACE) target/$(patsubst %-rebuild,%,$@)/rebuild @$(TRACE) target/$(patsubst %-rebuild,%,$@)-rebuild
$(MAKE) -C $(patsubst %-rebuild,%,$@) rebuild $(MAKE) -C $(patsubst %-rebuild,%,$@) rebuild
%-install: %-compile %-install: %-compile
@$(TRACE) target/$(patsubst %-install,%,$@)/install @$(TRACE) target/$(patsubst %-install,%,$@)-install
$(MAKE) -C $(patsubst %-install,%,$@) install $(MAKE) -C $(patsubst %-install,%,$@) install
linux-imagebuilder: linux-imagebuilder:
@$(TRACE) target/linux/imagebuilder @$(TRACE) target/linux/imagebuilder

18
openwrt/target/linux/Makefile
View file

@ -9,31 +9,31 @@ IB_DIR:=$(BUILD_DIR)/$(IB_NAME)
define kernel_template define kernel_template
$(1)/$(2)-clean: $(1)/$(2)-clean:
@$(TRACE) target/linux/$(2)-$(1)/clean @$(TRACE) target/linux/$(2)-$(1)-clean
$(MAKE) -C $(2)-$(1) BOARD="$(2)" clean $(MAKE) -C $(2)-$(1) BOARD="$(2)" clean
$(1)/$(2)-prepare: $(1)/$(2)-prepare:
@$(TRACE) target/linux/$(2)-$(1)/prepare @$(TRACE) target/linux/$(2)-$(1)-prepare
$(MAKE) -C $(2)-$(1) BOARD="$(2)" prepare $(MAKE) -C $(2)-$(1) BOARD="$(2)" prepare
$(1)/$(2)-compile: $(1)/$(2)-compile:
@$(TRACE) target/linux/$(2)-$(1)/compile @$(TRACE) target/linux/$(2)-$(1)-compile
$(MAKE) -C $(2)-$(1) BOARD="$(2)" compile $(MAKE) -C $(2)-$(1) BOARD="$(2)" compile
$(1)/$(2)-rebuild: $(1)/$(2)-rebuild:
@$(TRACE) target/linux/$(2)-$(1)/rebuild @$(TRACE) target/linux/$(2)-$(1)-rebuild
$(MAKE) -C $(2)-$(1) BOARD="$(2)" rebuild $(MAKE) -C $(2)-$(1) BOARD="$(2)" rebuild
$(1)/$(2)-install: $(1)/$(2)-install:
@$(TRACE) target/linux/$(2)-$(1)/install @$(TRACE) target/linux/$(2)-$(1)-install
$(MAKE) -C $(2)-$(1) BOARD="$(2)" install $(MAKE) -C $(2)-$(1) BOARD="$(2)" install
$(1)/$(2)-image: $(1)/$(2)-install $(1)/$(2)-image: $(1)/$(2)-install
@$(TRACE) target/linux/image/install @$(TRACE) target/linux/image-install
$(MAKE) -C image KERNEL="$(1)" BOARD="$(2)" install $(MAKE) -C image KERNEL="$(1)" BOARD="$(2)" install
$(1)/$(2)-install-ib: $(1)/$(2)-install-ib:
@$(TRACE) target/linux/image/install-ib @$(TRACE) target/linux/image-install-ib
$(MAKE) -C image KERNEL="$(1)" BOARD="$(2)" IB_DIR="$(IB_DIR)" 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 echo '$$$$(eval $$$$(call image_template,$(2),$(1)))' >> $(IB_DIR)/kernel.mk
@ -74,10 +74,10 @@ install: $(BIN_DIR)/$(IB_NAME).tar.bz2
endif endif
prepare: prepare:
@$(TRACE) target/linux/image/prepare @$(TRACE) target/linux/image-prepare
$(MAKE) -C image prepare $(MAKE) -C image prepare
compile: compile:
@$(TRACE) target/linux/image/compile @$(TRACE) target/linux/image-compile
$(MAKE) -C image compile $(MAKE) -C image compile
install: install:
rebuild: rebuild:

6
openwrt/target/linux/image/Makefile
View file

@ -24,13 +24,13 @@ install:
.PHONY: prepare compile install .PHONY: prepare compile install
$(BOARD)-compile: $(BOARD)-compile:
@$(TRACE) target/linux/image/$(BOARD)/prepare @$(TRACE) target/linux/image/$(BOARD)-prepare
$(MAKE) -C $(BOARD) prepare $(MAKE) -C $(BOARD) prepare
@$(TRACE) target/linux/image/$(BOARD)/compile @$(TRACE) target/linux/image/$(BOARD)-compile
$(MAKE) -C $(BOARD) compile $(MAKE) -C $(BOARD) compile
install-ib: install-ib:
@$(TRACE) target/linux/image/$(BOARD)/install-ib @$(TRACE) target/linux/image/$(BOARD)-install-ib
-$(MAKE) -C $(BOARD) IB_DIR="$(IB_DIR)" install-ib -$(MAKE) -C $(BOARD) IB_DIR="$(IB_DIR)" install-ib
mkdir -p $(IB_DIR)/build_$(ARCH)/linux-$(KERNEL)-$(BOARD) mkdir -p $(IB_DIR)/build_$(ARCH)/linux-$(KERNEL)-$(BOARD)
cp $(BUILD_DIR)/linux-$(KERNEL)-$(BOARD)/kernel[-_]*.ipk $(IB_DIR)/build_$(ARCH)/linux-$(KERNEL)-$(BOARD)/ cp $(BUILD_DIR)/linux-$(KERNEL)-$(BOARD)/kernel[-_]*.ipk $(IB_DIR)/build_$(ARCH)/linux-$(KERNEL)-$(BOARD)/

4
openwrt/target/linux/kernel.mk
View file

@ -58,7 +58,7 @@ $(LINUX_DIR)/.modules_done:
$(STAMP_DIR)/.linux-compile: $(STAMP_DIR)/.linux-compile:
@$(MAKE) $(LINUX_DIR)/.modules_done $(TARGETS) $(KERNEL_IPKG) $(MAKE_TRACE) @$(MAKE) $(LINUX_DIR)/.modules_done $(TARGETS) $(KERNEL_IPKG) $(MAKE_TRACE)
ln -sf $(LINUX_BUILD_DIR)/linux-$(LINUX_VERSION) $(BUILD_DIR)/linux $(MAKE_TRACE) ln -sf $(LINUX_BUILD_DIR)/linux-$(LINUX_VERSION) $(BUILD_DIR)/linux $(MAKE_TRACE)
@$(TRACE) target/linux/package/compile @$(TRACE) target/linux/package-compile
$(MAKE) -C $(TOPDIR)/target/linux/package \ $(MAKE) -C $(TOPDIR)/target/linux/package \
$(KPKG_MAKEOPTS) \ $(KPKG_MAKEOPTS) \
compile compile
@ -92,7 +92,7 @@ prepare:
compile: prepare $(STAMP_DIR)/.linux-compile compile: prepare $(STAMP_DIR)/.linux-compile
install: compile install: compile
@$(TRACE) target/linux/package/install @$(TRACE) target/linux/package-install
$(MAKE) $(KPKG_MAKEOPTS) pkg-install $(MAKE_TRACE) $(MAKE) $(KPKG_MAKEOPTS) pkg-install $(MAKE_TRACE)
$(MAKE) $(KPKG_MAKEOPTS) $(LINUX_KERNEL) $(MAKE_TRACE) $(MAKE) $(KPKG_MAKEOPTS) $(LINUX_KERNEL) $(MAKE_TRACE)