diff options
| author | mbm <mbm@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2006-01-14 01:57:24 +0000 |
|---|---|---|
| committer | mbm <mbm@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2006-01-14 01:57:24 +0000 |
| commit | ef88fd263d77e79a7b97858055772ea93963dcd2 (patch) | |
| tree | 478341409ebbd149928ed6c308fc69831be0e272 /openwrt/target/linux | |
| parent | 699f83d9099bb5ab8b581a9f78ac7d0df169beb2 (diff) | |
fix trace targets to actually display correct target names
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@2970 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'openwrt/target/linux')
| -rw-r--r-- | openwrt/target/linux/Makefile | 18 | ||||
| -rw-r--r-- | openwrt/target/linux/image/Makefile | 6 | ||||
| -rw-r--r-- | openwrt/target/linux/kernel.mk | 4 |
3 files changed, 14 insertions, 14 deletions
diff --git a/openwrt/target/linux/Makefile b/openwrt/target/linux/Makefile index 8a2eb7333..2fff3b33a 100644 --- a/openwrt/target/linux/Makefile +++ b/openwrt/target/linux/Makefile @@ -9,31 +9,31 @@ IB_DIR:=$(BUILD_DIR)/$(IB_NAME) define kernel_template $(1)/$(2)-clean: - @$(TRACE) target/linux/$(2)-$(1)/clean + @$(TRACE) target/linux/$(2)-$(1)-clean $(MAKE) -C $(2)-$(1) BOARD="$(2)" clean $(1)/$(2)-prepare: - @$(TRACE) target/linux/$(2)-$(1)/prepare + @$(TRACE) target/linux/$(2)-$(1)-prepare $(MAKE) -C $(2)-$(1) BOARD="$(2)" prepare $(1)/$(2)-compile: - @$(TRACE) target/linux/$(2)-$(1)/compile + @$(TRACE) target/linux/$(2)-$(1)-compile $(MAKE) -C $(2)-$(1) BOARD="$(2)" compile $(1)/$(2)-rebuild: - @$(TRACE) target/linux/$(2)-$(1)/rebuild + @$(TRACE) target/linux/$(2)-$(1)-rebuild $(MAKE) -C $(2)-$(1) BOARD="$(2)" rebuild $(1)/$(2)-install: - @$(TRACE) target/linux/$(2)-$(1)/install + @$(TRACE) target/linux/$(2)-$(1)-install $(MAKE) -C $(2)-$(1) BOARD="$(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 $(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 echo '$$$$(eval $$$$(call image_template,$(2),$(1)))' >> $(IB_DIR)/kernel.mk @@ -74,10 +74,10 @@ install: $(BIN_DIR)/$(IB_NAME).tar.bz2 endif prepare: - @$(TRACE) target/linux/image/prepare + @$(TRACE) target/linux/image-prepare $(MAKE) -C image prepare compile: - @$(TRACE) target/linux/image/compile + @$(TRACE) target/linux/image-compile $(MAKE) -C image compile install: rebuild: diff --git a/openwrt/target/linux/image/Makefile b/openwrt/target/linux/image/Makefile index 2018a8e67..7c65b6e3e 100644 --- a/openwrt/target/linux/image/Makefile +++ b/openwrt/target/linux/image/Makefile @@ -24,13 +24,13 @@ install: .PHONY: prepare compile install $(BOARD)-compile: - @$(TRACE) target/linux/image/$(BOARD)/prepare + @$(TRACE) target/linux/image/$(BOARD)-prepare $(MAKE) -C $(BOARD) prepare - @$(TRACE) target/linux/image/$(BOARD)/compile + @$(TRACE) target/linux/image/$(BOARD)-compile $(MAKE) -C $(BOARD) compile 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 mkdir -p $(IB_DIR)/build_$(ARCH)/linux-$(KERNEL)-$(BOARD) cp $(BUILD_DIR)/linux-$(KERNEL)-$(BOARD)/kernel[-_]*.ipk $(IB_DIR)/build_$(ARCH)/linux-$(KERNEL)-$(BOARD)/ diff --git a/openwrt/target/linux/kernel.mk b/openwrt/target/linux/kernel.mk index 8cc22cf70..b1ac9473c 100644 --- a/openwrt/target/linux/kernel.mk +++ b/openwrt/target/linux/kernel.mk @@ -58,7 +58,7 @@ $(LINUX_DIR)/.modules_done: $(STAMP_DIR)/.linux-compile: @$(MAKE) $(LINUX_DIR)/.modules_done $(TARGETS) $(KERNEL_IPKG) $(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 \ $(KPKG_MAKEOPTS) \ compile @@ -92,7 +92,7 @@ prepare: compile: prepare $(STAMP_DIR)/.linux-compile install: compile - @$(TRACE) target/linux/package/install + @$(TRACE) target/linux/package-install $(MAKE) $(KPKG_MAKEOPTS) pkg-install $(MAKE_TRACE) $(MAKE) $(KPKG_MAKEOPTS) $(LINUX_KERNEL) $(MAKE_TRACE) |