diff options
| author | Mathias Bauer <mba@openoffice.org> | 2011-01-27 10:54:58 +0100 |
|---|---|---|
| committer | Mathias Bauer <mba@openoffice.org> | 2011-01-27 10:54:58 +0100 |
| commit | 25b881c04ca827e400f6fed8084707ac4165c7e6 (patch) | |
| tree | 326638b53ca492429c326a1966fc603a267f7044 /solenv | |
| parent | 079e072e186a2e267284a2c4354f5f18843ea0a7 (diff) | |
| parent | b0ac5e2d26f08b372ab802bb4cb4cd3f42b7ba1f (diff) | |
CWS gnumake3: merge minibranches
Diffstat (limited to 'solenv')
| -rw-r--r-- | solenv/gbuild/CustomTarget.mk | 4 | ||||
| -rw-r--r-- | solenv/gbuild/TargetLocations.mk | 4 |
2 files changed, 5 insertions, 3 deletions
diff --git a/solenv/gbuild/CustomTarget.mk b/solenv/gbuild/CustomTarget.mk index ca161d5e5f9f..8021736d5bdf 100644 --- a/solenv/gbuild/CustomTarget.mk +++ b/solenv/gbuild/CustomTarget.mk @@ -49,7 +49,7 @@ endef $(call gb_CustomTarget_get_clean_target,%) : $(call gb_Output_announce,$*,$(false),MAK,3) $(call gb_Helper_abbreviate_dirs,\ - rm -rf $(dir $(call gb_CustomTarget_get_target,$*))) + rm -rf $(call gb_CustomTarget_get_workdir,$*) && rm -f $(call gb_CustomTarget_get_target,$*)) $(foreach reponame,$(gb_CustomTarget_REPOSITORYNAMES),$(eval $(call gb_CustomTarget__rules,$(reponame)))) @@ -62,6 +62,8 @@ define gb_CustomTarget_CustomTarget $(foreach reponame,$(gb_CustomTarget_REPOSITORYNAMES),\ $(eval $(call gb_CustomTarget_get_repo_target,$(reponame),$(1)) : $(call gb_CustomTarget__get_makefile,$($(reponame)),$(1)))) +$(call gb_CustomTarget_get_workdir,$(1))/% : $(call gb_CustomTarget_get_target,$(1)) + endef diff --git a/solenv/gbuild/TargetLocations.mk b/solenv/gbuild/TargetLocations.mk index 50ff17a31e44..a023684e6ce3 100644 --- a/solenv/gbuild/TargetLocations.mk +++ b/solenv/gbuild/TargetLocations.mk @@ -49,8 +49,8 @@ gb_AllLangResTarget_get_target = $(WORKDIR)/AllLangRes/$(1) gb_CObject_get_target = $(WORKDIR)/CObject/$(1).o gb_ComponentTarget_get_target = $(WORKDIR)/ComponentTarget/$(1).component gb_CppunitTest_get_target = $(WORKDIR)/CppunitTest/$(1).test -gb_CustomTarget_get_repo_target = $(WORKDIR)/CustomTarget/$(2)/$(1).done -gb_CustomTarget_get_target = $(WORKDIR)/CustomTarget/$(1)/done +gb_CustomTarget_get_repo_target = $(WORKDIR)/CustomTarget/$(2)_$(1).done +gb_CustomTarget_get_target = $(WORKDIR)/CustomTarget/$(1).done gb_CustomTarget_get_workdir = $(WORKDIR)/CustomTarget/$(1) gb_CxxObject_get_target = $(WORKDIR)/CxxObject/$(1).o gb_Executable_get_external_headers_target = $(WORKDIR)/ExternalHeaders/Executable/$(1) |