[Libreoffice-commits] .: 3 commits - cpputools/Executable_regcomp.mk cpputools/Executable_regsingleton.mk cpputools/Executable_sp2bv.mk cpputools/Executable_uno.mk cpputools/Makefile cpputools/Module_cpputools.mk cpputools/prj cpputools/source cpputools/StaticLibrary_uno.mk Makefile Repository.mk solenv/gbuild
David Tardon
dtardon at kemper.freedesktop.org
Wed Apr 11 00:11:40 PDT 2012
Makefile | 3
Repository.mk | 14 +++
cpputools/Executable_regcomp.mk | 43 +++++++++++
cpputools/Executable_regsingleton.mk | 52 +++++++++++++
cpputools/Executable_sp2bv.mk | 43 +++++++++++
cpputools/Executable_uno.mk | 48 ++++++++++++
cpputools/Makefile | 7 +
cpputools/Module_cpputools.mk | 45 +++++++++++
cpputools/StaticLibrary_uno.mk | 38 +++++++++
cpputools/prj/build.lst | 7 -
cpputools/prj/d.lst | 10 --
cpputools/prj/makefile.mk | 1
cpputools/source/registercomponent/makefile.mk | 82 ---------------------
cpputools/source/regsingleton/makefile.mk | 86 ----------------------
cpputools/source/sp2bv/makefile.mk | 56 --------------
cpputools/source/unoexe/makefile.mk | 97 -------------------------
solenv/gbuild/StaticLibrary.mk | 3
17 files changed, 297 insertions(+), 338 deletions(-)
New commits:
commit 7c489dc2ec5543c3481d0d5385f3a7a328276cff
Author: David Tardon <dtardon at redhat.com>
Date: Wed Apr 11 09:11:09 2012 +0200
re-run bootstrap after make clean
diff --git a/Makefile b/Makefile
index 709332a..865a324 100644
--- a/Makefile
+++ b/Makefile
@@ -304,6 +304,7 @@ clean: clean-host clean-build
clean-host:
rm -fr $(SRCDIR)/*/$(INPATH)
rm -fr install
+ rm -f $(WORKDIR_BOOTSTRAP)
clean-build:
ifeq ($(CROSS_COMPILING),YES)
commit 5342bc073b6dff059f9e60ad5fea6905752f0f9c
Author: David Ostrovsky <David.Ostrovsky at gmx.de>
Date: Sun Apr 1 16:07:41 2012 +0200
gbuild conversion: cpputools module
dmake stuff removed
diff --git a/Makefile b/Makefile
index e660c36..709332a 100644
--- a/Makefile
+++ b/Makefile
@@ -45,6 +45,7 @@ configmgr\
cppcanvas\
cppu\
cppuhelper\
+cpputools\
cui\
dbaccess\
desktop\
@@ -155,7 +156,6 @@ codemaker\
connectivity\
cosv\
cppunit\
-cpputools\
crashrep\
ct2n\
curl\
diff --git a/Repository.mk b/Repository.mk
index 1fe0aa3..1a3851e 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -41,10 +41,12 @@ $(eval $(call gb_Helper_register_executables,NONE, \
pdf2xml \
pdfunzip \
rdbmaker \
+ regsingleton \
rsc \
rscdep \
saxparser \
so_checksum \
+ sp2bv \
svidl \
typesconfig \
xml2cmp \
@@ -126,6 +128,15 @@ $(eval $(call gb_Helper_register_executables,OOO,\
endif
+ifneq ($(OS),IOS)
+
+$(eval $(call gb_Helper_register_executables,UREBIN,\
+ regcomp \
+ uno \
+))
+
+endif
+
ifneq ($(OS),MACOSX)
$(eval $(call gb_Helper_register_executables,UREBIN,\
@@ -547,6 +558,9 @@ $(eval $(call gb_Helper_register_static_libraries,PLAINLIBS, \
ulingu \
vclmain \
writerperfect \
+ $(if $(filter $(OS),IOS), \
+ uno \
+ ) \
$(if $(filter $(OS),WNT), \
odma_lib \
) \
diff --git a/cpputools/Executable_regcomp.mk b/cpputools/Executable_regcomp.mk
new file mode 100644
index 0000000..1c0dc12
--- /dev/null
+++ b/cpputools/Executable_regcomp.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 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,regcomp))
+
+$(eval $(call gb_Executable_use_internal_comprehensive_api,regcomp,\
+ udkapi \
+))
+
+$(eval $(call gb_Executable_use_libraries,regcomp,\
+ cppu \
+ cppuhelper \
+ sal \
+))
+
+$(eval $(call gb_Executable_add_exception_objects,regcomp,\
+ cpputools/source/registercomponent/registercomponent \
+))
+
+# vim:set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/cpputools/Executable_regsingleton.mk b/cpputools/Executable_regsingleton.mk
new file mode 100644
index 0000000..eb919da
--- /dev/null
+++ b/cpputools/Executable_regsingleton.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,regsingleton))
+
+$(eval $(call gb_Executable_use_internal_comprehensive_api,regsingleton,\
+ udkapi \
+))
+
+$(eval $(call gb_Executable_use_libraries,regsingleton,\
+ cppu \
+ cppuhelper \
+ sal \
+))
+
+$(eval $(call gb_Executable_add_exception_objects,regsingleton,\
+ cpputools/source/regsingleton/regsingleton \
+))
+
+ifneq ($(gb_DEBUGLEVEL),0)
+ifeq ($(COM),MSC)
+$(eval $(call gb_Executable_add_cxxflags,regsingleton,\
+ -Ob0 \
+))
+endif
+endif
+
+
+# vim:set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/cpputools/Executable_sp2bv.mk b/cpputools/Executable_sp2bv.mk
new file mode 100644
index 0000000..7b12f9a
--- /dev/null
+++ b/cpputools/Executable_sp2bv.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 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,sp2bv))
+
+$(eval $(call gb_Executable_use_api,sp2bv,\
+ udkapi \
+))
+
+$(eval $(call gb_Executable_use_libraries,sp2bv,\
+ cppu \
+ cppuhelper \
+ sal \
+))
+
+$(eval $(call gb_Executable_add_exception_objects,sp2bv,\
+ cpputools/source/sp2bv/sp2bv \
+))
+
+# vim:set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/cpputools/Executable_uno.mk b/cpputools/Executable_uno.mk
new file mode 100644
index 0000000..b54f18b
--- /dev/null
+++ b/cpputools/Executable_uno.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 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))
+
+$(eval $(call gb_Executable_use_internal_comprehensive_api,uno,\
+ udkapi \
+))
+
+$(eval $(call gb_Executable_use_libraries,uno,\
+ cppu \
+ cppuhelper \
+ sal \
+ salhelper \
+))
+
+$(eval $(call gb_Executable_use_externals,uno,\
+ libxml2 \
+))
+
+$(eval $(call gb_Executable_add_exception_objects,uno,\
+ cpputools/source/unoexe/unoexe \
+))
+
+# vim:set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/cpputools/Makefile b/cpputools/Makefile
new file mode 100644
index 0000000..ccb1c85
--- /dev/null
+++ b/cpputools/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/cpputools/Module_cpputools.mk b/cpputools/Module_cpputools.mk
new file mode 100644
index 0000000..17b41b3
--- /dev/null
+++ b/cpputools/Module_cpputools.mk
@@ -0,0 +1,45 @@
+# -*- 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,cpputools))
+
+$(eval $(call gb_Module_add_targets,cpputools,\
+ Executable_sp2bv \
+))
+
+ifeq ($(OS),IOS)
+$(eval $(call gb_Module_add_targets,cpputools,\
+ StaticLibrary_uno \
+))
+else
+$(eval $(call gb_Module_add_targets,cpputools,\
+ Executable_regcomp \
+ Executable_regsingleton \
+ Executable_uno \
+))
+endif
+
+# vim:set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/cpputools/StaticLibrary_uno.mk b/cpputools/StaticLibrary_uno.mk
new file mode 100644
index 0000000..fba9747
--- /dev/null
+++ b/cpputools/StaticLibrary_uno.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_StaticLibrary_StaticLibrary,uno))
+
+$(eval $(call gb_StaticLibrary_use_internal_comprehensive_api,uno,\
+ udkapi \
+))
+
+$(eval $(call gb_StaticLibrary_add_exception_objects,uno,\
+ cpputools/source/unoexe/unoexe \
+))
+
+
+# vim:set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/cpputools/prj/build.lst b/cpputools/prj/build.lst
index 72aed9e..f91c57d 100644
--- a/cpputools/prj/build.lst
+++ b/cpputools/prj/build.lst
@@ -1,7 +1,2 @@
pt cpputools : cppuhelper offapi LIBXML2:libxml2 NULL
-pt cpputools usr1 - all pt_mkout NULL
-pt cpputools\prj get - all pt_prj NULL
-pt cpputools\source\registercomponent nmake - all pt_regcomp NULL
-pt cpputools\source\regsingleton nmake - all pt_regsingleton NULL
-pt cpputools\source\unoexe nmake - all pt_unoexe NULL
-pt cpputools\source\sp2bv nmake - all pt_sp2bv NULL
+pt cpputools\prj nmake - all pt_prj NULL
diff --git a/cpputools/prj/d.lst b/cpputools/prj/d.lst
index de4f3e5..e69de29 100644
--- a/cpputools/prj/d.lst
+++ b/cpputools/prj/d.lst
@@ -1,10 +0,0 @@
-..\%__SRC%\bin\regcomp.exe %_DEST%\bin\regcomp.exe
-..\%__SRC%\bin\regcomp %_DEST%\bin\regcomp
-..\%__SRC%\bin\regcomp %_DEST%\bin\regcomp.bin
-..\%__SRC%\bin\uno.exe %_DEST%\bin\uno.exe
-..\%__SRC%\bin\uno %_DEST%\bin\uno
-..\%__SRC%\bin\uno %_DEST%\bin\uno.bin
-..\%__SRC%\bin\regsingleton.exe %_DEST%\bin\regsingleton.exe
-..\%__SRC%\bin\regsingleton %_DEST%\bin\regsingleton
-..\%__SRC%\bin\sp2bv.exe %_DEST%\bin\sp2bv.exe
-..\%__SRC%\bin\sp2bv %_DEST%\bin\sp2bv
diff --git a/cpputools/prj/makefile.mk b/cpputools/prj/makefile.mk
new file mode 100644
index 0000000..0997622
--- /dev/null
+++ b/cpputools/prj/makefile.mk
@@ -0,0 +1 @@
+.INCLUDE : gbuildbridge.mk
diff --git a/cpputools/source/registercomponent/makefile.mk b/cpputools/source/registercomponent/makefile.mk
deleted file mode 100644
index 4b25506..0000000
--- a/cpputools/source/registercomponent/makefile.mk
+++ /dev/null
@@ -1,82 +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=cpputools
-TARGET=regcomp
-LIBTARGET=NO
-
-ENABLE_EXCEPTIONS=TRUE
-
-# --- Settings -----------------------------------------------------
-.INCLUDE : settings.mk
-
-.IF "$(OS)" == "IOS"
-
-ALL:
-# nothing
-
-.ENDIF
-
-UNOUCRDEP=$(SOLARBINDIR)$/udkapi.rdb
-UNOUCRRDB=$(SOLARBINDIR)$/udkapi.rdb
-
-NO_OFFUH=TRUE
-CPPUMAKERFLAGS += -C
-
-UNOTYPES=\
- com.sun.star.uno.TypeClass \
- com.sun.star.lang.XMultiServiceFactory \
- com.sun.star.lang.XSingleServiceFactory \
- com.sun.star.lang.XMultiComponentFactory \
- com.sun.star.lang.XSingleComponentFactory \
- com.sun.star.lang.XComponent \
- com.sun.star.container.XContentEnumerationAccess \
- com.sun.star.container.XSet \
- com.sun.star.loader.CannotActivateFactoryException \
- com.sun.star.registry.XImplementationRegistration2
-
-# --- Files --------------------------------------------------------
-
-DEPOBJFILES= $(OBJ)$/registercomponent.obj
-
-APP1TARGET= $(TARGET)
-APP1OBJS=$(DEPOBJFILES)
-APP1RPATH=UREBIN
-
-APP1STDLIBS=\
- $(SALLIB) \
- $(CPPULIB) \
- $(CPPUHELPERLIB)
-
-.IF "$(GUI)"=="WNT"
-APP1STDLIBS+= \
- $(LIBCMT)
-.ENDIF
-
-
-.INCLUDE : target.mk
diff --git a/cpputools/source/regsingleton/makefile.mk b/cpputools/source/regsingleton/makefile.mk
deleted file mode 100644
index 96d629d..0000000
--- a/cpputools/source/regsingleton/makefile.mk
+++ /dev/null
@@ -1,86 +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=cpputools
-TARGET=regsingleton
-LIBTARGET=NO
-ENABLE_EXCEPTIONS=TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE : settings.mk
-
-.IF "$(OS)" == "IOS"
-
-ALL:
-# nothing
-
-.ENDIF
-
-UNOUCRDEP=$(SOLARBINDIR)$/udkapi.rdb
-UNOUCRRDB=$(SOLARBINDIR)$/udkapi.rdb
-
-NO_OFFUH=TRUE
-CPPUMAKERFLAGS+= -C
-
-UNOTYPES= \
- com.sun.star.uno.TypeClass \
- com.sun.star.uno.XAggregation \
- com.sun.star.uno.XWeak \
- com.sun.star.uno.XComponentContext \
- com.sun.star.lang.XTypeProvider \
- com.sun.star.lang.XComponent \
- com.sun.star.lang.XSingleServiceFactory \
- com.sun.star.lang.XSingleComponentFactory \
- com.sun.star.lang.XMultiServiceFactory \
- com.sun.star.lang.XMultiComponentFactory \
- com.sun.star.container.XHierarchicalNameAccess \
- com.sun.star.registry.XSimpleRegistry \
- com.sun.star.registry.XRegistryKey
-
-# --- Files --------------------------------------------------------
-
-DEPOBJFILES= \
- $(OBJ)$/regsingleton.obj
-
-APP1TARGET=$(TARGET)
-APP1OBJS=$(DEPOBJFILES)
-
-APP1STDLIBS= \
- $(SALLIB) \
- $(CPPULIB) \
- $(CPPUHELPERLIB)
-
-.IF "$(debug)" != ""
-.IF "$(COM)" == "MSC"
-CFLAGS += -Ob0
-.ENDIF
-.ENDIF
-
-.INCLUDE : target.mk
-
diff --git a/cpputools/source/sp2bv/makefile.mk b/cpputools/source/sp2bv/makefile.mk
deleted file mode 100644
index a8040a1..0000000
--- a/cpputools/source/sp2bv/makefile.mk
+++ /dev/null
@@ -1,56 +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=cpputools
-TARGET=sp2bv
-TARGETTYPE=CUI
-.IF "$(OS)" != "MACOSX"
-# hack to get stdc++ linked
-NO_DEFAULT_STL=TRUE
-.ENDIF
-LIBTARGET=NO
-ENABLE_EXCEPTIONS=true
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE : settings.mk
-
-
-# --- Files --------------------------------------------------------
-
-OBJFILES=$(OBJ)$/sp2bv.obj
-
-APP1TARGET=sp2bv
-APP1OBJS=$(OBJFILES)
-APP1STDLIBS=$(SALLIB)
-
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE : target.mk
diff --git a/cpputools/source/unoexe/makefile.mk b/cpputools/source/unoexe/makefile.mk
deleted file mode 100644
index 34cd6ac..0000000
--- a/cpputools/source/unoexe/makefile.mk
+++ /dev/null
@@ -1,97 +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=cpputools
-TARGET=uno
-.IF "$(OS)" != "IOS"
-LIBTARGET=NO
-.ENDIF
-ENABLE_EXCEPTIONS=TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE : settings.mk
-
-UNOUCRDEP=$(SOLARBINDIR)$/udkapi.rdb
-UNOUCRRDB=$(SOLARBINDIR)$/udkapi.rdb
-
-NO_OFFUH=TRUE
-CPPUMAKERFLAGS+= -C
-
-UNOTYPES= \
- com.sun.star.uno.TypeClass \
- com.sun.star.uno.XAggregation \
- com.sun.star.uno.XWeak \
- com.sun.star.uno.XComponentContext \
- com.sun.star.lang.XTypeProvider \
- com.sun.star.lang.XMain \
- com.sun.star.lang.XInitialization \
- com.sun.star.lang.XComponent \
- com.sun.star.lang.XSingleServiceFactory \
- com.sun.star.lang.XSingleComponentFactory \
- com.sun.star.lang.XMultiServiceFactory \
- com.sun.star.lang.XMultiComponentFactory \
- com.sun.star.container.XSet \
- com.sun.star.container.XHierarchicalNameAccess \
- com.sun.star.loader.XImplementationLoader \
- com.sun.star.registry.XSimpleRegistry \
- com.sun.star.registry.XRegistryKey \
- com.sun.star.connection.XAcceptor \
- com.sun.star.connection.XConnection \
- com.sun.star.bridge.XBridgeFactory \
- com.sun.star.bridge.XBridge
-
-# --- Files --------------------------------------------------------
-
-DEPOBJFILES=$(OBJ)$/unoexe.obj
-
-.IF "$(OS)" == "IOS"
-LIB1TARGET=$(LB)/$(TARGET).lib
-LIB1ARCHIV=$(LB)/lib$(TARGET).a
-LIB1OBJFILES=$(DEPOBJFILES)
-CFLAGSCXX += $(OBJCXXFLAGS)
-.ELSE
-APP1TARGET=$(TARGET)
-APP1OBJS=$(DEPOBJFILES)
-APP1RPATH=UREBIN
-.ENDIF
-
-# Include all relevant (see ure/source/README) dynamic libraries, so that C++
-# UNO components running in the uno executable have a defined environment
-# (stlport, unxlngi6 libstdc++.so.6, and wntmsci10 uwinapi.dll are already
-# included via APP1STDLIB, unxlngi6 libgcc_s.so.1 and wntmsci10 msvcr71.dll and
-# msvcp71.dll are magic---TODO):
-APP1STDLIBS= \
- $(SALLIB) \
- $(SALHELPERLIB) \
- $(CPPULIB) \
- $(CPPUHELPERLIB)\
- $(LIBXML2LIB)
-
-.INCLUDE : target.mk
-
commit 6135a5f5400e62004a225ca992c93148c523ee00
Author: David Tardon <dtardon at redhat.com>
Date: Wed Apr 11 08:22:52 2012 +0200
add use_internal_*api for StaticLibrary too
diff --git a/solenv/gbuild/StaticLibrary.mk b/solenv/gbuild/StaticLibrary.mk
index 27183c4..3bf411b 100644
--- a/solenv/gbuild/StaticLibrary.mk
+++ b/solenv/gbuild/StaticLibrary.mk
@@ -108,6 +108,9 @@ $(eval $(foreach method,\
set_library_path_flags \
add_api \
use_api \
+ use_internal_api \
+ use_internal_bootstrap_api \
+ use_internal_comprehensive_api \
use_external \
use_externals \
add_custom_headers \
More information about the Libreoffice-commits
mailing list