10 files changed, 14 insertions, 158 deletions
diff --git a/Repository.mk b/Repository.mk
index bc229c9607d6..e46f6b192ce2 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 f4dbdc6c717a..69293e2c424b 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 5633acbf463f..cd5a1aaf67ce 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 2594cc3b5352..d2b60600465a 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_commoncpp.mk b/codemaker/StaticLibrary_codemaker_cpp.mk
index baf6b13306de..3f1811434e44 100644
--- a/codemaker/StaticLibrary_commoncpp.mk
+++ b/codemaker/StaticLibrary_codemaker_cpp.mk
@@ -25,14 +25,14 @@
 # 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_StaticLibrary,codemaker_cpp))
 
-$(eval $(call gb_StaticLibrary_set_include,commoncpp,\
+$(eval $(call gb_StaticLibrary_set_include,codemaker_cpp,\
     -I$(SRCDIR)/codemaker/inc \
     $$(INCLUDE) \
 ))
 
-$(eval $(call gb_StaticLibrary_add_exception_objects,commoncpp,\
+$(eval $(call gb_StaticLibrary_add_exception_objects,codemaker_cpp,\
 	codemaker/source/commoncpp/commoncpp \
 ))
 
diff --git a/codemaker/StaticLibrary_commonjava.mk b/codemaker/StaticLibrary_codemaker_java.mk
index 2125f36f5e6c..b9e23969dba1 100644
--- a/codemaker/StaticLibrary_commonjava.mk
+++ b/codemaker/StaticLibrary_codemaker_java.mk
@@ -25,14 +25,14 @@
 # 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_StaticLibrary,codemaker_java))
 
-$(eval $(call gb_StaticLibrary_set_include,commonjava,\
+$(eval $(call gb_StaticLibrary_set_include,codemaker_java,\
     -I$(SRCDIR)/codemaker/inc \
     $$(INCLUDE) \
 ))
 
-$(eval $(call gb_StaticLibrary_add_exception_objects,commonjava,\
+$(eval $(call gb_StaticLibrary_add_exception_objects,codemaker_java,\
 	codemaker/source/commonjava/commonjava \
 ))
 
diff --git a/codemaker/codemaker.pmk b/codemaker/codemaker.pmk
deleted file mode 100755
index cf06407ea8d8..000000000000
--- 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 8d7b0a7af7cd..000000000000
--- 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 ee1909a349e4..e06a656aa6fa 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 c2d119c205c7..000000000000
--- 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
-