diff options
| author | Bjoern Michaelsen <b_michaelsen@openoffice.org> | 2011-01-26 17:02:22 +0100 |
|---|---|---|
| committer | Bjoern Michaelsen <b_michaelsen@openoffice.org> | 2011-01-26 17:02:22 +0100 |
| commit | f8e99b2e95c23685760165eab28a1d941793deb4 (patch) | |
| tree | 03dffff8e34bb0db53f63301997bf348a2ab0dc3 /solenv | |
| parent | ef0e275eab240c610d5e7441f625271f06a7796b (diff) | |
gnumake3: fix dependencies on CustomTargets
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) |