[Libreoffice-commits] core.git: Library_merged.mk solenv/gbuild

[Stephan Bergmann]

 Library_merged.mk  |1 +
 solenv/gbuild/extensions/pre_MergedLibsList.mk |1 -
 2 files changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 87c28ddabc5c0dcbee8f15d8d9d2e7a75750b975
Author: Stephan Bergmann 
Date:   Wed Oct 26 15:20:27 2016 +0200

i18nlangtag must presumably be dropped from Library_merged.mk

...after 475e4b477c6d7ae114c3ae51ba4872882af67a68 "Move i18nlangtag lib to
URELIB"?

Change-Id: I45c5d997ed30757157109c67f30b91c4073c6b0a

diff --git a/Library_merged.mk b/Library_merged.mk
index 8247e5a..a225b81 100644
--- a/Library_merged.mk
+++ b/Library_merged.mk
@@ -18,6 +18,7 @@ $(eval $(call gb_Library_use_library_objects,merged,\
 $(eval $(call gb_Library_use_libraries,merged,\
cppu \
cppuhelper \
+   i18nlangtag \
$(if $(ENABLE_JAVA), \
jvmaccess \
jvmfwk) \
diff --git a/solenv/gbuild/extensions/pre_MergedLibsList.mk 
b/solenv/gbuild/extensions/pre_MergedLibsList.mk
index 8c00bd3..6a985e3 100644
--- a/solenv/gbuild/extensions/pre_MergedLibsList.mk
+++ b/solenv/gbuild/extensions/pre_MergedLibsList.mk
@@ -30,7 +30,6 @@ MERGE_LIBRARY_LIST := \
fwi \
fwk \
$(call gb_Helper_optional,DESKTOP,helplinker) \
-   i18nlangtag \
i18npool \
i18nutil \
lng \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Library_merged.mk

[Christian Lohmaier]

 Library_merged.mk |2 ++
 1 file changed, 2 insertions(+)

New commits:
commit df7595a5f5871f8343e4ee3869ad153e3ae4a7f3
Author: Christian Lohmaier lohmaier+libreoff...@googlemail.com
Date:   Thu Jun 25 16:09:35 2015 +0200

tdf#91485 fix cursors not displayed on Windows with mergedlibs

Change-Id: I502d3d2490be5307364dee59c7ee36c0fb7ef55f

diff --git a/Library_merged.mk b/Library_merged.mk
index fa2f24d..2e482e8 100644
--- a/Library_merged.mk
+++ b/Library_merged.mk
@@ -36,6 +36,8 @@ $(eval $(call gb_Library_add_ldflags,merged,\
/ignore:4049 \
/ignore:4217 \
 ))
+# cursors
+$(eval $(call gb_Library_add_nativeres,merged,vcl/salsrc))
 endif
 
 ifeq ($(OS),MACOSX)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Library_merged.mk RepositoryModule_host.mk solenv/gbuild

[Matúš Kukan]

 Library_merged.mk   |   47 
 RepositoryModule_host.mk|   17 +--
 solenv/gbuild/LinkTarget.mk |   14 ++---
 3 files changed, 21 insertions(+), 57 deletions(-)

New commits:
commit b6be3d3db3ffbc4c1a4528a8dc17aa95084e12ca
Author: Matúš Kukan matus.ku...@collabora.com
Date:   Mon Dec 15 13:49:08 2014 +0100

gbuild: Do not require gb_Library_use_externals for libmerged

Instead, automatically get the externals when parsing other makefiles.
This commit fixes the build and hopefully avoids problems in future
because people didn't know they had to add externals for libmerged too.
Similar should be done for other functions like add_libs...

Change-Id: I5aea4c43f4b6838092ada81c310ef1100f241108

diff --git a/Library_merged.mk b/Library_merged.mk
index 90f30a1..8431efc 100644
--- a/Library_merged.mk
+++ b/Library_merged.mk
@@ -35,60 +35,13 @@ $(eval $(call gb_Library_use_static_libraries,merged,\
$(if $(filter unx,$(GUIBASE)),headless) \
 ))
 
-$(eval $(call gb_Library_use_externals,merged,\
-   icu_headers \
-   icui18n \
-   icuuc \
-   boost_headers \
-   boostdatetime \
-   $(call gb_Helper_optional,DESKTOP,clucene) \
-   $(call gb_Helper_optional,COLLADA2GLTF,collada2gltf) \
-   cups \
-   curl \
-   dbus \
-   expat \
-   gconf \
-   gio \
-   glew \
-   graphite \
-   $(if $(ENABLE_GTK),gtk) \
-   harfbuzz \
-   hunspell \
-   jpeg \
-   lcms2 \
-   $(call gb_Helper_optional,LIBATOMIC_OPS,libatomic_ops) \
-   libeot \
-   liblangtag \
-   libxml2 \
-   libxslt \
-   mesa_headers \
-   mythes \
-   nss3 \
-   $(call gb_Helper_optional,COLLADA2GLTF,opencollada_parser) \
-   $(call gb_Helper_optional,COLLADA2GLTF,png) \
-   telepathy \
-   zlib \
-))
-
 ifeq (ALL,$(MERGELIBS))
 $(eval $(call gb_Library_use_static_libraries,merged,\
ulingu \
 ))
-$(eval $(call gb_Library_use_externals,merged,\
-   cppunit \
-   hyphen \
-   libexslt \
-   libexttextcat \
-   $(if $(filter-out ANDROID IOS,$(OS)),openldap) \
-   $(call gb_Helper_optional,PYUNO,python) \
-))
 endif
 
 ifeq ($(GUIBASE),unx)
-$(eval $(call gb_Library_use_externals,merged,\
-   fontconfig \
-   freetype \
-))
 $(eval $(call gb_Library_add_libs,merged,\
-lX11 \
-lXext \
diff --git a/RepositoryModule_host.mk b/RepositoryModule_host.mk
index a3567c4..f6a9c6e 100644
--- a/RepositoryModule_host.mk
+++ b/RepositoryModule_host.mk
@@ -11,6 +11,16 @@
 
 $(eval $(call gb_Module_Module,libreoffice))
 
+# This makefile needs to be read first because some variables like T_LIBS
+# for libmerged are cleared there and then later we append stuff to it
+# through e.g. gb_Library_use_external for various libraries in libmerged.
+ifneq ($(MERGELIBS),)
+$(eval $(call gb_Module_add_targets,libreoffice,\
+   Library_merged \
+   $(if $(URELIBS),Library_urelibs) \
+))
+endif
+
 $(eval $(call gb_Module_add_moduledirs,libreoffice,\
accessibility \
android \
@@ -155,13 +165,6 @@ $(eval $(call gb_Module_add_moduledirs,libreoffice,\
xmlsecurity \
 ))
 
-ifneq ($(MERGELIBS),)
-$(eval $(call gb_Module_add_targets,libreoffice,\
-   Library_merged \
-   $(if $(URELIBS),Library_urelibs) \
-))
-endif
-
 # Especially when building everything with symbols, the linking of the largest
 # libraries takes enormous amounts of RAM. To prevent annoying OOM 
situations
 # etc., try to prevent linking these in parallel by adding artificial build
diff --git a/solenv/gbuild/LinkTarget.mk b/solenv/gbuild/LinkTarget.mk
index 9478130..e59b425 100644
--- a/solenv/gbuild/LinkTarget.mk
+++ b/solenv/gbuild/LinkTarget.mk
@@ -853,6 +853,10 @@ define gb_LinkTarget__is_build_tool
 $(if $(filter $(call gb_LinkTarget__get_workdir_linktargetname,$(1)),$(call 
gb_BUILD_HELPER_TOOLS)),$(true),$(false))
 endef
 
+define gb_LinkTarget__is_merged
+$(filter $(1),$(foreach lib,$(gb_MERGEDLIBS),$(call 
gb_Library_get_linktarget,$(lib
+endef
+
 # call gb_LinkTarget_use_libraries,linktarget,libs
 define gb_LinkTarget_use_libraries
 ifneq (,$$(filter-out $(gb_Library_KNOWNLIBS),$(2)))
@@ -865,7 +869,7 @@ $(call gb_LinkTarget__use_libraries,$(1),$(2),$(2),$(4))
 else
 $(call gb_LinkTarget__use_libraries,$(1),$(2),$(strip \
$(if $(filter $(gb_MERGEDLIBS),$(2)), \
-   $(if $(filter $(1),$(foreach lib,$(gb_MERGEDLIBS),$(call 
gb_Library_get_linktarget,$(lib, \
+   $(if $(call gb_LinkTarget__is_merged,$(1)), \
$(filter $(gb_MERGEDLIBS),$(2)), merged)) \
$(if $(filter $(gb_URELIBS),$(2)), \
$(if $(filter $(1),$(foreach lib,$(gb_URELIBS),$(call 
gb_Library_get_linktarget,$(lib, \
@@ -1328,11 +1332,15 @@ $(call gb_LinkTarget_get_target,$(1)) :| \
 endef
 
 # this forwards to functions that must be 

[Libreoffice-commits] core.git: Library_merged.mk solenv/gbuild

[Matúš Kukan]

 Library_merged.mk   |   65 
 solenv/gbuild/LinkTarget.mk |5 ++
 solenv/gbuild/platform/IOS_ARM_GCC.mk   |2 
 solenv/gbuild/platform/com_MSC_class.mk |2 
 solenv/gbuild/platform/macosx.mk|2 
 solenv/gbuild/platform/mingw.mk |2 
 6 files changed, 13 insertions(+), 65 deletions(-)

New commits:
commit 8cc1e7a7c3ec897129cc6318b254e8dafc682435
Author: Matúš Kukan matus.ku...@collabora.com
Date:   Mon Dec 15 14:37:44 2014 +0100

gbuild: More automagic for libmerged

Only gb_Library_use_libraries stays because I think it's a good idea to see
dependent libraries (potential candidates for merging) and hopefully the
list does not change often anyway.
This commit extends b6be3d3db3ffbc4c1a4528a8dc17aa95084e12ca

Change-Id: I2682456f53cb2e8d7ea63eae15f8979a3c828401

diff --git a/Library_merged.mk b/Library_merged.mk
index 8431efc..fa2f24d 100644
--- a/Library_merged.mk
+++ b/Library_merged.mk
@@ -30,61 +30,7 @@ $(eval $(call gb_Library_use_libraries,merged,\
$(gb_UWINAPI) \
 ))
 
-$(eval $(call gb_Library_use_static_libraries,merged,\
-   $(if $(filter LINUX,$(OS)),glxtest) \
-   $(if $(filter unx,$(GUIBASE)),headless) \
-))
-
-ifeq (ALL,$(MERGELIBS))
-$(eval $(call gb_Library_use_static_libraries,merged,\
-   ulingu \
-))
-endif
-
-ifeq ($(GUIBASE),unx)
-$(eval $(call gb_Library_add_libs,merged,\
-   -lX11 \
-   -lXext \
-   -lSM \
-   -lICE \
-))
-endif
-
-ifeq ($(OS),LINUX)
-$(eval $(call gb_Library_add_libs,merged,\
-   -lm \
-   -ldl \
-   -lGL \
-   -lGLU \
-   -lpthread \
-   -lrt \
-   -lX11 \
-))
-endif
-
 ifeq ($(OS),WNT)
-$(eval $(call gb_Library_use_system_win32_libs,merged,\
-   advapi32 \
-   gdi32 \
-   gdiplus \
-   glu32 \
-   imm32 \
-   mpr \
-   msimg32 \
-   oldnames \
-   ole32 \
-   oleaut32 \
-   opengl32 \
-   shell32 \
-   shlwapi \
-   setupapi \
-   user32 \
-   usp10 \
-   uuid \
-   version \
-   winmm \
-   winspool \
-))
 # prevent warning spamming
 $(eval $(call gb_Library_add_ldflags,merged,\
/ignore:4049 \
@@ -96,17 +42,6 @@ ifeq ($(OS),MACOSX)
 $(eval $(call gb_Library_use_libraries,merged,\
AppleRemote \
 ))
-$(eval $(call gb_Library_add_libs,merged,\
-   -lobjc \
-))
-$(eval $(call gb_Library_use_system_darwin_frameworks,merged,\
-   Carbon \
-   Cocoa \
-   CoreFoundation \
-   CoreServices \
-   OpenGL \
-   QuickTime \
-))
 endif
 
 # vim: set noet sw=4 ts=4:
diff --git a/solenv/gbuild/LinkTarget.mk b/solenv/gbuild/LinkTarget.mk
index e59b425..948f656 100644
--- a/solenv/gbuild/LinkTarget.mk
+++ b/solenv/gbuild/LinkTarget.mk
@@ -713,6 +713,8 @@ endef
 # call gb_LinkTarget_add_libs,linktarget,libs
 define gb_LinkTarget_add_libs
 $(call gb_LinkTarget_get_target,$(1)) : T_LIBS += $(2)
+$(if $(call gb_LinkTarget__is_merged,$(1)),\
+  $(call gb_LinkTarget_get_target,$(call gb_Library_get_linktarget,merged)) : 
T_LIBS += $(2))
 
 endef
 
@@ -893,6 +895,9 @@ endef
 # call gb_LinkTarget_use_static_libraries,linktarget,staticlibs
 define gb_LinkTarget_use_static_libraries
 $(call gb_LinkTarget_get_target,$(1)) : LINKED_STATIC_LIBS += $$(if 
$$(filter-out StaticLibrary,$$(TARGETTYPE)),$(2))
+$(if $(call gb_LinkTarget__is_merged,$(1)),\
+   $(call gb_LinkTarget_get_target,$(call 
gb_Library_get_linktarget,merged)) : \
+   LINKED_STATIC_LIBS += $$(if $$(filter-out 
StaticLibrary,$$(TARGETTYPE)),$(2)))
 
 ifeq ($(DISABLE_DYNLOADING),)
 $(call gb_LinkTarget_get_target,$(1)) : $(foreach lib,$(2),$(call 
gb_StaticLibrary_get_target,$(lib)))
diff --git a/solenv/gbuild/platform/IOS_ARM_GCC.mk 
b/solenv/gbuild/platform/IOS_ARM_GCC.mk
index e17df72..df1a03a 100644
--- a/solenv/gbuild/platform/IOS_ARM_GCC.mk
+++ b/solenv/gbuild/platform/IOS_ARM_GCC.mk
@@ -136,6 +136,8 @@ endef
 
 define gb_LinkTarget_use_system_darwin_frameworks
 $(call gb_LinkTarget_add_libs,$(1),$(foreach fw,$(2),-framework $(fw)))
+$(if $(call gb_LinkTarget__is_merged,$(1)),\
+  $(call gb_LinkTarget_add_libs,$(call 
gb_Library_get_linktarget,merged),$(foreach fw,$(2),-framework $(fw
 endef
 
 
diff --git a/solenv/gbuild/platform/com_MSC_class.mk 
b/solenv/gbuild/platform/com_MSC_class.mk
index 1ebd72e..7d220c5 100644
--- a/solenv/gbuild/platform/com_MSC_class.mk
+++ b/solenv/gbuild/platform/com_MSC_class.mk
@@ -198,6 +198,8 @@ endef
 
 define gb_LinkTarget_use_system_win32_libs
 $(call gb_LinkTarget_add_libs,$(1),$(foreach lib,$(2),$(call 
gb_MSVCRT_subst,$(lib)).lib))
+$(if $(call gb_LinkTarget__is_merged,$(1)),\
+   $(call gb_LinkTarget_add_libs,$(call 
gb_Library_get_linktarget,merged),$(foreach lib,$(2),$(call 
gb_MSVCRT_subst,$(lib)).lib)))
 endef
 
 # Flags common for PE executables (EXEs and DLLs) 
diff --git a/solenv/gbuild/platform/macosx.mk b/solenv/gbuild/platform/macosx.mk

[Libreoffice-commits] core.git: Library_merged.mk

[Matúš Kukan]

 Library_merged.mk |   11 +--
 1 file changed, 1 insertion(+), 10 deletions(-)

New commits:
commit bb6774a2bd894cbd1a4fb2c936de342b41c92909
Author: Matúš Kukan matus.ku...@collabora.com
Date:   Tue Dec 2 10:29:26 2014 +0100

fix typo and libmerged build

Change-Id: I76541a960d3b81d1bc44efa323c6f1349a4cb858

diff --git a/Library_merged.mk b/Library_merged.mk
index d3c5e75..90f30a1 100644
--- a/Library_merged.mk
+++ b/Library_merged.mk
@@ -30,19 +30,10 @@ $(eval $(call gb_Library_use_libraries,merged,\
$(gb_UWINAPI) \
 ))
 
-ifeq ($(OS),LINUX)
-$(eval $(call gb_Executable_use_static_libraries,gengal,\
-   glxtest \
-   $(if $(filter unx,$(GUIBASE)),headless) \
-))
-endif
-
-ifneq ($(OS),LINUX)
 $(eval $(call gb_Library_use_static_libraries,merged,\
+   $(if $(filter LINUX,$(OS)),glxtest) \
$(if $(filter unx,$(GUIBASE)),headless) \
 ))
-endif
-
 
 $(eval $(call gb_Library_use_externals,merged,\
icu_headers \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Library_merged.mk vcl/Library_vcl.mk vcl/unx

[Matúš Kukan]

 Library_merged.mk |6 ++
 vcl/Library_vcl.mk|1 +
 vcl/unx/generic/plugadapt/salplug.cxx |3 +++
 3 files changed, 10 insertions(+)

New commits:
commit 9dd152107c6a1644b180da24f01e3d5a3e309d13
Author: Matúš Kukan matus.ku...@collabora.com
Date:   Thu Jul 3 20:43:32 2014 +0200

fix libmerged: vclplug_svp is in

Change-Id: I6ab00275b36725fbb0a446c7e5eb888e034a8989

diff --git a/Library_merged.mk b/Library_merged.mk
index 4cfff2b..533acb0a 100644
--- a/Library_merged.mk
+++ b/Library_merged.mk
@@ -30,6 +30,12 @@ $(eval $(call gb_Library_use_libraries,merged,\
$(gb_UWINAPI) \
 ))
 
+ifeq ($(GUIBASE),unx)
+$(eval $(call gb_Library_use_static_libraries,merged,\
+   headless \
+))
+endif
+
 $(eval $(call gb_Library_use_externals,merged,\
icu_headers \
icui18n \
diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk
index e527508..0c980e9 100644
--- a/vcl/Library_vcl.mk
+++ b/vcl/Library_vcl.mk
@@ -48,6 +48,7 @@ $(eval $(call gb_Library_add_defs,vcl,\
-DCUI_DLL_NAME=\$(call gb_Library_get_runtime_filename,$(call 
gb_Library__get_name,cui))\ \
-DDESKTOP_DETECTOR_DLL_NAME=\$(call 
gb_Library_get_runtime_filename,$(call 
gb_Library__get_name,desktop_detector))\ \
-DTK_DLL_NAME=\$(call gb_Library_get_runtime_filename,$(call 
gb_Library__get_name,tk))\ \
+   -DVCLPLUG_SVP_DLL_NAME=\$(call gb_Library_get_runtime_filename,$(call 
gb_Library__get_name,vclplug_svp))\ \
 ))
 
 $(eval $(call gb_Library_use_sdk_api,vcl))
diff --git a/vcl/unx/generic/plugadapt/salplug.cxx 
b/vcl/unx/generic/plugadapt/salplug.cxx
index cf7ff97..40a9683 100644
--- a/vcl/unx/generic/plugadapt/salplug.cxx
+++ b/vcl/unx/generic/plugadapt/salplug.cxx
@@ -54,6 +54,9 @@ static SalInstance* tryInstance( const OUString rModuleBase, 
bool bForce = fals
 SAL_DLLPREFIX
 #endif
 vclplug_ + rModuleBase + lo SAL_DLLEXTENSION );
+// vclplug_svp is in libmerged
+if (rModuleBase == svp)
+aModule = VCLPLUG_SVP_DLL_NAME;
 
 oslModule aMod = osl_loadModuleRelative(
 reinterpret_cast oslGenericFunction ( tryInstance ), aModule.pData,
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Library_merged.mk

[Matúš Kukan]

 Library_merged.mk |3 +++
 1 file changed, 3 insertions(+)

New commits:
commit 12ddc6d01bfae7cede15feac8e1fd60d59843a41
Author: Matúš Kukan matus.ku...@collabora.com
Date:   Tue May 13 17:17:38 2014 +0200

add externals for libmerged too

Change-Id: I6801745e25d31e951ed9d0dcf1e2d93aa55905e4

diff --git a/Library_merged.mk b/Library_merged.mk
index ecc72ab..4cfff2b 100644
--- a/Library_merged.mk
+++ b/Library_merged.mk
@@ -37,6 +37,7 @@ $(eval $(call gb_Library_use_externals,merged,\
boost_headers \
boostdatetime \
$(call gb_Helper_optional,DESKTOP,clucene) \
+   $(call gb_Helper_optional,COLLADA2GLTF,collada2gltf) \
cups \
curl \
dbus \
@@ -58,6 +59,8 @@ $(eval $(call gb_Library_use_externals,merged,\
mesa_headers \
mythes \
nss3 \
+   $(call gb_Helper_optional,COLLADA2GLTF,opencollada_parser) \
+   $(call gb_Helper_optional,COLLADA2GLTF,png) \
telepathy \
zlib \
 ))
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Library_merged.mk

[Bjoern Michaelsen]

 Library_merged.mk |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 4261ccb307e38a96f52e2ed0dd8e7c372bc97556
Author: Bjoern Michaelsen bjoern.michael...@canonical.com
Date:   Thu Jan 2 17:07:05 2014 +0100

merged library needs to include eot

Change-Id: I96a4b4037055f00e7fed9976ca57a897b4a07226

diff --git a/Library_merged.mk b/Library_merged.mk
index 3490a8a..f2df397 100644
--- a/Library_merged.mk
+++ b/Library_merged.mk
@@ -48,6 +48,7 @@ $(eval $(call gb_Library_use_externals,merged,\
jpeg \
lcms2 \
$(call gb_Helper_optional,LIBATOMIC_OPS,libatomic_ops) \
+   libeot \
liblangtag \
libxml2 \
libxslt \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Library_merged.mk

[Andrzej J . R . Hunt]

 Library_merged.mk |1 -
 1 file changed, 1 deletion(-)

New commits:
commit 8c9f41f2e6600296e3663c681b3902d2a4d7bbd6
Author: Andrzej J.R. Hunt andr...@ahunt.org
Date:   Tue Jul 16 17:28:09 2013 +0100

libfbfembed shouldn't be part of libmerged.

Change-Id: I262b62eb33896c7912685cf3bc78e15b80ce2102

diff --git a/Library_merged.mk b/Library_merged.mk
index 7f605ab..26dbb5c 100644
--- a/Library_merged.mk
+++ b/Library_merged.mk
@@ -48,7 +48,6 @@ $(eval $(call gb_Library_use_externals,merged,\
jpeg \
lcms2 \
$(call gb_Helper_optional,LIBATOMIC_OPS,libatomic_ops) \
-   $(call gb_Helper_optional,FIREBIRD,libfbembed) \
liblangtag \
libxml2 \
libxslt \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Library_merged.mk

[Matúš Kukan]

 Library_merged.mk |1 +
 1 file changed, 1 insertion(+)

New commits:
commit e146578775668194e5331ecd067185ff9ad456bb
Author: Matúš Kukan matus.ku...@gmail.com
Date:   Thu May 23 12:18:55 2013 +0200

libmerged needs -lrt too

since 9830fd36dbdb72c79703b0c61efc027fba793c5a

Change-Id: I2cf7e59676d36fb0fe1a1ea4b70fa96d2a9ba976

diff --git a/Library_merged.mk b/Library_merged.mk
index 959db0e..6e404df 100644
--- a/Library_merged.mk
+++ b/Library_merged.mk
@@ -90,6 +90,7 @@ $(eval $(call gb_Library_add_libs,merged,\
-lm \
-ldl \
-lpthread \
+   -lrt \
 ))
 endif
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Library_merged.mk vcl/Library_vcl.mk

[Matúš Kukan]

 Library_merged.mk  |1 +
 vcl/Library_vcl.mk |   14 ++
 2 files changed, 3 insertions(+), 12 deletions(-)

New commits:
commit 88b325aac5750561e76c6f5a4099b846af1a195b
Author: Matúš Kukan matus.ku...@gmail.com
Date:   Tue Apr 23 16:15:41 2013 +0200

libmerged: add harfbuzz external

Change-Id: I7be27b049c4a482be256544c295a7aee89f81f57

diff --git a/Library_merged.mk b/Library_merged.mk
index c540e59..2d5ef60 100644
--- a/Library_merged.mk
+++ b/Library_merged.mk
@@ -54,6 +54,7 @@ $(eval $(call gb_Library_use_externals,merged,\
gio \
graphite \
$(if $(ENABLE_GTK),gtk) \
+   harfbuzz \
hunspell \
icui18n \
icule \
diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk
index 8247438..f1de72b 100644
--- a/vcl/Library_vcl.mk
+++ b/vcl/Library_vcl.mk
@@ -98,24 +98,14 @@ endif
 
 $(eval $(call gb_Library_use_externals,vcl,\
boost_headers \
+   gio \
+   harfbuzz \
icule \
icuuc \
icu_headers \
lcms2 \
 ))
 
-ifneq ($(ENABLE_GIO),)
-$(eval $(call gb_Library_use_externals,vcl,\
-   gio \
-))
-endif
-
-ifeq ($(ENABLE_HARFBUZZ),TRUE)
-$(eval $(call gb_Library_use_externals,vcl,\
-   harfbuzz \
-))
-endif
-
 $(eval $(call gb_Library_add_exception_objects,vcl,\
 vcl/source/app/brand \
 vcl/source/app/dbggui \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Library_merged.mk

[Matúš Kukan]

 Library_merged.mk |   11 ---
 1 file changed, 8 insertions(+), 3 deletions(-)

New commits:
commit 645f327ec4009eddac512958bc022a8d668a762c
Author: Matúš Kukan matus.ku...@gmail.com
Date:   Mon Apr 15 10:06:30 2013 +0200

libmerged: fix linking against cppunit again

Fix for: ./program/soffice.bin: error while loading shared libraries:
libcppunit-1.13.so.0: cannot open shared object file: No such file or
directory

Change-Id: Ib73010f69c7fcab0e5759df9e77e0848aa80579f

diff --git a/Library_merged.mk b/Library_merged.mk
index 044df38..43c6489 100644
--- a/Library_merged.mk
+++ b/Library_merged.mk
@@ -46,7 +46,6 @@ $(eval $(call gb_Library_use_libraries,merged,\
 $(eval $(call gb_Library_use_externals,merged,\
boostdatetime \
$(call gb_Helper_optional,DESKTOP,clucene) \
-   cppunit \
cups \
curl \
expat \
@@ -58,14 +57,20 @@ $(eval $(call gb_Library_use_externals,merged,\
lcms2 \
libxml2 \
libxslt \
-   libexslt \
$(if $(filter-out IOS,$(OS)),lpsolve) \
mythes \
nss3 \
-   $(call gb_Helper_optional,PYUNO,python) \
zlib \
 ))
 
+ifeq (ALL,$(MERGELIBS))
+$(eval $(call gb_Library_use_externals,merged,\
+   cppunit \
+   libexslt \
+   $(call gb_Helper_optional,PYUNO,python) \
+))
+endif
+
 ifeq ($(ENABLE_GRAPHITE),TRUE)
 $(eval $(call gb_Library_use_externals,merged,\
graphite \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Library_merged.mk Repository.mk scp2/source solenv/gbuild

[Matúš Kukan]

 Library_merged.mk  |   56 +++--
 Repository.mk  |6 +-
 scp2/source/ooo/file_library_ooo.scp   |   15 --
 scp2/source/ooo/module_hidden_ooo.scp  |3 -
 solenv/gbuild/extensions/pre_MergedLibsList.mk |4 +
 5 files changed, 14 insertions(+), 70 deletions(-)

New commits:
commit 3df1af355d8aa133cd983f15b17c740a1e9a85f7
Author: Matúš Kukan matus.ku...@gmail.com
Date:   Wed Apr 10 13:32:44 2013 +0200

libmerged: add more libraries and cleanup

Change-Id: I68c6f4d4bae3ae495dd2033c95f47a34a4aba560

diff --git a/Library_merged.mk b/Library_merged.mk
index 43c6489..e7a407d 100644
--- a/Library_merged.mk
+++ b/Library_merged.mk
@@ -48,18 +48,25 @@ $(eval $(call gb_Library_use_externals,merged,\
$(call gb_Helper_optional,DESKTOP,clucene) \
cups \
curl \
+   dbus \
expat \
+   gconf \
+   gio \
+   graphite \
+   $(if $(ENABLE_GTK),gtk) \
hunspell \
icui18n \
icule \
icuuc \
jpeg \
lcms2 \
+   liblangtag \
libxml2 \
libxslt \
$(if $(filter-out IOS,$(OS)),lpsolve) \
mythes \
nss3 \
+   telepathy \
zlib \
 ))
 
@@ -71,12 +78,6 @@ $(eval $(call gb_Library_use_externals,merged,\
 ))
 endif
 
-ifeq ($(ENABLE_GRAPHITE),TRUE)
-$(eval $(call gb_Library_use_externals,merged,\
-   graphite \
-))
-endif
-
 ifeq ($(GUIBASE),unx)
 $(eval $(call gb_Library_use_externals,merged,\
fontconfig \
@@ -140,47 +141,4 @@ $(eval $(call 
gb_Library_use_system_darwin_frameworks,merged,\
 ))
 endif
 
-ifeq ($(OS),ANDROID)
-$(eval $(call gb_Library_use_libraries,merged,\
-   libotouch \
-))
-
-$(eval $(call gb_Library_add_libs,merged,\
-   -llog \
-   -landroid \
-   -llo-bootstrap \
-))
-
-$(eval $(call gb_Library_use_externals,merged,\
-   fontconfig \
-   freetype \
-))
-endif
-
-ifeq ($(OS),IOS)
-$(eval $(call gb_Library_use_system_darwin_frameworks,merged,\
-   CoreFoundation \
-   UIKit \
-))
-endif
-
-ifeq ($(ENABLE_TELEPATHY),TRUE)
-$(eval $(call gb_Library_use_externals,merged,\
-   gtk \
-   telepathy \
-))
-endif
-
-ifeq ($(ENABLE_DBUS),TRUE)
-$(eval $(call gb_Library_use_externals,merged,\
-   dbus \
-))
-endif
-
-ifeq ($(ENABLE_LIBLANGTAG),YES)
-$(eval $(call gb_Library_use_externals,merged,\
-   liblangtag \
-))
-endif
-
 # vim: set noet sw=4 ts=4:
diff --git a/Repository.mk b/Repository.mk
index 4bd7c68..4b2c1f0 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -445,8 +445,10 @@ $(eval $(call gb_Helper_register_libraries,PLAINLIBS_URE, \
 ))
 
 $(eval $(call gb_Helper_register_libraries_for_install,PLAINLIBS_OOO,OOO, \
+   deployment \
fileacc \
i18nutil \
+   mcnttype \
package2 \
sofficeapp \
ucb1 \
@@ -461,7 +463,6 @@ $(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \
 cached1 \
 collator_data \
 dbpool2 \
-deployment \
 deploymentgui \
 dict_ja \
 dict_zh \
@@ -477,7 +478,6 @@ $(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \
 localedata_others \
 macab1 \
 macabdrv1 \
-mcnttype \
 mozbootstrap \
 officebean \
 pyuno \
@@ -569,6 +569,7 @@ $(eval $(call 
gb_Helper_register_libraries_for_install,UNOLIBS_OOO,OOO, \
fsstorage \
i18npool \
localebe1 \
+   ucpexpand1 \
 ))
 $(eval $(call gb_Helper_register_libraries,UNOLIBS_OOO, \
 PresenterScreen \
@@ -607,7 +608,6 @@ $(eval $(call gb_Helper_register_libraries,UNOLIBS_OOO, \
 syssh \
 tdebe1 \
 ucpcmis1 \
-ucpexpand1 \
 ucpext \
 ucpgio1 \
 ucpgvfs1 \
diff --git a/scp2/source/ooo/file_library_ooo.scp 
b/scp2/source/ooo/file_library_ooo.scp
index 8602c2b..b929801 100644
--- a/scp2/source/ooo/file_library_ooo.scp
+++ b/scp2/source/ooo/file_library_ooo.scp
@@ -712,17 +712,6 @@ File gid_File_Lib_Localedata_Others
 Styles = (PACKED);
 End
 
-File gid_File_Lib_Mcnttype
-LIB_FILE_BODY;
-Styles = (PACKED);
-Dir = SCP2_OOO_BIN_DIR;
-  #ifdef UNX
-Name = STRING(CONCAT2(libmcnttype,UNXSUFFIX));
-  #else
-Name = mcnttype.dll;
-  #endif
-End
-
 #if defined(WNT)
 
 #if defined WITH_MOZAB4WIN
@@ -791,8 +780,6 @@ STD_LIB_FILE( gid_File_Lib_Log, log)
 
 STD_LIB_FILE( gid_File_Lib_Pdffilter, pdffilter)
 
-SPECIAL_LIB_FILE(gid_File_Lib_Deployment,deployment)
-
 SPECIAL_LIB_FILE(gid_File_Lib_DeploymentGui,deploymentgui)
 
 #if defined ENABLE_NPAPI_FROM_BROWSER
@@ -1132,8 +1119,6 @@ SPECIAL_COMPONENT_LIB_FILE(gid_File_Ucptdoc1, 
ucptdoc1.uno)
 
 SPECIAL_COMPONENT_LIB_FILE(gid_File_Ucpext, ucpext.uno)
 
-SPECIAL_COMPONENT_LIB_FILE(gid_File_Ucpexpand1, ucpexpand1.uno)
-
 SPECIAL_COMPONENT_LIB_FILE(gid_File_Ucpcmis, ucpcmis1.uno)
 
 File gid_File_Lib_Lnth
diff --git a/scp2/source/ooo/module_hidden_ooo.scp 
b/scp2/source/ooo/module_hidden_ooo.scp
index