diff options
| author | Norbert Thiebaud <nthiebaud@gmail.com> | 2012-04-14 05:31:32 -0500 |
|---|---|---|
| committer | Norbert Thiebaud <nthiebaud@gmail.com> | 2012-04-14 06:58:01 -0500 |
| commit | b60bf1eb625e4d2e94543a90770cea9214352b63 (patch) | |
| tree | 82721345c0c93f7e5de64e81133719aff0fe51d7 /unodevtools | |
| parent | a57b6347999889bbbcf55e704ac480482fdc5497 (diff) | |
rename common* static libs to codemaker_* for clarity + dmake cleanup
Diffstat (limited to 'unodevtools')
| -rw-r--r-- | unodevtools/Executable_skeletonmaker.mk | 4 | ||||
| -rwxr-xr-x | unodevtools/unodevtools.pmk | 55 |
2 files changed, 2 insertions, 57 deletions
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 - |