tools: just generate the complete reversemap.cxx

This makes tools pch ready.

Change-Id: I8d5d5fcbb417f3790749aeb9d9c947f739ecb30f

4 files changed, 11 insertions, 25 deletions

diff --git a/tools/CustomTarget_reversemap.mk b/tools/CustomTarget_reversemap.mk
index 1e8fba6bd4de..ef55d0df0f4d 100644
--- a/tools/CustomTarget_reversemap.mk
+++ b/tools/CustomTarget_reversemap.mk
@@ -6,14 +6,14 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_CustomTarget_CustomTarget,tools/reversemap))
+$(eval $(call gb_CustomTarget_CustomTarget,tools/string))
 
-$(call gb_CustomTarget_get_target,tools/reversemap) : \
-	$(call gb_CustomTarget_get_workdir,tools/reversemap)/reversemap.hxx
+$(call gb_CustomTarget_get_target,tools/string) : \
+	$(call gb_CustomTarget_get_workdir,tools/string)/reversemap.cxx
 
-$(call gb_CustomTarget_get_workdir,tools/reversemap)/reversemap.hxx : \
+$(call gb_CustomTarget_get_workdir,tools/string)/reversemap.cxx : \
 		$(call gb_Executable_get_runtime_dependencies,bestreversemap) \
-		| $(call gb_CustomTarget_get_workdir,tools/reversemap)/.dir
+		| $(call gb_CustomTarget_get_workdir,tools/string)/.dir
 	$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),BRM,1)
 	$(call gb_Helper_execute,bestreversemap > $@)
 
diff --git a/tools/Library_tl.mk b/tools/Library_tl.mk
index 098f38e9ce72..c9921f96fb8b 100644
--- a/tools/Library_tl.mk
+++ b/tools/Library_tl.mk
@@ -19,8 +19,6 @@
 
 $(eval $(call gb_Library_Library,tl))
 
-$(eval $(call gb_Library_use_custom_headers,tl,tools/reversemap))
-
 $(eval $(call gb_Library_set_include,tl,\
     -I$(SRCDIR)/tools/inc \
     $$(INCLUDE) \
@@ -83,10 +81,13 @@ $(eval $(call gb_Library_add_exception_objects,tl,\
     tools/source/stream/strmsys \
     tools/source/stream/vcompat \
     tools/source/string/tenccvt \
-    tools/source/string/reversemap \
     tools/source/zcodec/zcodec \
 ))
 
+$(eval $(call gb_Library_add_generated_exception_objects,tl,\
+    CustomTarget/tools/string/reversemap \
+))
+
 $(eval $(call gb_Library_use_externals,tl,\
 	boost_headers \
 	zlib \
diff --git a/tools/source/reversemap/bestreversemap.cxx b/tools/source/reversemap/bestreversemap.cxx
index a76cb17bc56e..e5112c81983c 100644
--- a/tools/source/reversemap/bestreversemap.cxx
+++ b/tools/source/reversemap/bestreversemap.cxx
@@ -80,6 +80,8 @@ int main()
     };
 
     printf("//Do not edit manually, generated from bestreversemap.cxx\n");
+    printf("#include <rtl/textenc.h>\n");
+    printf("#include <tools/tenccvt.hxx>\n");
     printf("rtl_TextEncoding getBestMSEncodingByChar(sal_Unicode c)\n");
     printf("{\n");
 
diff --git a/tools/source/string/reversemap.cxx b/tools/source/string/reversemap.cxx
deleted file mode 100644
index e4fc8b2ddd99..000000000000
--- a/tools/source/string/reversemap.cxx
+++ /dev/null
@@ -1,17 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * 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/.
- */
-
-#include <rtl/textenc.h>
-#include <tools/tenccvt.hxx>
-
-//Use reverse map generated at buildtime via bestreversemap
-
-#include "reversemap.hxx"
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */