[PATCH] [not ready] gbuild conversion l10ntools module

Hi all,

I'm sending this work in progress patch.
Help (clucene) and dist migration is still under way.
It would be nice if somebody would check it.

Thank you in advance
David

PS: @David: thank you very much for your help on IRC!

From 86982d5c88efdc80bd393bae6ddec772df5e013d Mon Sep 17 00:00:00 2001
From: David Ostrovsky <David.Ostrovsky@gmx.de>
Date: Tue, 1 May 2012 23:33:03 +0200
Subject: [PATCH] gbuild conversion l10ntools module

Change-Id: I9bbefab8fc10933a690cb865145b77f388c68783
---
 Makefile                           |    2 +-
 Repository.mk                      |    8 +++++
 idlc/source/scanner.l              |    1 +
 l10ntools/Executable_cfgex.mk      |   51 ++++++++++++++++++++++++++++++++++++
 l10ntools/Executable_gsicheck.mk   |   44 +++++++++++++++++++++++++++++++
 l10ntools/Executable_helpex.mk     |   51 ++++++++++++++++++++++++++++++++++++
 l10ntools/Executable_localize.mk   |   43 ++++++++++++++++++++++++++++++
 l10ntools/Executable_transex3.mk   |   51 ++++++++++++++++++++++++++++++++++++
 l10ntools/Executable_ulfex.mk      |   48 +++++++++++++++++++++++++++++++++
 l10ntools/Executable_xrmex.mk      |   51 ++++++++++++++++++++++++++++++++++++
 l10ntools/Jar_FCFGMerge.mk         |   48 +++++++++++++++++++++++++++++++++
 l10ntools/Makefile                 |    7 +++++
 l10ntools/Module_l10ntools.mk      |   41 +++++++++++++++++++++++++++++
 l10ntools/StaticLibrary_transex.mk |   42 +++++++++++++++++++++++++++++
 l10ntools/source/cfglex.l          |   21 +++++++--------
 l10ntools/source/cfgmerge.cxx      |    2 +-
 l10ntools/source/export.cxx        |    4 +-
 l10ntools/source/srclex.l          |   26 ++++++++++--------
 l10ntools/source/xrmlex.l          |   36 ++++++++++++-------------
 l10ntools/source/xrmmerge.cxx      |    4 +-
 20 files changed, 533 insertions(+), 48 deletions(-)
 create mode 100644 l10ntools/Executable_cfgex.mk
 create mode 100644 l10ntools/Executable_gsicheck.mk
 create mode 100644 l10ntools/Executable_helpex.mk
 create mode 100644 l10ntools/Executable_localize.mk
 create mode 100644 l10ntools/Executable_transex3.mk
 create mode 100644 l10ntools/Executable_ulfex.mk
 create mode 100644 l10ntools/Executable_xrmex.mk
 create mode 100644 l10ntools/Jar_FCFGMerge.mk
 create mode 100644 l10ntools/Makefile
 create mode 100644 l10ntools/Module_l10ntools.mk
 create mode 100644 l10ntools/StaticLibrary_transex.mk
 delete mode 100644 l10ntools/prj/dmake

diff --git a/Makefile b/Makefile
index 3360eb1..60a3b4b 100644
--- a/Makefile
+++ b/Makefile
@@ -73,6 +73,7 @@ javaunohelper\
 jurt\
 jvmaccess\
 jvmfwk\
+l10ntools\
 lingucomponent\
 linguistic\
 lotuswordpro\
@@ -181,7 +182,6 @@ icu\
 instsetoo_native\
 jfreereport\
 jpeg\
-l10ntools\
 languagetool\
 libcdr\
 libcmis\
diff --git a/Repository.mk b/Repository.mk
index fa75986..7cd5075 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -30,12 +30,16 @@ $(eval $(call gb_Helper_register_executables,NONE, \
     bestreversemap \
     bmp \
     bmpsum \
+    cfgex \
     cppunit/cppunittester \
     g2g \
     gencoll_rule \
     genconv_dict \
     gendict \
     genindex_data \
+    gsicheck \
+    helpex \
+    localize \
     mkunroll \
     osl_process_child \
     pdf2xml \
@@ -49,8 +53,11 @@ $(eval $(call gb_Helper_register_executables,NONE, \
     sp2bv \
     svg2odf \
     svidl \
+    transex3 \
     typesconfig \
+    ulfex \
     xml2cmp \
+    xrmex \
     xpdfimport \
 ))
 
@@ -575,6 +582,7 @@ $(eval $(call gb_Helper_register_static_libraries,PLAINLIBS, \
     ooopathutils \
     sample \
     salcpprt \
+    transex \
     ulingu \
     vclmain \
     writerperfect \
diff --git a/idlc/source/scanner.l b/idlc/source/scanner.l
index 8d95322..8675f26 100644
--- a/idlc/source/scanner.l
+++ b/idlc/source/scanner.l
@@ -258,6 +258,7 @@ static void parseLineAndFile(sal_Char* pBuf)
 // Suppress any warnings from generated code:
 #if defined __GNUC__
 #pragma GCC diagnostic ignored "-Wunused-function"
+#pragma GCC diagnostic ignored "-Wunused-label"
 #elif defined __SUNPRO_CC
 #pragma disable_warn
 #elif defined _MSC_VER
diff --git a/l10ntools/Executable_cfgex.mk b/l10ntools/Executable_cfgex.mk
new file mode 100644
index 0000000..405780e
--- /dev/null
+++ b/l10ntools/Executable_cfgex.mk
@@ -0,0 +1,51 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# Major Contributor(s):
+# Copyright (C) 2012 David Ostrovsky <d.ostrovsky@gmx.de> (initial developer)
+#
+# All Rights Reserved.
+#
+# For minor contributions see the git repository.
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+
+$(eval $(call gb_Executable_Executable,cfgex))
+
+$(eval $(call gb_Executable_set_include,cfgex,\
+    -I$(SRCDIR)/l10ntools/inc \
+    -I$(SRCDIR)/l10ntools/source \
+    $$(INCLUDE) \
+))
+
+$(eval $(call gb_Executable_use_libraries,cfgex,\
+    sal \
+))
+
+$(eval $(call gb_Executable_add_scanners,cfgex,\
+    l10ntools/source/cfglex \
+))
+
+$(eval $(call gb_Executable_use_static_libraries,cfgex,\
+    transex \
+))
+
+$(eval $(call gb_Executable_add_cxxobjects,cfgex,\
+    l10ntools/source/cfgmerge \
+))
+
+# vim:set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/l10ntools/Executable_gsicheck.mk b/l10ntools/Executable_gsicheck.mk
new file mode 100644
index 0000000..0213b91
--- /dev/null
+++ b/l10ntools/Executable_gsicheck.mk
@@ -0,0 +1,44 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# Major Contributor(s):
+# Copyright (C) 2012 David Ostrovsky <d.ostrovsky@gmx.de> (initial developer)
+#
+# All Rights Reserved.
+#
+# For minor contributions see the git repository.
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+
+$(eval $(call gb_Executable_Executable,gsicheck))
+
+$(eval $(call gb_Executable_set_include,gsicheck,\
+    -I$(SRCDIR)/l10ntools/inc \
+    -I$(SRCDIR)/l10ntools/source \
+    $$(INCLUDE) \
+))
+
+$(eval $(call gb_Executable_use_libraries,gsicheck,\
+    sal \
+))
+
+$(eval $(call gb_Executable_add_cxxobjects,gsicheck,\
+    l10ntools/source/gsicheck \
+    l10ntools/source/tagtest \
+))
+
+# vim:set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/l10ntools/Executable_helpex.mk b/l10ntools/Executable_helpex.mk
new file mode 100644
index 0000000..1137240
--- /dev/null
+++ b/l10ntools/Executable_helpex.mk
@@ -0,0 +1,51 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# Major Contributor(s):
+# Copyright (C) 2012 David Ostrovsky <d.ostrovsky@gmx.de> (initial developer)
+#
+# All Rights Reserved.
+#
+# For minor contributions see the git repository.
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+
+$(eval $(call gb_Executable_Executable,helpex))
+
+$(eval $(call gb_Executable_set_include,helpex,\
+    -I$(SRCDIR)/l10ntools/inc \
+    -I$(SRCDIR)/l10ntools/source \
+    $$(INCLUDE) \
+))
+
+$(eval $(call gb_Executable_use_libraries,helpex,\
+    sal \
+))
+
+$(eval $(call gb_Executable_use_external,helpex,expat_utf8))
+
+$(eval $(call gb_Executable_use_static_libraries,helpex,\
+    transex \
+))
+
+$(eval $(call gb_Executable_add_cxxobjects,helpex,\
+    l10ntools/source/helpex \
+    l10ntools/source/xmlparse \
+    l10ntools/source/helpmerge \
+))
+
+# vim:set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/l10ntools/Executable_localize.mk b/l10ntools/Executable_localize.mk
new file mode 100644
index 0000000..089fd06
--- /dev/null
+++ b/l10ntools/Executable_localize.mk
@@ -0,0 +1,43 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# Major Contributor(s):
+# Copyright (C) 2012 David Ostrovsky <d.ostrovsky@gmx.de> (initial developer)
+#
+# All Rights Reserved.
+#
+# For minor contributions see the git repository.
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+
+$(eval $(call gb_Executable_Executable,localize))
+
+$(eval $(call gb_Executable_set_include,localize,\
+    -I$(SRCDIR)/l10ntools/inc \
+    -I$(SRCDIR)/l10ntools/source \
+    $$(INCLUDE) \
+))
+
+$(eval $(call gb_Executable_use_libraries,localize,\
+    sal \
+))
+
+$(eval $(call gb_Executable_add_cxxobjects,localize,\
+    l10ntools/source/localize \
+))
+
+# vim:set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/l10ntools/Executable_transex3.mk b/l10ntools/Executable_transex3.mk
new file mode 100644
index 0000000..8a3685c
--- /dev/null
+++ b/l10ntools/Executable_transex3.mk
@@ -0,0 +1,51 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# Major Contributor(s):
+# Copyright (C) 2012 David Ostrovsky <d.ostrovsky@gmx.de> (initial developer)
+#
+# All Rights Reserved.
+#
+# For minor contributions see the git repository.
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+
+$(eval $(call gb_Executable_Executable,transex3))
+
+$(eval $(call gb_Executable_set_include,transex3,\
+    -I$(SRCDIR)/l10ntools/inc \
+    -I$(SRCDIR)/l10ntools/source \
+    $$(INCLUDE) \
+))
+
+$(eval $(call gb_Executable_use_libraries,transex3,\
+    sal \
+))
+
+$(eval $(call gb_Executable_add_scanners,transex3,\
+    l10ntools/source/srclex \
+))
+
+$(eval $(call gb_Executable_use_static_libraries,transex3,\
+    transex \
+))
+
+$(eval $(call gb_Executable_add_cxxobjects,transex3,\
+    l10ntools/source/export \
+))
+
+# vim:set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/l10ntools/Executable_ulfex.mk b/l10ntools/Executable_ulfex.mk
new file mode 100644
index 0000000..df938e3
--- /dev/null
+++ b/l10ntools/Executable_ulfex.mk
@@ -0,0 +1,48 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# Major Contributor(s):
+# Copyright (C) 2012 David Ostrovsky <d.ostrovsky@gmx.de> (initial developer)
+#
+# All Rights Reserved.
+#
+# For minor contributions see the git repository.
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+
+$(eval $(call gb_Executable_Executable,ulfex))
+
+$(eval $(call gb_Executable_set_include,ulfex,\
+    -I$(SRCDIR)/l10ntools/inc \
+    -I$(SRCDIR)/l10ntools/source \
+    $$(INCLUDE) \
+))
+
+$(eval $(call gb_Executable_use_libraries,ulfex,\
+    sal \
+))
+
+$(eval $(call gb_Executable_use_static_libraries,ulfex,\
+    transex \
+))
+
+$(eval $(call gb_Executable_add_cxxobjects,ulfex,\
+    l10ntools/source/lngmerge \
+    l10ntools/source/lngex \
+))
+
+# vim:set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/l10ntools/Executable_xrmex.mk b/l10ntools/Executable_xrmex.mk
new file mode 100644
index 0000000..f5ec4b9
--- /dev/null
+++ b/l10ntools/Executable_xrmex.mk
@@ -0,0 +1,51 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# Major Contributor(s):
+# Copyright (C) 2012 David Ostrovsky <d.ostrovsky@gmx.de> (initial developer)
+#
+# All Rights Reserved.
+#
+# For minor contributions see the git repository.
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+
+$(eval $(call gb_Executable_Executable,xrmex))
+
+$(eval $(call gb_Executable_set_include,xrmex,\
+    -I$(SRCDIR)/l10ntools/inc \
+    -I$(SRCDIR)/l10ntools/source \
+    $$(INCLUDE) \
+))
+
+$(eval $(call gb_Executable_use_libraries,xrmex,\
+    sal \
+))
+
+$(eval $(call gb_Executable_add_scanners,xrmex,\
+    l10ntools/source/xrmlex \
+))
+
+$(eval $(call gb_Executable_use_static_libraries,xrmex,\
+    transex \
+))
+
+$(eval $(call gb_Executable_add_cxxobjects,xrmex,\
+    l10ntools/source/xrmmerge \
+))
+
+# vim:set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/l10ntools/Jar_FCFGMerge.mk b/l10ntools/Jar_FCFGMerge.mk
new file mode 100644
index 0000000..7719f5f
--- /dev/null
+++ b/l10ntools/Jar_FCFGMerge.mk
@@ -0,0 +1,48 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# Major Contributor(s):
+# Copyright (C) 2012 David Ostrovsky <d.ostrovsky@gmx.de> (initial developer)
+#
+# All Rights Reserved.
+#
+# For minor contributions see the git repository.
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+
+$(eval $(call gb_Jar_Jar,FCFGMerge))
+
+$(eval $(call gb_Jar_set_packageroot,FCFGMerge,com))
+
+$(eval $(call gb_Jar_set_manifest,FCFGMerge,$(SRCDIR)/l10ntools/source/filter/merge/Manifest.mf))
+
+$(eval $(call gb_Jar_add_sourcefiles,FCFGMerge,\
+       l10ntools/source/filter/merge/FCFGMerge \
+       l10ntools/source/filter/merge/Merger \
+       l10ntools/source/filter/utils/AnalyzeStartupLog \
+       l10ntools/source/filter/utils/Cache \
+       l10ntools/source/filter/utils/ConfigHelper \
+       l10ntools/source/filter/utils/FileHelper \
+       l10ntools/source/filter/utils/Logger \
+       l10ntools/source/filter/utils/MalformedCommandLineException \
+       l10ntools/source/filter/utils/XMLHelper \
+))
+
+$(eval $(call gb_Jar_add_packagefile,FCFGMerge,\
+       com/sun/star/filter/config/tools/merge/FCFGMerge.cfg,\
+       $(SRCDIR)/l10ntools/source/filter/merge/FCFGMerge.cfg \
+))
diff --git a/l10ntools/Makefile b/l10ntools/Makefile
new file mode 100644
index 0000000..ccb1c85
--- /dev/null
+++ b/l10ntools/Makefile
@@ -0,0 +1,7 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+
+module_directory:=$(dir $(realpath $(firstword $(MAKEFILE_LIST))))
+
+include $(module_directory)/../solenv/gbuild/partial_build.mk
+
+# vim: set noet sw=4 ts=4:
diff --git a/l10ntools/Module_l10ntools.mk b/l10ntools/Module_l10ntools.mk
new file mode 100644
index 0000000..0ab1ca7
--- /dev/null
+++ b/l10ntools/Module_l10ntools.mk
@@ -0,0 +1,41 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# Major Contributor(s):
+# Copyright (C) 2012 David Ostrovsky <d.ostrovsky@gmx.de> (initial developer)
+#
+# All Rights Reserved.
+#
+# For minor contributions see the git repository.
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+
+$(eval $(call gb_Module_Module,l10ntools))
+
+$(eval $(call gb_Module_add_targets,l10ntools,\
+    StaticLibrary_transex \
+    Executable_transex3 \
+    Executable_helpex \
+    Executable_ulfex \
+    Executable_gsicheck \
+    Executable_cfgex \
+    Executable_xrmex \
+    Executable_localize \
+    Jar_FCFGMerge \
+))
+
+# vim:set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/l10ntools/StaticLibrary_transex.mk b/l10ntools/StaticLibrary_transex.mk
new file mode 100644
index 0000000..e8c84b7
--- /dev/null
+++ b/l10ntools/StaticLibrary_transex.mk
@@ -0,0 +1,42 @@
+# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+#
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# Major Contributor(s):
+# Copyright (C) 2012 David Ostrovsky <d.ostrovsky@gmx.de> (initial developer)
+#
+# All Rights Reserved.
+#
+# For minor contributions see the git repository.
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+
+$(eval $(call gb_StaticLibrary_StaticLibrary,transex))
+
+$(eval $(call gb_StaticLibrary_set_include,transex,\
+    -I$(SRCDIR)/l10ntools/inc \
+    $$(INCLUDE) \
+))
+
+$(eval $(call gb_StaticLibrary_add_exception_objects,transex,\
+    l10ntools/source/export2 \
+    l10ntools/source/merge \
+    l10ntools/source/file \
+    l10ntools/source/directory \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/l10ntools/prj/dmake b/l10ntools/prj/dmake
deleted file mode 100644
index e69de29..0000000
diff --git a/l10ntools/source/cfglex.l b/l10ntools/source/cfglex.l
index a8a01ad..7ef12b7 100644
--- a/l10ntools/source/cfglex.l
+++ b/l10ntools/source/cfglex.l
@@ -3,7 +3,7 @@
  * lexer for parsing cfg source files
  *
  */
-
+#define YY_NEVER_INTERACTIVE 1
 
 /* enlarge token buffer to tokenize whole strings */
 #undef YYLMAX
@@ -25,7 +25,9 @@
 #include "sal/main.h"
 
 #if defined __GNUC__
-#pragma GCC system_header
+#pragma GCC diagnostic ignored "-Wunused-function"
+#pragma GCC diagnostic ignored "-Wunused-label"
+#pragma GCC diagnostic ignored "-Wunused-but-set-variable"
 #elif defined __SINPRO_CC
 #pragma disable_warn
 #elif defined _MSC_VER
@@ -35,9 +37,9 @@
 int yycolumn = 1;
 #define YY_USER_ACTION yycolumn += yyleng;
 
-/* external functions (C++ code, declared as extren "C" */
-extern void workOnTokenSet( int, char* );
-extern FILE * init(int, char **);
+/* external functions (C++ code, declared as extern "C" */
+extern "C" void workOnTokenSet( int, char* );
+extern "C" FILE * init(int, char **);
 
 int bText=0;
 %}
@@ -76,7 +78,7 @@ int bText=0;
 
 
 \<\!\-\-       {
-       char c1 = 0, c2 = 0, c3 = input();
+       char c1 = 0, c2 = 0, c3 = yyinput();
        char pChar[2];
        pChar[1] = 0x00;
        pChar[0] = c3;
@@ -91,7 +93,8 @@ int bText=0;
                        break;
                c1 = c2;
                c2 = c3;
-               c3 = input();
+               c3 = yyinput();
+
                pChar[0] = c3;
                workOnTokenSet( COMMEND, pChar );
        }
@@ -138,11 +141,7 @@ void YYWarning( const char *s )
 }
 
 /*****************************************************************************/
-#ifdef GCC
-void yyerror ( const char *s, ... )
-#else
 void yyerror ( const char *s )
-#endif
 /*****************************************************************************/
 {
        /* write error to stderr */
diff --git a/l10ntools/source/cfgmerge.cxx b/l10ntools/source/cfgmerge.cxx
index b8f6c19..faaa6d5 100644
--- a/l10ntools/source/cfgmerge.cxx
+++ b/l10ntools/source/cfgmerge.cxx
@@ -41,7 +41,7 @@
 #include "cfgmerge.hxx"
 #include "tokens.h"
 
-extern "C" { int yyerror(char const *); }
+void yyerror(char const *);
 
 namespace {
 
diff --git a/l10ntools/source/export.cxx b/l10ntools/source/export.cxx
index ed63e4c..3980836 100644
--- a/l10ntools/source/export.cxx
+++ b/l10ntools/source/export.cxx
@@ -41,8 +41,8 @@
 #include <iostream>
 #include <rtl/strbuf.hxx>
 
-extern "C" { int yyerror( const char * ); }
-extern "C" { int YYWarning( const char * ); }
+void yyerror( const char * );
+void YYWarning( const char * );
 
 namespace {
 
diff --git a/l10ntools/source/srclex.l b/l10ntools/source/srclex.l
index 814e236..2a77db3 100644
--- a/l10ntools/source/srclex.l
+++ b/l10ntools/source/srclex.l
@@ -4,7 +4,7 @@
  * lexer for parsing ressource source files (*.src)
  *
  */
-
+#define YY_NEVER_INTERACTIVE 1
 
 /* enlarge token buffer to tokenize whole strings */
 #undef YYLMAX
@@ -26,19 +26,21 @@
 #include "sal/main.h"
 
 #if defined __GNUC__
-#pragma GCC system_header
+#pragma GCC diagnostic ignored "-Wunused-function"
+#pragma GCC diagnostic ignored "-Wunused-label"
+#pragma GCC diagnostic ignored "-Wunused-but-set-variable"
 #elif defined __SINPRO_CC
 #pragma disable_warn
 #elif defined _MSC_VER
 #pragma warning(push, 1)
 #endif
 
-/* external functions (C++ code, declared as extren "C" */
-extern int WorkOnTokenSet( int, char* );
-extern FILE * init(int, char **);
-extern int SetError();
-extern int GetError();
-extern void Close();
+/* external functions (C++ code, declared as extern "C" */
+extern "C" int WorkOnTokenSet( int, char* );
+extern "C" FILE * init(int, char **);
+extern "C" int SetError();
+extern "C" int GetError();
+extern "C" void Close();
 
 /* forwards */
 void YYWarning();
@@ -69,7 +71,7 @@ void YYWarning();
        WorkOnTokenSet( IGNOREDTOKENS, yytext );
 }
 "/*"   {
-       char c1 = 0, c2 = input();
+       char c1 = 0,c2 = yyinput();
        char pChar[2];
        pChar[1] = 0x00;
        pChar[0] = c2;
@@ -82,7 +84,7 @@ void YYWarning();
                if ( c1 == '*' && c2 == '/' )
                        break;
                c1 = c2;
-               c2 = input();
+               c2 = yyinput();
                pChar[0] = c2;
                WorkOnTokenSet( COMMEND, pChar );
        }
@@ -216,7 +218,7 @@ int yywrap(void)
 }
 
 /*****************************************************************************/
-void YYWarning( char *s )
+void YYWarning( const char *s )
 /*****************************************************************************/
 {
        /* write warning to stderr */
@@ -224,7 +226,7 @@ void YYWarning( char *s )
 }
 
 /*****************************************************************************/
-void yyerror( char *s )
+void yyerror( const char *s )
 /*****************************************************************************/
 {
        /* write error to stderr */
diff --git a/l10ntools/source/xrmlex.l b/l10ntools/source/xrmlex.l
index 5a2170f..971b4bf 100644
--- a/l10ntools/source/xrmlex.l
+++ b/l10ntools/source/xrmlex.l
@@ -3,7 +3,7 @@
  * lexer for parsing xml-property source files (*.xml)
  *
  */
-
+#define YY_NEVER_INTERACTIVE 1
 
 /* enlarge token buffer to tokenize whole strings */
 #undef YYLMAX
@@ -25,24 +25,26 @@
 #include "sal/main.h"
 
 #if defined __GNUC__
-#pragma GCC system_header
+#pragma GCC diagnostic ignored "-Wunused-function"
+#pragma GCC diagnostic ignored "-Wunused-label"
+#pragma GCC diagnostic ignored "-Wunused-but-set-variable"
 #elif defined __SINPRO_CC
 #pragma disable_warn
 #elif defined _MSC_VER
 #pragma warning(push, 1)
 #endif
 
-/* external functions (C++ code, declared as extren "C" */
-extern int WorkOnTokenSet( int, char* );
-extern int Argument( char * );
-extern int InitXrmExport( char * , char * );
-extern int EndXrmExport();
-extern int GetError();
-extern int SetError();
-extern char *GetOutputFile( int argc, char* argv[]);
-extern FILE *GetXrmFile();
-extern int isQuiet();
-extern char* getFilename();
+/* external functions (C++ code, declared as extern "C" */
+extern "C" int WorkOnTokenSet( int, char* );
+extern "C" int Argument( char * );
+extern "C" int InitXrmExport( char * , char * );
+extern "C" int EndXrmExport();
+extern "C" int GetError();
+extern "C" int SetError();
+extern "C" char *GetOutputFile( int argc, char* argv[]);
+extern "C" FILE *GetXrmFile();
+extern "C" int isQuiet();
+extern "C" char* getFilename();
 
 /* forwards */
 void YYWarning();
@@ -131,7 +133,7 @@ int bText=0;
 
 
 "<!--" {
-       char c1 = 0, c2 = 0, c3 = input();
+       char c1 = 0, c2 = 0, c3 = yyinput();
        char pChar[2];
        pChar[1] = 0x00;
        pChar[0] = c3;
@@ -146,7 +148,7 @@ int bText=0;
                        break;
                c1 = c2;
                c2 = c3;
-               c3 = input();
+               c3 = yyinput();
                pChar[0] = c3;
                WorkOnTokenSet( COMMEND, pChar );                          
        }
@@ -179,11 +181,7 @@ void YYWarning( const char *s )
 }
 
 /*****************************************************************************/
-#ifdef GCC
-void yyerror ( const char *s, ... )
-#else
 void yyerror ( const char *s )
-#endif
 /*****************************************************************************/
 {
        /* write error to stderr */
diff --git a/l10ntools/source/xrmmerge.cxx b/l10ntools/source/xrmmerge.cxx
index 0f1e3e0..a26e866 100644
--- a/l10ntools/source/xrmmerge.cxx
+++ b/l10ntools/source/xrmmerge.cxx
@@ -42,8 +42,8 @@
 
 using namespace std;
 
-extern "C" { int yyerror( char * ); }
-extern "C" { int YYWarning( char * ); }
+void yyerror( const char * );
+void YYWarning( const char * );
 
 // defines to parse command line
 #define STATE_NON       0x0001
-- 
1.7.5.4