[Libreoffice-commits] .: solenv/gbuild

Libreoffice Gerrit user logerrit at kemper.freedesktop.org
Sun Nov 25 06:19:37 PST 2012


 solenv/gbuild/CppunitTest.mk |   16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

New commits:
commit 6f3f04597f9c4260511d3bd352f1c89a29fa1973
Author: Rob Snelders <programming at ertai.nl>
Date:   Sun Nov 25 15:18:52 2012 +0100

    Work around make 3.81 pattern rule problems
    
    Change-Id: Ife5cccd8c7011199e370cd68a76a077451675a55

diff --git a/solenv/gbuild/CppunitTest.mk b/solenv/gbuild/CppunitTest.mk
index 0fa1aba..823b78d 100644
--- a/solenv/gbuild/CppunitTest.mk
+++ b/solenv/gbuild/CppunitTest.mk
@@ -312,16 +312,16 @@ $(call gb_CppunitTest_get_target,$(1)) : \
 $(call gb_CppunitTest_get_clean_target,$(1)) : \
         $(call gb_CppunitTestFakeExecutable_get_clean_target,$(2))
 
-endef
-
-$(call gb_CppunitTestFakeExecutable_get_target,%) : \
-        $(call gb_Executable_get_target,%)
-	$(call gb_Helper_abbreviate_dirs,mkdir -p $(dir $@) && cp $< $@)
+$(call gb_CppunitTestFakeExecutable_get_target,$(2)) : \
+        $(call gb_Executable_get_target,$(2))
+	$(call gb_Helper_abbreviate_dirs,mkdir -p $$(dir $$@) && cp $$< $$@)
 
-.PHONY : $(call gb_CppunitTestFakeExecutable_get_clean_target,%)
-$(call gb_CppunitTestFakeExecutable_get_clean_target,%) :
+.PHONY : $(call gb_CppunitTestFakeExecutable_get_clean_target,$(2))
+$(call gb_CppunitTestFakeExecutable_get_clean_target,$(2)) :
 	$(call gb_Helper_abbreviate_dirs, \
-        rm -f $(call gb_CppunitTestFakeExecutable_get_target,$*))
+        rm -f $(call gb_CppunitTestFakeExecutable_get_target,$(2)))
+
+endef
 
 define gb_CppunitTest__forward_to_Linktarget
 gb_CppunitTest_$(1) = $$(call gb_LinkTarget_$(1),$$(call gb_CppunitTest__get_linktargetname,$$(1)),$$(2),$$(3),CppunitTest_$$(1))


More information about the Libreoffice-commits mailing list