diff options
| author | Bjoern Michaelsen <b_michaelsen@openoffice.org> | 2011-01-21 13:10:37 +0100 |
|---|---|---|
| committer | Bjoern Michaelsen <b_michaelsen@openoffice.org> | 2011-01-21 13:10:37 +0100 |
| commit | a406f98c4d44848098decb082bd8c21d87c71969 (patch) | |
| tree | de339b8207f6a03209fb0d61eb85708ee0ab825e /solenv/gbuild/CppunitTest.mk | |
| parent | 43dbcdf8818caccf61eed08375ba3bde85fd7c75 (diff) | |
| parent | 40cf5bd91cd8bab9ab79693128a8f4623f518dc5 (diff) | |
gnumake3: merging minibranches
Diffstat (limited to 'solenv/gbuild/CppunitTest.mk')
| -rw-r--r-- | solenv/gbuild/CppunitTest.mk | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/solenv/gbuild/CppunitTest.mk b/solenv/gbuild/CppunitTest.mk index 4e6e4ee8aeb4..d4539b62beb5 100644 --- a/solenv/gbuild/CppunitTest.mk +++ b/solenv/gbuild/CppunitTest.mk @@ -28,16 +28,15 @@ # CppunitTest class -# defined globally in TargetLocations.mk -# gb_CppunitTest_get_linktargetname # defined by platform # gb_CppunitTest_TARGETTYPE # gb_CppunitTest_get_filename gb_CppunitTest_CPPTESTTARGET := $(call gb_Executable_get_target,cppunittester) gb_CppunitTest_CPPTESTCOMMAND := $(gb_CppunitTest_CPPTESTPRECOMMAND) $(gb_CppunitTest_CPPTESTTARGET) +gb_CppunitTest__get_linktargetname = CppunitTest/$(call gb_CppunitTest_get_filename,$(1)) .PHONY : $(call gb_CppunitTest_get_clean_target,%) -$(call gb_CppunitTest_get_clean_target,%) : $(call gb_LinkTarget_get_clean_target,$(call gb_Library_get_linktargetname,%)) +$(call gb_CppunitTest_get_clean_target,%) : $(call gb_Helper_abbreviate_dirs,\ rm -f $@ $@.log) @@ -46,10 +45,10 @@ $(call gb_CppunitTest_get_target,%) : $(gb_CppunitTest_CPPTESTTARGET) $(call gb_Output_announce,$*,$(true),CUT,2) $(call gb_Helper_abbreviate_dirs_native,\ mkdir -p $(dir $@) && \ - $(gb_CppunitTest_CPPTESTCOMMAND) $(call gb_LinkTarget_get_target,$(call gb_CppunitTest_get_linktargetname,$(call gb_CppunitTest_get_libfilename,$*))) > $@.log 2>&1 || (cat $@.log && false)) + $(gb_CppunitTest_CPPTESTCOMMAND) $(call gb_LinkTarget_get_target,$(call gb_CppunitTest__get_linktargetname,$*)) > $@.log 2>&1 || (cat $@.log && false)) define gb_CppunitTest_CppunitTest -$(call gb_CppunitTest__CppunitTest_impl,$(1),$(call gb_CppunitTest_get_linktargetname,$(call gb_CppunitTest_get_filename,$(1)))) +$(call gb_CppunitTest__CppunitTest_impl,$(1),$(call gb_CppunitTest__get_linktargetname,$(1))) endef @@ -58,13 +57,14 @@ $(call gb_LinkTarget_LinkTarget,$(2)) $(call gb_LinkTarget_set_targettype,$(2),CppunitTest) $(call gb_LinkTarget_add_linked_libs,$(2),cppunit) $(call gb_CppunitTest_get_target,$(1)) : $(call gb_LinkTarget_get_target,$(2)) +$(call gb_CppunitTest_get_clean_target,$(1)) : $(call gb_LinkTarget_get_clean_target,$(2)) $(call gb_CppunitTest_CppunitTest_platform,$(1),$(2),$(gb_Library_DLLDIR)/$(call gb_CppunitTest_get_libfilename,$(1))) $$(eval $$(call gb_Module_register_target,$(call gb_CppunitTest_get_target,$(1)),$(call gb_CppunitTest_get_clean_target,$(1)))) endef define gb_CppunitTest__forward_to_Linktarget -gb_CppunitTest_$(1) = $$(call gb_LinkTarget_$(1),$(call gb_CppunitTest_get_linktargetname,$$(call gb_CppunitTest_get_filename,$$(1))),$$(2),$$(3)) +gb_CppunitTest_$(1) = $$(call gb_LinkTarget_$(1),$$(call gb_CppunitTest__get_linktargetname,$$(1)),$$(2),$$(3)) endef |