Changeset 2970


Ignore:
Timestamp:
2006-01-14T02:57:24+01:00 (12 years ago)
Author:
mbm
Message:

fix trace targets to actually display correct target names

Location:
trunk/openwrt
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • trunk/openwrt/package/Makefile

    r2896 r2970  
    515515%-prepare: $(STAMP_DIR) $(TARGET_DIR) 
    516516        @[ -f $(STAMP_DIR)/.$@ ] || { \ 
    517                 $(START_TRACE) "package/$(patsubst %-prepare,%,$@)/prepare: "; \ 
     517                $(START_TRACE) "package/$(patsubst %-prepare,%,$@)-prepare: "; \ 
    518518                $(MAKE) -C $(patsubst %-prepare,%,$@) prepare && { \ 
    519519                        touch $(STAMP_DIR)/.$@; \ 
     
    525525%-compile: 
    526526        @[ -f $(STAMP_DIR)/.$@ ] || { \ 
    527                 $(START_TRACE) "package/$(patsubst %-compile,%,$@)/compile: "; \ 
     527                $(START_TRACE) "package/$(patsubst %-compile,%,$@)-compile: "; \ 
    528528                $(MAKE) -C $(patsubst %-compile,%,$@) compile && { \ 
    529529                        touch $(STAMP_DIR)/.$(patsubst %-compile,%,$@)-prepare; \ 
     
    535535 
    536536%-install: %-compile 
    537         @$(START_TRACE) "package/$(patsubst %-install,%,$@)/install: " 
     537        @$(START_TRACE) "package/$(patsubst %-install,%,$@)-install: " 
    538538        @$(MAKE) -C $(patsubst %-install,%,$@) install 
    539539        @$(CMD_TRACE) " done" 
     
    541541 
    542542%-rebuild:  
    543         @$(START_TRACE) "package/$(patsubst %-rebuild,%,$@)/rebuild: " 
     543        @$(START_TRACE) "package/$(patsubst %-rebuild,%,$@)-rebuild: " 
    544544        @rm -f $(STAMP_DIR)/.$(patsubst %-rebuild,%,$@)-* 
    545545        $(MAKE) -C $(patsubst %-rebuild,%,$@) rebuild 
     
    548548 
    549549%-clean: 
    550         @$(START_TRACE) "package/$(patsubst %-clean,%,$@)/clean: " 
     550        @$(START_TRACE) "package/$(patsubst %-clean,%,$@)-clean: " 
    551551        @$(MAKE) -C $(patsubst %-clean,%,$@) clean 
    552552        @rm -f $(STAMP_DIR)/.$(patsubst %-clean,%,$@)-* 
  • trunk/openwrt/target/Makefile

    r2961 r2970  
    1818 
    1919%-clean: 
    20         @$(TRACE) target/$(patsubst %-clean,%,$@)/clean 
     20        @$(TRACE) target/$(patsubst %-clean,%,$@)-clean 
    2121        $(MAKE) -C $(patsubst %-clean,%,$@) clean 
    2222%-prepare: 
    23         @$(TRACE) target/$(patsubst %-prepare,%,$@)/prepare 
     23        @$(TRACE) target/$(patsubst %-prepare,%,$@)-prepare 
    2424        $(MAKE) -C $(patsubst %-prepare,%,$@) prepare 
    2525%-compile: %-prepare 
    26         @$(TRACE) target/$(patsubst %-compile,%,$@)/compile 
     26        @$(TRACE) target/$(patsubst %-compile,%,$@)-compile 
    2727        $(MAKE) -C $(patsubst %-compile,%,$@) compile 
    2828%-rebuild:  
    29         @$(TRACE) target/$(patsubst %-rebuild,%,$@)/rebuild 
     29        @$(TRACE) target/$(patsubst %-rebuild,%,$@)-rebuild 
    3030        $(MAKE) -C $(patsubst %-rebuild,%,$@) rebuild 
    3131%-install: %-compile 
    32         @$(TRACE) target/$(patsubst %-install,%,$@)/install 
     32        @$(TRACE) target/$(patsubst %-install,%,$@)-install 
    3333        $(MAKE) -C $(patsubst %-install,%,$@) install 
    3434linux-imagebuilder: 
  • trunk/openwrt/target/linux/Makefile

    r2940 r2970  
    1010 
    1111$(1)/$(2)-clean: 
    12         @$(TRACE) target/linux/$(2)-$(1)/clean 
     12        @$(TRACE) target/linux/$(2)-$(1)-clean 
    1313        $(MAKE) -C $(2)-$(1) BOARD="$(2)" clean 
    1414 
    1515$(1)/$(2)-prepare: 
    16         @$(TRACE) target/linux/$(2)-$(1)/prepare 
     16        @$(TRACE) target/linux/$(2)-$(1)-prepare 
    1717        $(MAKE) -C $(2)-$(1) BOARD="$(2)" prepare 
    1818 
    1919$(1)/$(2)-compile: 
    20         @$(TRACE) target/linux/$(2)-$(1)/compile 
     20        @$(TRACE) target/linux/$(2)-$(1)-compile 
    2121        $(MAKE) -C $(2)-$(1) BOARD="$(2)" compile 
    2222 
    2323$(1)/$(2)-rebuild: 
    24         @$(TRACE) target/linux/$(2)-$(1)/rebuild 
     24        @$(TRACE) target/linux/$(2)-$(1)-rebuild 
    2525        $(MAKE) -C $(2)-$(1) BOARD="$(2)" rebuild 
    2626 
    2727$(1)/$(2)-install: 
    28         @$(TRACE) target/linux/$(2)-$(1)/install 
     28        @$(TRACE) target/linux/$(2)-$(1)-install 
    2929        $(MAKE) -C $(2)-$(1) BOARD="$(2)" install 
    3030 
    3131$(1)/$(2)-image: $(1)/$(2)-install 
    32         @$(TRACE) target/linux/image/install 
     32        @$(TRACE) target/linux/image-install 
    3333        $(MAKE) -C image KERNEL="$(1)" BOARD="$(2)" install 
    3434 
    3535$(1)/$(2)-install-ib: 
    36         @$(TRACE) target/linux/image/install-ib 
     36        @$(TRACE) target/linux/image-install-ib 
    3737        $(MAKE) -C image KERNEL="$(1)" BOARD="$(2)" IB_DIR="$(IB_DIR)" install-ib 
    3838        echo '$$$$(eval $$$$(call image_template,$(2),$(1)))' >> $(IB_DIR)/kernel.mk 
     
    7575 
    7676prepare: 
    77         @$(TRACE) target/linux/image/prepare 
     77        @$(TRACE) target/linux/image-prepare 
    7878        $(MAKE) -C image prepare 
    7979compile: 
    80         @$(TRACE) target/linux/image/compile 
     80        @$(TRACE) target/linux/image-compile 
    8181        $(MAKE) -C image compile 
    8282install: 
  • trunk/openwrt/target/linux/image/Makefile

    r2562 r2970  
    2525 
    2626$(BOARD)-compile: 
    27         @$(TRACE) target/linux/image/$(BOARD)/prepare 
     27        @$(TRACE) target/linux/image/$(BOARD)-prepare 
    2828        $(MAKE) -C $(BOARD) prepare 
    29         @$(TRACE) target/linux/image/$(BOARD)/compile 
     29        @$(TRACE) target/linux/image/$(BOARD)-compile 
    3030        $(MAKE) -C $(BOARD) compile 
    3131 
    3232install-ib: 
    33         @$(TRACE) target/linux/image/$(BOARD)/install-ib 
     33        @$(TRACE) target/linux/image/$(BOARD)-install-ib 
    3434        -$(MAKE) -C $(BOARD) IB_DIR="$(IB_DIR)" install-ib 
    3535        mkdir -p $(IB_DIR)/build_$(ARCH)/linux-$(KERNEL)-$(BOARD) 
  • trunk/openwrt/target/linux/kernel.mk

    r2964 r2970  
    5959        @$(MAKE) $(LINUX_DIR)/.modules_done $(TARGETS) $(KERNEL_IPKG) $(MAKE_TRACE) 
    6060        ln -sf $(LINUX_BUILD_DIR)/linux-$(LINUX_VERSION) $(BUILD_DIR)/linux $(MAKE_TRACE) 
    61         @$(TRACE) target/linux/package/compile 
     61        @$(TRACE) target/linux/package-compile 
    6262        $(MAKE) -C $(TOPDIR)/target/linux/package \ 
    6363                $(KPKG_MAKEOPTS) \ 
     
    9393 
    9494install: compile 
    95         @$(TRACE) target/linux/package/install 
     95        @$(TRACE) target/linux/package-install 
    9696        $(MAKE) $(KPKG_MAKEOPTS) pkg-install $(MAKE_TRACE) 
    9797        $(MAKE) $(KPKG_MAKEOPTS) $(LINUX_KERNEL) $(MAKE_TRACE) 
Note: See TracChangeset for help on using the changeset viewer.