[Libreoffice-commits] .: solenv/gbuild

[David Tardon]

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

New commits:
commit 9a2263d9600b78c3654c0b2ee303a73aceb2869d
Author: David Tardon <dtardon at redhat.com>
Date:   Sat Mar 19 14:36:23 2011 +0100

    second attempt

diff --git a/solenv/gbuild/CppunitTest.mk b/solenv/gbuild/CppunitTest.mk
index b26d545..e46103b 100644
--- a/solenv/gbuild/CppunitTest.mk
+++ b/solenv/gbuild/CppunitTest.mk
@@ -55,9 +55,7 @@ endef
 define gb_CppunitTest__CppunitTest_impl
 $(call gb_LinkTarget_LinkTarget,$(2))
 $(call gb_LinkTarget_set_targettype,$(2),CppunitTest)
-ifeq ($(SYSTEM_CPPUNIT),"YES")
-$(call gb_LinkTarget_add_linked_libs,$(2),cppunit)
-else
+ifeq ($$(SYSTEM_CPPUNIT),"YES")
 $(call gb_LinkTarget_add_includes,$(2),$(filter -I%,$(CPPUNIT_CFLAGS)))
 $(call gb_LinkTarget_set_defs,$(2), \
     $$(DEFS) \
@@ -66,6 +64,8 @@ $(call gb_LinkTarget_set_defs,$(2), \
 $(call gb_LinkTarget_set_ldflags,$(2),\
     $$(LDFLAGS) \
     $(CPPUNIT_LIBS) \
+else
+$(call gb_LinkTarget_add_linked_libs,$(2),cppunit)
 )
 endif
 $(call gb_CppunitTest_get_target,$(1)) : $(call gb_LinkTarget_get_target,$(2))