ODFstudio/odfstudio
2
0
Fork 0
Code Issues Packages Activity

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

Browse Source
This commit is contained in:
Norbert Thiebaud
2012-04-14 06:58:01 -05:00
parent a57b634799
commit b60bf1eb62
10 changed files with 14 additions and 158 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Repository.mk
+2 -2
View File
@@ -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 \
codemaker/Executable_cppumaker.mk
+1 -1
View File
@@ -38,7 +38,7 @@ $(eval $(call gb_Executable_use_libraries,cppumaker,\
))
$(eval $(call gb_Executable_use_static_libraries,cppumaker,\
commoncpp \
codemaker_cpp \
codemaker \
))
codemaker/Executable_javamaker.mk
+1 -1
View File
@@ -38,7 +38,7 @@ $(eval $(call gb_Executable_use_libraries,javamaker,\
))
$(eval $(call gb_Executable_use_static_libraries,javamaker,\
commonjava \
codemaker_java \
codemaker \
))
codemaker/Module_codemaker.mk
+2 -2
View File
@@ -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 \
))
codemaker/StaticLibrary_commoncpp.mk → codemaker/StaticLibrary_codemaker_cpp.mk
+3 -3
View File
@@ -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 \
))
codemaker/StaticLibrary_commonjava.mk → codemaker/StaticLibrary_codemaker_java.mk
+3 -3
View File
@@ -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 \
))
codemaker/codemaker.pmk
-49
View File
@@ -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
codemaker/inc/makefile.mk
-40
View File
@@ -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
unodevtools/Executable_skeletonmaker.mk
+2 -2
View File
@@ -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,\
unodevtools/unodevtools.pmk
-55
View File
@@ -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