[Libreoffice-commits] .: RepositoryFixes.mk solenv/gbuild

[David Tardon]

 RepositoryFixes.mk           |    4 ++++
 solenv/gbuild/CppunitTest.mk |    9 +--------
 2 files changed, 5 insertions(+), 8 deletions(-)

New commits:
commit f55ff564a217017598d84caecff7da559d702cb3
Author: David Tardon <dtardon at redhat.com>
Date:   Sat Mar 19 16:58:49 2011 +0100

    do not build cppunit if not needed
    
    Suggested by Bjoern Michaelsen.

diff --git a/RepositoryFixes.mk b/RepositoryFixes.mk
index 4d26ccc..546643c 100644
--- a/RepositoryFixes.mk
+++ b/RepositoryFixes.mk
@@ -156,4 +156,8 @@ ifeq ($(SYSTEM_ICU),YES)
 gb_Library_TARGETS := $(filter-out icuuc,$(gb_Library_TARGETS))
 endif
 
+ifeq ($(SYSTEM_CPPUNIT),YES)
+gb_Library_TARGETS := $(filter-out cppunit,$(gb_Library_TARGETS))
+endif
+
 # vim: set noet sw=4 ts=4:
diff --git a/solenv/gbuild/CppunitTest.mk b/solenv/gbuild/CppunitTest.mk
index e46103b..4b09c5c 100644
--- a/solenv/gbuild/CppunitTest.mk
+++ b/solenv/gbuild/CppunitTest.mk
@@ -55,19 +55,12 @@ 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)
 $(call gb_LinkTarget_add_includes,$(2),$(filter -I%,$(CPPUNIT_CFLAGS)))
 $(call gb_LinkTarget_set_defs,$(2), \
     $$(DEFS) \
     $(filter-out -I%,$(CPPUNIT_CFLAGS)) \
 )
-$(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))
 $(call gb_CppunitTest_get_clean_target,$(1)) : $(call gb_LinkTarget_get_clean_target,$(2))
 $(call gb_CppunitTest_CppunitTest_platform,$(1),$(2),$(gb_CppunitTest_DLLDIR)/$(call gb_CppunitTest_get_libfilename,$(1)))