Kaydet (Commit) 9a1b2970 authored tarafından Andrzej Hunt's avatar Andrzej Hunt Kaydeden (comit) Michael Meeks

Move liblibreoffice into LibreOfficeKit.

Change-Id: Ib2754a77be470faaa6f9b27644a1d8dd082ed2b8
üst bb761be4
...@@ -69,6 +69,7 @@ $(eval $(call gb_Module_add_moduledirs,libreoffice,\ ...@@ -69,6 +69,7 @@ $(eval $(call gb_Module_add_moduledirs,libreoffice,\
jvmaccess \ jvmaccess \
jvmfwk \ jvmfwk \
librelogo \ librelogo \
libreofficekit \
lingucomponent \ lingucomponent \
linguistic \ linguistic \
lotuswordpro \ lotuswordpro \
......
...@@ -29,12 +29,6 @@ $(eval $(call gb_Module_add_l10n_targets,desktop,\ ...@@ -29,12 +29,6 @@ $(eval $(call gb_Module_add_l10n_targets,desktop,\
UIConfig_deployment \ UIConfig_deployment \
)) ))
ifeq ($(OS),LINUX)
$(eval $(call gb_Module_add_targets,desktop,\
Library_libreoffice \
))
endif
ifneq (,$(filter DESKTOP,$(BUILD_TYPE))) ifneq (,$(filter DESKTOP,$(BUILD_TYPE)))
$(eval $(call gb_Module_add_targets,desktop,\ $(eval $(call gb_Module_add_targets,desktop,\
Executable_soffice_bin \ Executable_soffice_bin \
......
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
#include <string.h> #include <string.h>
#include <stdlib.h> #include <stdlib.h>
#include "liblibreoffice.h" #include <LibreOfficeKit/LibreOfficeKit.h>
#include <tools/errinf.hxx> #include <tools/errinf.hxx>
#include <osl/file.hxx> #include <osl/file.hxx>
......
...@@ -7,8 +7,8 @@ ...@@ -7,8 +7,8 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/. * file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/ */
#ifndef INCLUDED_DESKTOP_INC_LIBLIBREOFFICE_H #ifndef INCLUDED_DESKTOP_INC_LIBREOFFICEKIT_H
#define INCLUDED_DESKTOP_INC_LIBLIBREOFFICE_H #define INCLUDED_DESKTOP_INC_LIBREOFFICEKIT_H
#ifdef __cplusplus #ifdef __cplusplus
extern "C" extern "C"
......
...@@ -7,10 +7,10 @@ ...@@ -7,10 +7,10 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/. * file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/ */
#ifndef INCLUDED_DESKTOP_INC_LIBLIBREOFFICE_HXX #ifndef INCLUDED_DESKTOP_INC_LIBREOFFICEKIT_HXX
#define INCLUDED_DESKTOP_INC_LIBLIBREOFFICE_HXX #define INCLUDED_DESKTOP_INC_LIBREOFFICEKIT_HXX
#include "liblibreoffice.h" #include "LibreOfficeKit.h"
/* /*
* The reasons this C++ code is not as pretty as it could be are: * The reasons this C++ code is not as pretty as it could be are:
......
...@@ -7,26 +7,25 @@ ...@@ -7,26 +7,25 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/. # file, You can obtain one at http://mozilla.org/MPL/2.0/.
# #
$(eval $(call gb_StaticLibrary_StaticLibrary,libreoffice)) $(eval $(call gb_StaticLibrary_StaticLibrary,libreofficekit))
$(eval $(call gb_StaticLibrary_set_include,libreoffice,\ $(eval $(call gb_StaticLibrary_set_include,libreofficekit,\
$$(INCLUDE) \ $$(INCLUDE) \
-I$(SRCDIR)/desktop/inc \
)) ))
$(eval $(call gb_StaticLibrary_add_libs,libreoffice,\ $(eval $(call gb_StaticLibrary_add_libs,libreofficekit,\
$(if $(filter $(OS),LINUX), \ $(if $(filter $(OS),LINUX), \
-ldl \ -ldl \
-lpthread \ -lpthread \
) \ ) \
)) ))
$(eval $(call gb_StaticLibrary_use_libraries,libreoffice,\ $(eval $(call gb_StaticLibrary_use_libraries,libreofficekit,\
$(gb_UWINAPI) \ $(gb_UWINAPI) \
)) ))
$(eval $(call gb_StaticLibrary_add_cobjects,libreoffice,\ $(eval $(call gb_StaticLibrary_add_cobjects,libreofficekit,\
desktop/source/lib/shim \ libreofficekit/source/shim \
)) ))
# vim: set noet sw=4 ts=4: # vim: set noet sw=4 ts=4:
# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
#
# This file is part of the LibreOffice project.
#
# This Source Code Form is subject to the terms of the Mozilla Public
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
#
module_directory:=$(dir $(realpath $(firstword $(MAKEFILE_LIST))))
include $(module_directory)/../solenv/gbuild/partial_build.mk
# vim: set noet sw=4 ts=4:
# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
#
# This file is part of the LibreOffice project.
#
# This Source Code Form is subject to the terms of the Mozilla Public
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
#
$(eval $(call gb_Module_Module,libreofficekit))
ifeq ($(OS),LINUX)
$(eval $(call gb_Module_add_targets,libreofficekit,\
Library_libreofficekit \
))
endif
# vim: set ts=4 sw=4 et:
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
#include <osl/module.h> #include <osl/module.h>
#include <sal/types.h> #include <sal/types.h>
#include <liblibreoffice.h> #include <LibreOfficeKit/LibreOfficeKit.h>
#include <dlfcn.h> #include <dlfcn.h>
#ifdef AIX #ifdef AIX
......
...@@ -11,7 +11,6 @@ $(eval $(call gb_Executable_Executable,libtest)) ...@@ -11,7 +11,6 @@ $(eval $(call gb_Executable_Executable,libtest))
$(eval $(call gb_Executable_set_include,libtest,\ $(eval $(call gb_Executable_set_include,libtest,\
$$(INCLUDE) \ $$(INCLUDE) \
-I$(SRCDIR)/desktop/inc \
)) ))
$(eval $(call gb_Executable_use_libraries,libtest,\ $(eval $(call gb_Executable_use_libraries,libtest,\
...@@ -19,7 +18,7 @@ $(eval $(call gb_Executable_use_libraries,libtest,\ ...@@ -19,7 +18,7 @@ $(eval $(call gb_Executable_use_libraries,libtest,\
)) ))
$(eval $(call gb_Executable_use_static_libraries,libtest,\ $(eval $(call gb_Executable_use_static_libraries,libtest,\
libreoffice \ libreofficekit \
)) ))
$(eval $(call gb_Executable_add_libs,libtest,\ $(eval $(call gb_Executable_add_libs,libtest,\
......
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
#include <assert.h> #include <assert.h>
#include <math.h> #include <math.h>
#include <sys/time.h> #include <sys/time.h>
#include <liblibreoffice.hxx> #include <LibreOfficeKit/LibreOfficeKit.hxx>
long getTimeMS() long getTimeMS()
{ {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment