From 82f3b262f887f832a84ce969cf2da0eedf5babbe Mon Sep 17 00:00:00 2001
From: Michael Stahl <mstahl@redhat.com>
Date: Fri, 7 Oct 2016 21:19:19 +0200
Subject: xmloff: fix --enable-mergelibs build

... by merging all object-using CppunitTests into uxmloff, which is
already disabled for MERGELIBS.

Change-Id: I12ad08660fd714cceba2fe9b855cdb1bbda19c2d
---
 xmloff/CppunitTest_xmloff_tokenmap.mk | 44 -----------------------------------
 xmloff/CppunitTest_xmloff_uxmloff.mk  |  6 ++++-
 xmloff/Module_xmloff.mk               |  1 -
 xmloff/qa/unit/tokenmap-test.cxx      |  1 -
 4 files changed, 5 insertions(+), 47 deletions(-)
 delete mode 100644 xmloff/CppunitTest_xmloff_tokenmap.mk

diff --git a/xmloff/CppunitTest_xmloff_tokenmap.mk b/xmloff/CppunitTest_xmloff_tokenmap.mk
deleted file mode 100644
index 2c96f00ac244..000000000000
--- a/xmloff/CppunitTest_xmloff_tokenmap.mk
+++ /dev/null
@@ -1,44 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-
-$(eval $(call gb_CppunitTest_CppunitTest,xmloff_tokenmap))
-
-$(eval $(call gb_CppunitTest_add_exception_objects,xmloff_tokenmap, \
-	xmloff/qa/unit/tokenmap-test \
-))
-
-$(eval $(call gb_CppunitTest_use_custom_headers,xmloff_tokenmap, \
-	xmloff/generated \
-))
-
-$(eval $(call gb_CppunitTest_use_library_objects,xmloff_tokenmap,xo))
-
-$(eval $(call gb_CppunitTest_use_api,xmloff_tokenmap, \
-	offapi \
-	udkapi \
-))
-
-$(eval $(call gb_CppunitTest_use_libraries,xmloff_tokenmap, \
-	basegfx \
-    comphelper \
-    cppu \
-    cppuhelper \
-    i18nlangtag \
-    sal \
-    salhelper \
-    sax \
-    svl \
-    tl \
-    utl \
-    vcl \
-    $(gb_UWINAPI) \
-))
-
-# vim: set noet sw=4 ts=4:
diff --git a/xmloff/CppunitTest_xmloff_uxmloff.mk b/xmloff/CppunitTest_xmloff_uxmloff.mk
index 7e517229b47f..45eb4178f311 100644
--- a/xmloff/CppunitTest_xmloff_uxmloff.mk
+++ b/xmloff/CppunitTest_xmloff_uxmloff.mk
@@ -11,9 +11,9 @@ $(eval $(call gb_CppunitTest_CppunitTest,xmloff_uxmloff))
 
 $(eval $(call gb_CppunitTest_add_exception_objects,xmloff_uxmloff, \
     xmloff/qa/unit/uxmloff \
+	xmloff/qa/unit/tokenmap-test \
 ))
 
-
 $(eval $(call gb_CppunitTest_set_include,xmloff_uxmloff,\
     -I$(SRCDIR)/xmloff/inc \
     -I$(SRCDIR)/xmloff/source/style \
@@ -21,6 +21,10 @@ $(eval $(call gb_CppunitTest_set_include,xmloff_uxmloff,\
     $$(INCLUDE) \
 ))
 
+$(eval $(call gb_CppunitTest_use_custom_headers,xmloff_uxmloff, \
+	xmloff/generated \
+))
+
 $(eval $(call gb_CppunitTest_use_sdk_api,xmloff_uxmloff))
 
 $(eval $(call gb_CppunitTest_use_ure,xmloff_uxmloff))
diff --git a/xmloff/Module_xmloff.mk b/xmloff/Module_xmloff.mk
index d502b7daf69d..8b1ced43396f 100644
--- a/xmloff/Module_xmloff.mk
+++ b/xmloff/Module_xmloff.mk
@@ -29,7 +29,6 @@ $(eval $(call gb_Module_add_targets,xmloff,\
 $(eval $(call gb_Module_add_check_targets,xmloff,\
 	$(if $(MERGELIBS),, \
 		CppunitTest_xmloff_uxmloff) \
-	CppunitTest_xmloff_tokenmap \
 ))
 
 $(eval $(call gb_Module_add_subsequentcheck_targets,xmloff,\
diff --git a/xmloff/qa/unit/tokenmap-test.cxx b/xmloff/qa/unit/tokenmap-test.cxx
index 0144ded71e2b..dec88882b1d8 100644
--- a/xmloff/qa/unit/tokenmap-test.cxx
+++ b/xmloff/qa/unit/tokenmap-test.cxx
@@ -89,4 +89,3 @@ CPPUNIT_TEST_SUITE_REGISTRATION(TokenmapTest);
 
 }
 
-CPPUNIT_PLUGIN_IMPLEMENT();
-- 
cgit