diff options
| author | David Tardon <dtardon@redhat.com> | 2013-02-28 12:23:41 +0100 |
|---|---|---|
| committer | David Tardon <dtardon@redhat.com> | 2013-02-28 12:30:51 +0100 |
| commit | 9e3dcc233b3bf3e259e1418c061576d2d0b9f394 (patch) | |
| tree | 72518301410ceef1f0c55939e81b099170c00a38 | |
| parent | b4174e9aaa431c29bab0b613e71d6dab2e725246 (diff) | |
remove superfluous target
Change-Id: Idbb67a2cb79f8eb4f8cf5834217bb0c900a978a6
| -rw-r--r-- | solenv/gbuild/HelpTarget.mk | 13 | ||||
| -rw-r--r-- | solenv/gbuild/TargetLocations.mk | 1 |
2 files changed, 3 insertions, 11 deletions
diff --git a/solenv/gbuild/HelpTarget.mk b/solenv/gbuild/HelpTarget.mk index 4bc077c60051..26ef28bd7a13 100644 --- a/solenv/gbuild/HelpTarget.mk +++ b/solenv/gbuild/HelpTarget.mk @@ -534,17 +534,12 @@ $(call gb_HelpTarget_get_linked_target,%) : $(call gb_HelpTarget_get_target,%) : $(call gb_HelpTarget__get_command,$@,$*) -# All processing is done and the results can be packed into a zip. -$(call gb_HelpTarget_get_packing_target,%) : - touch $@ - .PHONY : $(call gb_HelpTarget_get_clean_target,%) $(call gb_HelpTarget_get_clean_target,%) : $(call gb_Output_announce,$*,$(false),HLP,4) $(call gb_Helper_abbreviate_dirs,\ rm -rf \ $(call gb_HelpTarget_get_linked_target,$*) \ - $(call gb_HelpTarget_get_packing_target,$*) \ $(call gb_HelpTarget_get_target,$*) \ $(call gb_HelpTarget_get_translation_target,$*) \ $(call gb_HelpTarget_get_workdir,$*) \ @@ -576,11 +571,9 @@ $(call gb_HelpJarTarget_HelpJarTarget,$(1),$(2),$(4)) $(call gb_HelpTarget_get_linked_target,$(1)) : $(call gb_HelpTarget_get_translation_target,$(1)) $(call gb_HelpLinkTarget_get_preparation_target,$(1)) : $(call gb_HelpTarget_get_linked_target,$(1)) $(call gb_HelpLinkTarget_get_target,$(1)) :| $(call gb_HelpTarget_get_workdir,$(1))/.dir -$(call gb_HelpTarget_get_packing_target,$(1)) : $(call gb_HelpLinkTarget_get_target,$(1)) -$(call gb_HelpTarget_get_target,$(1)) : $(call gb_HelpTarget_get_packing_target,$(1)) +$(call gb_HelpTarget_get_target,$(1)) : $(call gb_HelpLinkTarget_get_target,$(1)) $(call gb_HelpTarget_get_linked_target,$(1)) :| $(dir $(call gb_HelpTarget_get_linked_target,$(1))).dir -$(call gb_HelpTarget_get_packing_target,$(1)) :| $(dir $(call gb_HelpTarget_get_packing_target,$(1))).dir $(call gb_HelpTarget_get_target,$(1)) :| $(dir $(call gb_HelpTarget_get_target,$(1))).dir $(call gb_HelpTarget_get_translation_target,$(1)) :| $(dir $(call gb_HelpTarget_get_translation_target,$(1))).dir @@ -653,7 +646,7 @@ $(call gb_HelpTarget__add_index_files,$(1),$(call gb_HelpTarget__get_module,$(1) $(call gb_HelpTarget_get_target,$(1)) : HELP_INDEXED := $(true) $(call gb_HelpIndexTarget_get_target,$(1)) : $(call gb_HelpLinkTarget_get_target,$(1)) -$(call gb_HelpTarget_get_packing_target,$(1)) : $(call gb_HelpIndexTarget_get_target,$(1)) +$(call gb_HelpTarget_get_target,$(1)) : $(call gb_HelpIndexTarget_get_target,$(1)) $(call gb_HelpTarget_get_clean_target,$(1)) : $(call gb_HelpIndexTarget_get_clean_target,$(1)) endef @@ -662,7 +655,7 @@ endef define gb_HelpTarget__add_jar $(call gb_HelpTarget__add_file,$(1),$(call gb_HelpTarget__get_module,$(1)).jar) $(call gb_HelpJarTarget_get_target,$(1)) : $(call gb_HelpLinkTarget_get_target,$(1)) -$(call gb_HelpTarget_get_packing_target,$(1)) : $(call gb_HelpJarTarget_get_target,$(1)) +$(call gb_HelpTarget_get_target,$(1)) : $(call gb_HelpJarTarget_get_target,$(1)) $(call gb_HelpTarget_get_clean_target,$(1)) : $(call gb_HelpJarTarget_get_clean_target,$(1)) endef diff --git a/solenv/gbuild/TargetLocations.mk b/solenv/gbuild/TargetLocations.mk index 39635e69a325..b46070e1e205 100644 --- a/solenv/gbuild/TargetLocations.mk +++ b/solenv/gbuild/TargetLocations.mk @@ -127,7 +127,6 @@ gb_HelpLinkTarget_get_preparation_target = $(WORKDIR)/HelpLinkTarget/$(1).prepar gb_HelpLinkTarget_get_target = $(WORKDIR)/HelpLinkTarget/$(1).done gb_HelpTarget_get_filelist = $(WORKDIR)/HelpTarget/$(1).filelist gb_HelpTarget_get_linked_target = $(WORKDIR)/HelpTarget/$(1).translate -gb_HelpTarget_get_packing_target = $(WORKDIR)/HelpTarget/$(1).packing gb_HelpTarget_get_target = $(WORKDIR)/HelpTarget/$(1).zip gb_HelpTarget_get_translation_target = $(call gb_HelpTarget_get_filelist,$(1)) gb_HelpTarget_get_workdir = $(WORKDIR)/HelpTarget/$(1) |