Sat Apr 14 04:58:07 PDT 2012

Makefile                                     |    4 -
 Repository.mk                                |   13 ++++
 RepositoryModule_ooo.mk                      |    2 
 codemaker/Executable_cppumaker.mk            |   59 +++++++++++++++++++++
 codemaker/Executable_javamaker.mk            |   52 +++++++++++++++++++
 codemaker/Makefile                           |    7 ++
 codemaker/Module_codemaker.mk                |   38 ++++++++++++++
 codemaker/Package_inc.mk                     |   41 +++++++++++++++
 codemaker/StaticLibrary_codemaker.mk         |   45 ++++++++++++++++
 codemaker/StaticLibrary_codemaker_cpp.mk     |   39 ++++++++++++++
 codemaker/StaticLibrary_codemaker_java.mk    |   39 ++++++++++++++
 codemaker/codemaker.pmk                      |   49 ------------------
 codemaker/inc/makefile.mk                    |   40 --------------
 codemaker/prj/build.lst                      |   10 ---
 codemaker/prj/d.lst                          |   14 -----
 codemaker/prj/makefile.mk                    |    1 
 codemaker/source/codemaker/makefile.mk       |   49 ------------------
 codemaker/source/commoncpp/makefile.mk       |   42 ---------------
 codemaker/source/commonjava/makefile.mk      |   42 ---------------
 codemaker/source/cppumaker/makefile.mk       |   73 ---------------------------
 codemaker/source/javamaker/makefile.mk       |   66 ------------------------
 unodevtools/Executable_skeletonmaker.mk      |   64 +++++++++++++++++++++++
 unodevtools/Makefile                         |    7 ++
 unodevtools/Module_unodevtools.mk            |   33 ++++++++++++
 unodevtools/prj/build.lst                    |    8 --
 unodevtools/prj/d.lst                        |    5 -
 unodevtools/prj/makefile.mk                  |    1 
 unodevtools/source/skeletonmaker/makefile.mk |   63 -----------------------
 unodevtools/source/unodevtools/makefile.mk   |   52 -------------------
 unodevtools/unodevtools.pmk                  |   55 --------------------
 30 files changed, 447 insertions(+), 566 deletions(-)

New commits:
commit b60bf1eb625e4d2e94543a90770cea9214352b63
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date:   Sat Apr 14 05:31:32 2012 -0500

    rename common* static libs to codemaker_* for clarity + dmake cleanup

diff --git a/Repository.mk b/Repository.mk
index bc229c9..e46f6b1 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -561,8 +561,8 @@ $(eval $(call gb_Helper_register_libraries,UNOVERLIBS, \
 $(eval $(call gb_Helper_register_static_libraries,PLAINLIBS, \
     basegfx_s \
     codemaker \
-    commoncpp \
-    commonjava \
+    codemaker_cpp \
+    codemaker_java \
     dtobj \
     headless \
     libeay32 \
diff --git a/codemaker/Executable_cppumaker.mk b/codemaker/Executable_cppumaker.mk
index f4dbdc6..69293e2 100644
--- a/codemaker/Executable_cppumaker.mk
+++ b/codemaker/Executable_cppumaker.mk
@@ -38,7 +38,7 @@ $(eval $(call gb_Executable_use_libraries,cppumaker,\
 ))
 
 $(eval $(call gb_Executable_use_static_libraries,cppumaker,\
-    commoncpp \
+    codemaker_cpp \
     codemaker \
 ))
 
diff --git a/codemaker/Executable_javamaker.mk b/codemaker/Executable_javamaker.mk
index 5633acb..cd5a1aa 100644
--- a/codemaker/Executable_javamaker.mk
+++ b/codemaker/Executable_javamaker.mk
@@ -38,7 +38,7 @@ $(eval $(call gb_Executable_use_libraries,javamaker,\
 ))
 
 $(eval $(call gb_Executable_use_static_libraries,javamaker,\
-    commonjava \
+    codemaker_java \
     codemaker \
 ))
 
diff --git a/codemaker/Module_codemaker.mk b/codemaker/Module_codemaker.mk
index 2594cc3..d2b6060 100644
--- a/codemaker/Module_codemaker.mk
+++ b/codemaker/Module_codemaker.mk
@@ -29,8 +29,8 @@ $(eval $(call gb_Module_Module,codemaker))
 $(eval $(call gb_Module_add_targets,codemaker,\
     Package_inc \
     StaticLibrary_codemaker \
-    StaticLibrary_commoncpp \
-    StaticLibrary_commonjava \
+    StaticLibrary_codemaker_cpp \
+    StaticLibrary_codemaker_java \
     Executable_javamaker \
     Executable_cppumaker \
 ))
diff --git a/codemaker/StaticLibrary_codemaker_cpp.mk b/codemaker/StaticLibrary_codemaker_cpp.mk
new file mode 100644
index 0000000..3f18114
--- /dev/null
+++ b/codemaker/StaticLibrary_codemaker_cpp.mk
@@ -0,0 +1,39 @@
+# -*- 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 at 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,codemaker_cpp))
+
+$(eval $(call gb_StaticLibrary_set_include,codemaker_cpp,\
+    -I$(SRCDIR)/codemaker/inc \
+    $$(INCLUDE) \
+))
+
+$(eval $(call gb_StaticLibrary_add_exception_objects,codemaker_cpp,\
+	codemaker/source/commoncpp/commoncpp \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/codemaker/StaticLibrary_codemaker_java.mk b/codemaker/StaticLibrary_codemaker_java.mk
new file mode 100644
index 0000000..b9e2396
--- /dev/null
+++ b/codemaker/StaticLibrary_codemaker_java.mk
@@ -0,0 +1,39 @@
+# -*- 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 at 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,codemaker_java))
+
+$(eval $(call gb_StaticLibrary_set_include,codemaker_java,\
+    -I$(SRCDIR)/codemaker/inc \
+    $$(INCLUDE) \
+))
+
+$(eval $(call gb_StaticLibrary_add_exception_objects,codemaker_java,\
+	codemaker/source/commonjava/commonjava \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/codemaker/StaticLibrary_commoncpp.mk b/codemaker/StaticLibrary_commoncpp.mk
deleted file mode 100644
index baf6b13..0000000
--- a/codemaker/StaticLibrary_commoncpp.mk
+++ /dev/null
@@ -1,39 +0,0 @@
-# -*- 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 at 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,commoncpp))
-
-$(eval $(call gb_StaticLibrary_set_include,commoncpp,\
-    -I$(SRCDIR)/codemaker/inc \
-    $$(INCLUDE) \
-))
-
-$(eval $(call gb_StaticLibrary_add_exception_objects,commoncpp,\
-	codemaker/source/commoncpp/commoncpp \
-))
-
-# vim: set noet sw=4 ts=4:
diff --git a/codemaker/StaticLibrary_commonjava.mk b/codemaker/StaticLibrary_commonjava.mk
deleted file mode 100644
index 2125f36..0000000
--- a/codemaker/StaticLibrary_commonjava.mk
+++ /dev/null
@@ -1,39 +0,0 @@
-# -*- 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 at 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,commonjava))
-
-$(eval $(call gb_StaticLibrary_set_include,commonjava,\
-    -I$(SRCDIR)/codemaker/inc \
-    $$(INCLUDE) \
-))
-
-$(eval $(call gb_StaticLibrary_add_exception_objects,commonjava,\
-	codemaker/source/commonjava/commonjava \
-))
-
-# vim: set noet sw=4 ts=4:
diff --git a/codemaker/codemaker.pmk b/codemaker/codemaker.pmk
deleted file mode 100755
index cf06407..0000000
--- a/codemaker/codemaker.pmk
+++ /dev/null
@@ -1,49 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-.IF "$(GUI)"=="WNT"
-CODEMAKERLIBDEPN=codemaker.lib
-COMMONCPPLIBDEPN=commoncpp.lib
-COMMONJAVALIBDEPN=commonjava.lib
-.IF "$(COM)"=="GCC" && "$(GUI)"=="WNT"
-CODEMAKERLIBST=-lcodemaker
-COMMONCPPLIBST=-lcommoncpp
-COMMONJAVALIBST=-lcommonjava
-.ELSE
-CODEMAKERLIBST=codemaker.lib
-COMMONCPPLIBST=commoncpp.lib
-COMMONJAVALIBST=commonjava.lib
-.ENDIF
-.ELSE
-CODEMAKERLIBDEPN=libcodemaker.a
-COMMONCPPLIBDEPN=libcommoncpp.a
-COMMONJAVALIBDEPN=libcommonjava.a
-CODEMAKERLIBST=-lcodemaker
-COMMONCPPLIBST=-lcommoncpp
-COMMONJAVALIBST=-lcommonjava
-.ENDIF
-
diff --git a/codemaker/inc/makefile.mk b/codemaker/inc/makefile.mk
deleted file mode 100644
index 8d7b0a7..0000000
--- a/codemaker/inc/makefile.mk
+++ /dev/null
@@ -1,40 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-PRJ=..
-
-PRJNAME=codemaker
-TARGET=inc
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-
-# --- Files --------------------------------------------------------
-# --- Targets -------------------------------------------------------
-
-.INCLUDE :  target.mk
-
diff --git a/unodevtools/Executable_skeletonmaker.mk b/unodevtools/Executable_skeletonmaker.mk
index ee1909a..e06a656 100644
--- a/unodevtools/Executable_skeletonmaker.mk
+++ b/unodevtools/Executable_skeletonmaker.mk
@@ -45,8 +45,8 @@ $(eval $(call gb_Executable_use_libraries,uno-skeletonmaker,\
 
 $(eval $(call gb_Executable_use_static_libraries,uno-skeletonmaker,\
     codemaker \
-    commoncpp \
-    commonjava \
+    codemaker_cpp \
+    codemaker_java \
 ))
 
 $(eval $(call gb_Executable_add_exception_objects,uno-skeletonmaker,\
diff --git a/unodevtools/unodevtools.pmk b/unodevtools/unodevtools.pmk
deleted file mode 100755
index c2d119c..0000000
--- a/unodevtools/unodevtools.pmk
+++ /dev/null
@@ -1,55 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-.IF "$(GUI)"=="WNT"
-UNODEVTOOLSLIBDEPN=unodevtools.lib
-CODEMAKERLIBDEPN=codemaker.lib
-COMMONCPPLIBDEPN=commoncpp.lib
-COMMONJAVALIBDEPN=commonjava.lib
-.IF "$(COM)"=="GCC"
-UNODEVTOOLSLIBST=-lunodevtools
-CODEMAKERLIBST=-lcodemaker
-COMMONCPPLIBST=-lcommoncpp
-COMMONJAVALIBST=-lcommonjava
-.ELSE
-UNODEVTOOLSLIBST=unodevtools.lib
-CODEMAKERLIBST=codemaker.lib
-COMMONCPPLIBST=commoncpp.lib
-COMMONJAVALIBST=commonjava.lib
-.ENDIF
-
-.ELSE
-UNODEVTOOLSLIBDEPN=libunodevtools.a
-CODEMAKERLIBDEPN=libcodemaker.a
-COMMONCPPLIBDEPN=libcommoncpp.a
-COMMONJAVALIBDEPN=libcommonjava.a
-UNODEVTOOLSLIBST=-lunodevtools
-CODEMAKERLIBST=-lcodemaker
-COMMONCPPLIBST=-lcommoncpp
-COMMONJAVALIBST=-lcommonjava
-.ENDIF
-
commit a57b6347999889bbbcf55e704ac480482fdc5497
Author: David Ostrovsky <David.Ostrovsky at gmx.de>
Date:   Fri Apr 13 22:33:35 2012 +0200

    gbuild conversion: unodevtools module

diff --git a/Makefile b/Makefile
index 498e028..79f39aa 100644
--- a/Makefile
+++ b/Makefile
@@ -124,6 +124,7 @@ ucb\
 ucbhelper\
 udkapi\
 unixODBC\
+unodevtools\
 unoil\
 unotest\
 unotools\
@@ -234,7 +235,6 @@ sysui\
 testtools\
 tomcat\
 udm\
-unodevtools\
 vigra\
 x11_extensions\
 xpdf\
diff --git a/Repository.mk b/Repository.mk
index 6821d1f..bc229c9 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -63,6 +63,7 @@ ifneq ($(OS),IOS)
 $(eval $(call gb_Helper_register_executables,SDK, \
     javamaker \
     cppumaker \
+    uno-skeletonmaker \
 ))
 
 endif
diff --git a/RepositoryModule_ooo.mk b/RepositoryModule_ooo.mk
index 1eadf41..af0900e 100644
--- a/RepositoryModule_ooo.mk
+++ b/RepositoryModule_ooo.mk
@@ -123,6 +123,7 @@ $(eval $(call gb_Module_add_moduledirs,ooo,\
     udkapi \
     unixODBC \
     UnoControls \
+    unodevtools \
     unoil \
     unotest \
     unotools \
diff --git a/unodevtools/Executable_skeletonmaker.mk b/unodevtools/Executable_skeletonmaker.mk
new file mode 100644
index 0000000..ee1909a
--- /dev/null
+++ b/unodevtools/Executable_skeletonmaker.mk
@@ -0,0 +1,64 @@
+# -*- 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 at 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,uno-skeletonmaker))
+
+$(eval $(call gb_Executable_use_api,uno-skeletonmaker,\
+    udkapi \
+))
+
+$(eval $(call gb_Executable_set_include,uno-skeletonmaker,\
+    -I$(SRCDIR)/unodevtools/inc \
+    $$(INCLUDE) \
+))
+
+$(eval $(call gb_Executable_use_libraries,uno-skeletonmaker,\
+    reg \
+    sal \
+    salhelper \
+    cppu \
+    cppuhelper \
+))
+
+$(eval $(call gb_Executable_use_static_libraries,uno-skeletonmaker,\
+    codemaker \
+    commoncpp \
+    commonjava \
+))
+
+$(eval $(call gb_Executable_add_exception_objects,uno-skeletonmaker,\
+    unodevtools/source/unodevtools/options \
+    unodevtools/source/unodevtools/typeblob \
+    unodevtools/source/unodevtools/typemanager \
+    unodevtools/source/skeletonmaker/skeletonmaker \
+    unodevtools/source/skeletonmaker/skeletoncommon \
+    unodevtools/source/skeletonmaker/javatypemaker \
+    unodevtools/source/skeletonmaker/cpptypemaker \
+    unodevtools/source/skeletonmaker/javacompskeleton \
+    unodevtools/source/skeletonmaker/cppcompskeleton \
+))
+
+# vim:set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/unodevtools/Makefile b/unodevtools/Makefile
new file mode 100644
index 0000000..ccb1c85
--- /dev/null
+++ b/unodevtools/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/unodevtools/Module_unodevtools.mk b/unodevtools/Module_unodevtools.mk
new file mode 100644
index 0000000..9819bfd
--- /dev/null
+++ b/unodevtools/Module_unodevtools.mk
@@ -0,0 +1,33 @@
+# -*- 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 at 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,unodevtools))
+
+$(eval $(call gb_Module_add_targets,unodevtools,\
+	Executable_skeletonmaker \
+))
+
+# vim:set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/unodevtools/prj/build.lst b/unodevtools/prj/build.lst
index 37f2ef3..c8aef47 100644
--- a/unodevtools/prj/build.lst
+++ b/unodevtools/prj/build.lst
@@ -1,8 +1,4 @@
 udt	unodevtools	:	DESKTOP:codemaker cppuhelper NULL
-udt	unodevtools							usr1	-	all	udt_mkout NULL
-udt	unodevtools\inc						get		-	all	udt_inc NULL
-udt	unodevtools\prj						get		-	all	udt_prj NULL
-udt	unodevtools\source\unodevtools		nmake	-	all	udt_unodevtools NULL
-udt	unodevtools\source\skeletonmaker	nmake	-	all	udt_skeletonmaker udt_unodevtools NULL
-
+udt	unodevtools						usr1	-	all	udt_mkout NULL
+udt	unodevtools\prj						nmake		-	all	udt_prj NULL
 
diff --git a/unodevtools/prj/d.lst b/unodevtools/prj/d.lst
index f4be609..e69de29 100644
--- a/unodevtools/prj/d.lst
+++ b/unodevtools/prj/d.lst
@@ -1,5 +0,0 @@
-..\%__SRC%\bin\uno-skeletonmaker.exe %_DEST%\bin\uno-skeletonmaker.exe
-..\%__SRC%\bin\uno-skeletonmaker.pdb %_DEST%\bin\uno-skeletonmaker.pdb
-
-..\%__SRC%\bin\uno-skeletonmaker %_DEST%\bin\uno-skeletonmaker
-
diff --git a/unodevtools/prj/makefile.mk b/unodevtools/prj/makefile.mk
new file mode 100644
index 0000000..0997622
--- /dev/null
+++ b/unodevtools/prj/makefile.mk
@@ -0,0 +1 @@
+.INCLUDE : gbuildbridge.mk
diff --git a/unodevtools/source/skeletonmaker/makefile.mk b/unodevtools/source/skeletonmaker/makefile.mk
deleted file mode 100644
index 0a6bfde..0000000
--- a/unodevtools/source/skeletonmaker/makefile.mk
+++ /dev/null
@@ -1,63 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ := ..$/..
-PRJNAME := unodevtools
-
-TARGET := uno-skeletonmaker
-TARGETTYPE := CUI
-LIBTARGET := NO
-
-ENABLE_EXCEPTIONS := TRUE
-
-.INCLUDE: settings.mk
-
-.IF "$(OS)" == "IOS"
-all:
-    @echo No point in build-time executables for this platform
-.ENDIF
-
-.INCLUDE : $(PRJ)$/unodevtools.pmk
-
-APP1TARGET = $(TARGET)
-APP1RPATH=SDKBIN
-
-APP1OBJS = $(OBJ)$/skeletonmaker.obj \
-    $(OBJ)$/skeletoncommon.obj \
-    $(OBJ)$/javatypemaker.obj \
-    $(OBJ)$/cpptypemaker.obj \
-    $(OBJ)$/javacompskeleton.obj \
-    $(OBJ)$/cppcompskeleton.obj
-
-APP1DEPN= $(OUT)$/lib$/$(UNODEVTOOLSLIBDEPN) $(SOLARLIBDIR)$/$(CODEMAKERLIBDEPN) \
-    $(SOLARLIBDIR)$/$(COMMONCPPLIBDEPN) $(SOLARLIBDIR)$/$(COMMONJAVALIBDEPN)
-APP1STDLIBS =  $(UNODEVTOOLSLIBST) $(REGLIB) $(SALLIB) $(SALHELPERLIB) $(CPPULIB) $(CPPUHELPERLIB) \
-    $(CODEMAKERLIBST) $(COMMONCPPLIBST) $(COMMONJAVALIBST)
-
-OBJFILES = $(APP1OBJS)
-
-.INCLUDE: target.mk
diff --git a/unodevtools/source/unodevtools/makefile.mk b/unodevtools/source/unodevtools/makefile.mk
deleted file mode 100644
index d8f0920..0000000
--- a/unodevtools/source/unodevtools/makefile.mk
+++ /dev/null
@@ -1,52 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-PRJ=..$/..
-
-PRJNAME=unodevtools
-TARGET=unodevtools
-
-
-ENABLE_EXCEPTIONS=TRUE
-
-# --- Settings -----------------------------------------------------
-.INCLUDE :  settings.mk
-
-# ------------------------------------------------------------------
-
-SLOFILES= \
-    $(SLO)$/typemanager.obj	\
-    $(SLO)$/typeblob.obj \
-    $(SLO)$/options.obj
-
-LIB1TARGET=$(LB)$/$(TARGET).lib
-LIB1ARCHIV=$(LB)$/lib$(TARGET).a
-LIB1OBJFILES=$(SLOFILES)
-
-# ------------------------------------------------------------------
-
-.INCLUDE :  target.mk
-
commit f3653d3c1e93a7e92a546b770e418b8cf5c06c54
Author: David Ostrovsky <David.Ostrovsky at gmx.de>
Date:   Sat Apr 14 00:30:19 2012 +0200

    gbuild conversion: codemaker module

diff --git a/Makefile b/Makefile
index 4b5d025..498e028 100644
--- a/Makefile
+++ b/Makefile
@@ -40,6 +40,7 @@ binaryurp\
 canvas\
 chart2\
 clucene\
+codemaker\
 comphelper\
 configmgr\
 cppcanvas\
@@ -153,7 +154,6 @@ boost\
 bridges\
 cairo\
 cli_ure\
-codemaker\
 connectivity\
 cosv\
 cppunit\
diff --git a/Repository.mk b/Repository.mk
index 52dee49..6821d1f 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -58,6 +58,15 @@ $(eval $(call gb_Helper_register_executables,SDK, \
     idlcpp \
 ))
 
+ifneq ($(OS),IOS)
+
+$(eval $(call gb_Helper_register_executables,SDK, \
+    javamaker \
+    cppumaker \
+))
+
+endif
+
 $(eval $(call gb_Helper_register_executables,OOO, \
     spadmin.bin \
 	$(if $(filter $(GUIBASE)$(ENABLE_KDE),unxTRUE), \
@@ -550,6 +559,9 @@ $(eval $(call gb_Helper_register_libraries,UNOVERLIBS, \
 
 $(eval $(call gb_Helper_register_static_libraries,PLAINLIBS, \
     basegfx_s \
+    codemaker \
+    commoncpp \
+    commonjava \
     dtobj \
     headless \
     libeay32 \
diff --git a/RepositoryModule_ooo.mk b/RepositoryModule_ooo.mk
index ea5d5ab..1eadf41 100644
--- a/RepositoryModule_ooo.mk
+++ b/RepositoryModule_ooo.mk
@@ -42,6 +42,7 @@ $(eval $(call gb_Module_add_moduledirs,ooo,\
     canvas \
     chart2 \
     clucene \
+    codemaker \
     comphelper \
     configmgr \
     cppcanvas \
diff --git a/codemaker/Executable_cppumaker.mk b/codemaker/Executable_cppumaker.mk
new file mode 100644
index 0000000..f4dbdc6
--- /dev/null
+++ b/codemaker/Executable_cppumaker.mk
@@ -0,0 +1,59 @@
+# -*- 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 at 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,cppumaker))
+
+$(eval $(call gb_Executable_set_include,cppumaker,\
+    -I$(SRCDIR)/codemaker/inc \
+    $$(INCLUDE) \
+))
+
+$(eval $(call gb_Executable_use_libraries,cppumaker,\
+    reg \
+    sal \
+    salhelper \
+))
+
+$(eval $(call gb_Executable_use_static_libraries,cppumaker,\
+    commoncpp \
+    codemaker \
+))
+
+$(eval $(call gb_Executable_add_exception_objects,cppumaker,\
+    codemaker/source/cppumaker/cppumaker \
+    codemaker/source/cppumaker/cppuoptions \
+    codemaker/source/cppumaker/cpputype \
+    codemaker/source/cppumaker/dumputils \
+    codemaker/source/cppumaker/includes \
+))
+
+ifeq ($(OS)$(COM),WNTMSC)
+$(eval $(call gb_Executable_add_cxxflags,cppumaker,\
+	-Ob0 \
+))
+endif
+
+# vim:set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/codemaker/Executable_javamaker.mk b/codemaker/Executable_javamaker.mk
new file mode 100644
index 0000000..5633acb
--- /dev/null
+++ b/codemaker/Executable_javamaker.mk
@@ -0,0 +1,52 @@
+# -*- 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 at 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,javamaker))
+
+$(eval $(call gb_Executable_set_include,javamaker,\
+    -I$(SRCDIR)/codemaker/inc \
+    $$(INCLUDE) \
+))
+
+$(eval $(call gb_Executable_use_libraries,javamaker,\
+    reg \
+    sal \
+    salhelper \
+))
+
+$(eval $(call gb_Executable_use_static_libraries,javamaker,\
+    commonjava \
+    codemaker \
+))
+
+$(eval $(call gb_Executable_add_exception_objects,javamaker,\
+    codemaker/source/javamaker/classfile \
+    codemaker/source/javamaker/javamaker \
+    codemaker/source/javamaker/javaoptions \
+    codemaker/source/javamaker/javatype \
+))
+
+# vim:set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/codemaker/Makefile b/codemaker/Makefile
new file mode 100644
index 0000000..ccb1c85
--- /dev/null
+++ b/codemaker/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/codemaker/Module_codemaker.mk b/codemaker/Module_codemaker.mk
new file mode 100644
index 0000000..2594cc3
--- /dev/null
+++ b/codemaker/Module_codemaker.mk
@@ -0,0 +1,38 @@
+# -*- 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 at 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,codemaker))
+
+$(eval $(call gb_Module_add_targets,codemaker,\
+    Package_inc \
+    StaticLibrary_codemaker \
+    StaticLibrary_commoncpp \
+    StaticLibrary_commonjava \
+    Executable_javamaker \
+    Executable_cppumaker \
+))
+
+# vim:set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/codemaker/Package_inc.mk b/codemaker/Package_inc.mk
new file mode 100644
index 0000000..1fa3c14
--- /dev/null
+++ b/codemaker/Package_inc.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 at 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_Package_Package,codemaker_inc,$(SRCDIR)/codemaker/inc))
+
+$(eval $(call gb_Package_add_file,codemaker_inc,inc/codemaker/codemaker.hxx,codemaker/codemaker.hxx))
+$(eval $(call gb_Package_add_file,codemaker_inc,inc/codemaker/commoncpp.hxx,codemaker/commoncpp.hxx))
+$(eval $(call gb_Package_add_file,codemaker_inc,inc/codemaker/commonjava.hxx,codemaker/commonjava.hxx))
+$(eval $(call gb_Package_add_file,codemaker_inc,inc/codemaker/commonjava.hxx,codemaker/commonjava.hxx))
+$(eval $(call gb_Package_add_file,codemaker_inc,inc/codemaker/dependencies.hxx,codemaker/dependencies.hxx))
+$(eval $(call gb_Package_add_file,codemaker_inc,inc/codemaker/exceptiontree.hxx,codemaker/exceptiontree.hxx))
+$(eval $(call gb_Package_add_file,codemaker_inc,inc/codemaker/generatedtypeset.hxx,codemaker/generatedtypeset.hxx))
+$(eval $(call gb_Package_add_file,codemaker_inc,inc/codemaker/global.hxx,codemaker/global.hxx))
+$(eval $(call gb_Package_add_file,codemaker_inc,inc/codemaker/options.hxx,codemaker/options.hxx))
+$(eval $(call gb_Package_add_file,codemaker_inc,inc/codemaker/typemanager.hxx,codemaker/typemanager.hxx))
+$(eval $(call gb_Package_add_file,codemaker_inc,inc/codemaker/unotype.hxx,codemaker/unotype.hxx))
+
+# vim: set noet sw=4 ts=4:
diff --git a/codemaker/StaticLibrary_codemaker.mk b/codemaker/StaticLibrary_codemaker.mk
new file mode 100644
index 0000000..ed7c094
--- /dev/null
+++ b/codemaker/StaticLibrary_codemaker.mk
@@ -0,0 +1,45 @@
+# -*- 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 at 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,codemaker))
+
+$(eval $(call gb_StaticLibrary_set_include,codemaker,\
+    -I$(SRCDIR)/codemaker/inc \
+    $$(INCLUDE) \
+))
+
+$(eval $(call gb_StaticLibrary_add_exception_objects,codemaker,\
+	codemaker/source/codemaker/dependencies \
+	codemaker/source/codemaker/exceptiontree \
+	codemaker/source/codemaker/global \
+	codemaker/source/codemaker/options \
+	codemaker/source/codemaker/typemanager \
+	codemaker/source/codemaker/unotype \
+	codemaker/source/codemaker/codemaker \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/codemaker/StaticLibrary_commoncpp.mk b/codemaker/StaticLibrary_commoncpp.mk
new file mode 100644
index 0000000..baf6b13
--- /dev/null
+++ b/codemaker/StaticLibrary_commoncpp.mk
@@ -0,0 +1,39 @@
+# -*- 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 at 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,commoncpp))
+
+$(eval $(call gb_StaticLibrary_set_include,commoncpp,\
+    -I$(SRCDIR)/codemaker/inc \
+    $$(INCLUDE) \
+))
+
+$(eval $(call gb_StaticLibrary_add_exception_objects,commoncpp,\
+	codemaker/source/commoncpp/commoncpp \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/codemaker/StaticLibrary_commonjava.mk b/codemaker/StaticLibrary_commonjava.mk
new file mode 100644
index 0000000..2125f36
--- /dev/null
+++ b/codemaker/StaticLibrary_commonjava.mk
@@ -0,0 +1,39 @@
+# -*- 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 at 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,commonjava))
+
+$(eval $(call gb_StaticLibrary_set_include,commonjava,\
+    -I$(SRCDIR)/codemaker/inc \
+    $$(INCLUDE) \
+))
+
+$(eval $(call gb_StaticLibrary_add_exception_objects,commonjava,\
+	codemaker/source/commonjava/commonjava \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/codemaker/prj/build.lst b/codemaker/prj/build.lst
index 1202fd2..085702d 100644
--- a/codemaker/prj/build.lst
+++ b/codemaker/prj/build.lst
@@ -1,9 +1,3 @@
 cm	codemaker	:	registry NULL
-cm	codemaker								usr1	-	all	cm_mkout NULL
-cm	codemaker\inc							nmake	-	all	cm_inc NULL
-cm	codemaker\prj							get		-	all	cm_prj NULL
-cm	codemaker\source\codemaker				nmake	-	all	cm_codemaker cm_inc NULL
-cm	codemaker\source\commoncpp				nmake	-	all	cm_cpp cm_inc NULL
-cm	codemaker\source\cppumaker				nmake	-	all	cm_cppumaker 	cm_codemaker cm_cpp cm_inc NULL
-cm	codemaker\source\commonjava				nmake	-	all	cm_java cm_inc NULL
-cm	codemaker\source\javamaker				nmake	-	all	cm_javamaker cm_codemaker cm_java cm_inc NULL
+cm	codemaker							usr1	-	all	cm_mkout NULL
+cm	codemaker\prj							nmake		-	all	cm_prj NULL
diff --git a/codemaker/prj/d.lst b/codemaker/prj/d.lst
index 6965d31..e69de29 100644
--- a/codemaker/prj/d.lst
+++ b/codemaker/prj/d.lst
@@ -1,14 +0,0 @@
-..\%__SRC%\bin\cppumaker.exe %_DEST%\bin\cppumaker.exe
-..\%__SRC%\bin\cppumaker.pdb %_DEST%\bin\cppumaker.pdb
-..\%__SRC%\bin\javamaker.exe %_DEST%\bin\javamaker.exe
-..\%__SRC%\bin\javamaker.pdb %_DEST%\bin\javamaker.pdb
-
-..\inc\codemaker\*.h %_DEST%\inc\codemaker\*.h
-..\inc\codemaker\*.hxx %_DEST%\inc\codemaker\*.hxx
-
-..\%__SRC%\bin\cppumaker %_DEST%\bin\cppumaker
-..\%__SRC%\bin\javamaker %_DEST%\bin\javamaker
-
-..\%__SRC%\lib\*.lib %_DEST%\lib\*.lib
-..\%__SRC%\lib\i*.lib %_DEST%\lib\i*.lib
-..\%__SRC%\lib\*.a %_DEST%\lib\*.a
diff --git a/codemaker/prj/makefile.mk b/codemaker/prj/makefile.mk
new file mode 100644
index 0000000..0997622
--- /dev/null
+++ b/codemaker/prj/makefile.mk
@@ -0,0 +1 @@
+.INCLUDE : gbuildbridge.mk
diff --git a/codemaker/source/codemaker/makefile.mk b/codemaker/source/codemaker/makefile.mk
deleted file mode 100644
index fb458fb..0000000
--- a/codemaker/source/codemaker/makefile.mk
+++ /dev/null
@@ -1,49 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ := ..$/..
-PRJNAME := codemaker
-TARGET := codemaker
-
-ENABLE_EXCEPTIONS := TRUE
-
-.INCLUDE: settings.mk
-
-SLOFILES = \
-    $(SLO)$/dependencies.obj \
-    $(SLO)$/exceptiontree.obj \
-    $(SLO)$/global.obj \
-    $(SLO)$/options.obj \
-    $(SLO)$/typemanager.obj \
-    $(SLO)$/unotype.obj \
-    $(SLO)$/codemaker.obj
-
-LIB1TARGET=$(LB)$/$(TARGET).lib
-LIB1ARCHIV=$(LB)$/lib$(TARGET).a
-LIB1OBJFILES=$(SLOFILES)
-
-.INCLUDE: target.mk
diff --git a/codemaker/source/commoncpp/makefile.mk b/codemaker/source/commoncpp/makefile.mk
deleted file mode 100644
index c6799c5..0000000
--- a/codemaker/source/commoncpp/makefile.mk
+++ /dev/null
@@ -1,42 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ := ..$/..
-PRJNAME := codemaker
-TARGET := commoncpp
-
-ENABLE_EXCEPTIONS := TRUE
-
-.INCLUDE: settings.mk
-
-SLOFILES = $(SLO)$/commoncpp.obj
-
-LIB1TARGET=$(LB)$/$(TARGET).lib
-LIB1ARCHIV=$(LB)$/lib$(TARGET).a
-LIB1OBJFILES=$(SLOFILES)
-
-.INCLUDE: target.mk
diff --git a/codemaker/source/commonjava/makefile.mk b/codemaker/source/commonjava/makefile.mk
deleted file mode 100644
index 6d108c6..0000000
--- a/codemaker/source/commonjava/makefile.mk
+++ /dev/null
@@ -1,42 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ := ..$/..
-PRJNAME := codemaker
-TARGET := commonjava
-
-ENABLE_EXCEPTIONS := TRUE
-
-.INCLUDE: settings.mk
-
-SLOFILES = $(SLO)$/commonjava.obj
-
-LIB1TARGET=$(LB)$/$(TARGET).lib
-LIB1ARCHIV=$(LB)$/lib$(TARGET).a
-LIB1OBJFILES=$(SLOFILES)
-
-.INCLUDE: target.mk
diff --git a/codemaker/source/cppumaker/makefile.mk b/codemaker/source/cppumaker/makefile.mk
deleted file mode 100644
index 6904c52..0000000
--- a/codemaker/source/cppumaker/makefile.mk
+++ /dev/null
@@ -1,73 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..
-
-PRJNAME=codemaker
-TARGET=cppumaker
-TARGETTYPE=CUI
-LIBTARGET=NO
-
-ENABLE_EXCEPTIONS=TRUE
-
-# --- Settings -----------------------------------------------------
-.INCLUDE : settings.mk
-
-.IF "$(OS)" == "IOS"
-
-all:
-# nothing
-
-.ENDIF
-
-.INCLUDE : $(PRJ)$/codemaker.pmk
-
-# --- Files --------------------------------------------------------
-
-.IF "$(GUI)"=="WNT"
-.IF "$(COM)"!="GCC"
-CFLAGSNOOPT+=-Ob0
-.ENDIF
-.ENDIF
-
-OBJFILES=   $(OBJ)$/cppumaker.obj	\
-            $(OBJ)$/cppuoptions.obj \
-            $(OBJ)$/cpputype.obj \
-            $(OBJ)$/dumputils.obj \
-            $(OBJ)$/includes.obj
-
-NOOPTFILES= \
-            $(OBJ)$/cpputype.obj
-
-APP1TARGET= $(TARGET)
-APP1RPATH=SDKBIN
-APP1OBJS=   $(OBJFILES)
-
-APP1DEPN= $(OUT)$/lib$/$(CODEMAKERLIBDEPN) $(OUT)$/lib$/$(COMMONCPPLIBDEPN)
-APP1STDLIBS= $(SALLIB) $(SALHELPERLIB) $(REGLIB) $(CODEMAKERLIBST) $(COMMONCPPLIBST)
-
-.INCLUDE :  target.mk
diff --git a/codemaker/source/javamaker/makefile.mk b/codemaker/source/javamaker/makefile.mk
deleted file mode 100644
index ac248e7..0000000
--- a/codemaker/source/javamaker/makefile.mk
+++ /dev/null
@@ -1,66 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..
-
-PRJNAME=codemaker
-TARGET=javamaker
-TARGETTYPE=CUI
-LIBTARGET=NO
-
-ENABLE_EXCEPTIONS=TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE : settings.mk
-
-.IF "$(OS)" == "IOS"
-
-all:
-# nothing
-
-.ENDIF
-
-.INCLUDE : $(PRJ)$/codemaker.pmk
-
-# --- Files --------------------------------------------------------
-
-OBJFILES = \
-    $(OBJ)$/classfile.obj \
-    $(OBJ)$/javamaker.obj \
-    $(OBJ)$/javaoptions.obj \
-    $(OBJ)$/javatype.obj
-
-APP1TARGET= $(TARGET)
-APP1RPATH=SDKBIN
-APP1OBJS = $(OBJFILES)
-
-APP1DEPN= $(OUT)$/lib$/$(CODEMAKERLIBDEPN) $(OUT)$/lib$/$(COMMONJAVALIBDEPN)
-APP1STDLIBS= $(SALLIB) $(SALHELPERLIB) $(REGLIB) $(CODEMAKERLIBST) $(COMMONJAVALIBST)
-
-.INCLUDE :  target.mk
-
