[Libreoffice-commits] core.git: connectivity/CppunitTest_connectivity_commontools.mk

[Jens Carl (via logerrit)]

 connectivity/CppunitTest_connectivity_commontools.mk |   46 ++-----------------
 1 file changed, 6 insertions(+), 40 deletions(-)

New commits:
commit 43249c07adaf3f66bf47193c7aa08b941751e8d5
Author:     Jens Carl <j.carl43 at gmx.de>
AuthorDate: Tue May 7 09:13:18 2019 -0700
Commit:     Michael Stahl <Michael.Stahl at cib.de>
CommitDate: Thu May 9 11:13:26 2019 +0200

    Clean up makefile (remove some cargo-cult copied stuff)
    
    Change-Id: Iafbb69a405a3c9ee8d0ae7dbe8a24a75d237519d
    Reviewed-on: https://gerrit.libreoffice.org/71924
    Tested-by: Jenkins
    Reviewed-by: Michael Stahl <Michael.Stahl at cib.de>

diff --git a/connectivity/CppunitTest_connectivity_commontools.mk b/connectivity/CppunitTest_connectivity_commontools.mk
index 80e5d1ce5277..15a9d7e4633e 100644
--- a/connectivity/CppunitTest_connectivity_commontools.mk
+++ b/connectivity/CppunitTest_connectivity_commontools.mk
@@ -17,56 +17,22 @@ $(eval $(call gb_CppunitTest_set_include,connectivity_commontools,\
 $(eval $(call gb_CppunitTest_use_ure,connectivity_commontools))
 $(eval $(call gb_CppunitTest_use_vcl,connectivity_commontools))
 
-$(eval $(call gb_CppunitTest_use_external,connectivity_commontools,boost_headers))
-
 $(eval $(call gb_CppunitTest_use_sdk_api,connectivity_commontools))
 
-ifeq ($(COM),GCC)
-ifneq ($(COM_IS_CLANG),TRUE)
-$(eval $(call gb_CppunitTest_add_cxxflags,connectivity_commontools,\
-	-fpermissive \
-))
-endif
-endif
-
-# In mergedlibs mode we have multiply-defined symbols, which Visual Studio
-# does not like. There is no good solution, so just force it.
-ifeq ($(COM),MSC)
-ifneq (,$(MERGELIBS))
-$(eval $(call gb_CppunitTest_add_ldflags,connectivity_commontools,\
-	 /FORCE:MULTIPLE \
-))
-endif
-endif
-
 $(eval $(call gb_CppunitTest_add_exception_objects,connectivity_commontools, \
 	connectivity/qa/connectivity/commontools/FValue_test \
 ))
 
-$(eval $(call gb_CppunitTest_use_library_objects,connectivity_commontools,dbtools))
-
 $(eval $(call gb_CppunitTest_use_libraries,connectivity_commontools, \
-    comphelper \
-    cppu \
-    cppuhelper \
-    i18nlangtag \
-    $(if $(ENABLE_JAVA), \
-        jvmaccess) \
-    sal \
-    salhelper \
-    test \
-    unotest \
-    utl \
-    tl \
-    svt \
-    vcl \
+	cppu \
+	dbtools \
+	sal \
+	test \
+	unotest \
 ))
 
 $(eval $(call gb_CppunitTest_use_components,connectivity_commontools,\
-    configmgr/source/configmgr \
-    i18npool/util/i18npool \
-    ucb/source/core/ucb1 \
-    ucb/source/ucp/file/ucpfile1 \
+	configmgr/source/configmgr \
 ))
 
 $(eval $(call gb_CppunitTest_use_configuration,connectivity_commontools))