summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJussi Pakkanen <jpakkane@gmail.com>2020-03-08 00:06:56 +0200
committerJussi Pakkanen <jpakkane@gmail.com>2020-03-08 03:34:42 +0200
commit42200323fb2646394642f0a07685bab2855b30bf (patch)
tree796fe4232f5ff3da72ef18432ea408affe59c865
parent1902db138275001aa456e5c47c02321396d7daa8 (diff)
Build more and fix incorrect paths in config_folders.h.
Change-Id: I9099c67abe2fb7324d0cc4828b6a427a9c0f9b6c
-rw-r--r--config_host/meson.build32
-rw-r--r--sc/meson.build2
-rw-r--r--starmath/meson.build2
-rw-r--r--vcl/meson.build22
4 files changed, 42 insertions, 16 deletions
diff --git a/config_host/meson.build b/config_host/meson.build
index becbfc01c4bd..b34a2a0f4990 100644
--- a/config_host/meson.build
+++ b/config_host/meson.build
@@ -14,21 +14,23 @@ cdata.set10('HAVE_FEATURE_UI', true)
cdata.set10('USE_SDT_PROBES', false)
-cdata.set_quoted('LIBO_BIN_FOLDER', get_option('prefix') / get_option('bindir'))
-cdata.set_quoted('LIBO_ETC_FOLDER', 'FIXME')
-cdata.set_quoted('LIBO_LIB_FOLDER', get_option('prefix') / get_option('libdir'))
-cdata.set_quoted('LIBO_SHARE_FOLDER', get_option('prefix') / get_option('datadir'))
-cdata.set_quoted('LIBO_SHARE_HELP_FOLDER', 'FIXME')
-cdata.set_quoted('LIBO_SHARE_JAVA_FOLDER', 'FIXME')
-cdata.set_quoted('LIBO_SHARE_PRESETS_FOLDER', 'FIXME')
-cdata.set_quoted('LIBO_SHARE_RESOURCE_FOLDER', 'FIXME')
-cdata.set_quoted('LIBO_SHARE_SHELL_FOLDER', 'FIXME')
-
-cdata.set_quoted('LIBO_URE_BIN_FOLDER', 'FIXME')
-cdata.set_quoted('LIBO_URE_ETC_FOLDER', 'FIXME')
-cdata.set_quoted('LIBO_URE_LIB_FOLDER', 'FIXME')
-cdata.set_quoted('LIBO_URE_MISC_FOLDER', 'FIXME')
-cdata.set_quoted('LIBO_URE_SHARE_JAVA_FOLDER', 'FIXME')
+# FIXME, these are probably wrong for distro installs.
+cdata.set_quoted('LIBO_BIN_FOLDER', get_option('bindir'))
+cdata.set_quoted('LIBO_ETC_FOLDER', get_option('bindir'))
+cdata.set_quoted('LIBO_LIB_FOLDER', get_option('libdir'))
+cdata.set_quoted('LIBO_LIBEXEC_FOLDER', get_option('libdir'))
+cdata.set_quoted('LIBO_SHARE_FOLDER', get_option('datadir'))
+cdata.set_quoted('LIBO_SHARE_HELP_FOLDER', 'help')
+cdata.set_quoted('LIBO_SHARE_JAVA_FOLDER', get_option('bindir') / 'classes')
+cdata.set_quoted('LIBO_SHARE_PRESETS_FOLDER', 'presets')
+cdata.set_quoted('LIBO_SHARE_RESOURCE_FOLDER', get_option('bindir') / 'resource')
+cdata.set_quoted('LIBO_SHARE_SHELL_FOLDER', get_option('bindir') / 'shell')
+
+cdata.set_quoted('LIBO_URE_BIN_FOLDER', get_option('bindir'))
+cdata.set_quoted('LIBO_URE_ETC_FOLDER', get_option('bindir'))
+cdata.set_quoted('LIBO_URE_LIB_FOLDER', get_option('bindir'))
+cdata.set_quoted('LIBO_URE_MISC_FOLDER', get_option('bindir'))
+cdata.set_quoted('LIBO_URE_SHARE_JAVA_FOLDER', get_option('bindir') / 'classes')
cdata.set_quoted('SRC_ROOT', meson.source_root())
cdata.set_quoted('BUILDDIR', meson.build_root())
diff --git a/sc/meson.build b/sc/meson.build
index 56185532d742..e444d4e2aae9 100644
--- a/sc/meson.build
+++ b/sc/meson.build
@@ -624,6 +624,7 @@ sc_lib = shared_library('sclo',
xo_lib,
],
dependencies: [libxml_dep, icuuc_dep, icu18_dep, broken_mdds_dep, orcus_dep],
+ gnu_symbol_visibility: 'hidden',
install: true,
)
@@ -997,5 +998,6 @@ vbaobj_lib = shared_library('vbaobjlo',
vcl_lib,
],
dependencies: [broken_mdds_dep],
+ gnu_symbol_visibility: 'hidden',
install: true,
)
diff --git a/starmath/meson.build b/starmath/meson.build
index 5a084df944dd..6fc897bfbff4 100644
--- a/starmath/meson.build
+++ b/starmath/meson.build
@@ -61,7 +61,7 @@ starmath_lib = shared_library('starmathlo',
utl_lib,
vcl_lib,
xo_lib,
-],
+ ],
dependencies: [],
gnu_symbol_visibility: 'hidden',
install: true,
diff --git a/vcl/meson.build b/vcl/meson.build
index 72e9746169ba..5f868fb598a0 100644
--- a/vcl/meson.build
+++ b/vcl/meson.build
@@ -564,3 +564,25 @@ executable('vcldemo',
install: true,
dependencies: [harfbuzz_dep, dl_dep, x11_dep],
)
+
+desktopdetector_lib = shared_library('desktopdetector',
+ 'unx/generic/desktopdetect/desktopdetector.cxx',
+ udk_fake_h, off_fake_h,
+ cpp_args: ['-DLIBO_INTERNAL_ONLY'],
+ include_directories: [main_inc, udkh_inc, offapi_inc, 'inc'],
+ link_with: [vcl_lib,
+ tl_lib,
+ utl_lib,
+ sot_lib,
+ ucbhelper_lib,
+ basegfx_lib,
+ comphelper_lib,
+ cppuhelper_lib,
+ i18nlangtag_lib,
+ i18nutil_lib,
+ cppu_lib,
+ sal_lib,
+ ],
+ dependencies: [x11_dep],
+ install: true,
+)