Author: damjan
Date: Sun Mar 13 16:18:36 2016
New Revision: 1734824
URL: http://svn.apache.org/viewvc?rev=1734824&view=rev
Log:
Merge from branches/gbuild:
* r1409564: gnumake4: #i117610#: move graphite to RepositoryExternal.mk
* r1409565: gnumake4: #i117610#: move icule to RepositoryExternal.mk
BUILDS
Modified:
openoffice/branches/gbuild-reintegration/ (props changed)
openoffice/branches/gbuild-reintegration/main/Repository.mk
openoffice/branches/gbuild-reintegration/main/RepositoryExternal.mk
openoffice/branches/gbuild-reintegration/main/vcl/Library_desktop_detector.mk
openoffice/branches/gbuild-reintegration/main/vcl/Library_vcl.mk
openoffice/branches/gbuild-reintegration/main/vcl/Library_vclplug_gen.mk
openoffice/branches/gbuild-reintegration/main/vcl/Library_vclplug_gtk.mk
openoffice/branches/gbuild-reintegration/main/vcl/Library_vclplug_kde.mk
openoffice/branches/gbuild-reintegration/main/vcl/Library_vclplug_kde4.mk
openoffice/branches/gbuild-reintegration/main/vcl/Library_vclplug_svp.mk
Propchange: openoffice/branches/gbuild-reintegration/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Mar 13 16:18:36 2016
@@ -1,4 +1,4 @@
-/incubator/ooo/branches/gbuild:1409313-1409563
+/incubator/ooo/branches/gbuild:1409313-1409565
/openoffice/branches/AOO400:1503684
/openoffice/branches/AOO410:1572480,1573601,1583349,1583635,1583666
/openoffice/branches/alg_writerframes:1556289-1579189
Modified: openoffice/branches/gbuild-reintegration/main/Repository.mk
URL:
http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/Repository.mk?rev=1734824&r1=1734823&r2=1734824&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/Repository.mk (original)
+++ openoffice/branches/gbuild-reintegration/main/Repository.mk Sun Mar 13
16:18:36 2016
@@ -103,7 +103,6 @@ $(eval $(call gb_Helper_register_librari
))
$(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \
- icule \
))
@@ -155,7 +154,6 @@ $(eval $(call gb_Helper_register_static_
basegfx_s \
ooopathutils \
salcpprt \
- graphite \
vclmain \
))
Modified: openoffice/branches/gbuild-reintegration/main/RepositoryExternal.mk
URL:
http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/RepositoryExternal.mk?rev=1734824&r1=1734823&r2=1734824&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/RepositoryExternal.mk
(original)
+++ openoffice/branches/gbuild-reintegration/main/RepositoryExternal.mk Sun Mar
13 16:18:36 2016
@@ -264,8 +264,41 @@ endef
endif # SYSTEM_CAIRO
+ifeq ($(SYSTEM_GRAPHITE),YES)
+
+#check for building with stlport, but graphite was not built with stlport
+define gb_LinkTarget__use_graphite
+ifneq ($(USE_SYSTEM_STL),YES)
+$(call gb_LinkTarget_add_defs,$(1),\
+ -DADAPT_EXT_STL \
+)
+endif
+$(call gb_LinkTarget_set_include,$(1),\
+ $$(INCLUDE) \
+ $(GRAPHITE_CFLAGS) \
+)
+$(call gb_LinkTarget_add_libs,$(1),$(GRAPHITE_LIBS))
+endef
+
+else # !SYSTEM_GRAPHITE
+
+$(eval $(call gb_Helper_register_static_libraries,PLAINLIBS, \
+ graphite \
+))
+define gb_LinkTarget__use_graphite
+$(call gb_LinkTarget_add_linked_static_libs,$(1),\
+ graphite \
+)
+endef
+
+endif # SYSTEM_GRAPHITE
+
+
ifeq ($(SYSTEM_ICU),YES)
+define gb_LinkTarget__use_icule
+$(call gb_LinkTarget_add_libs,$(1),-licule)
+endef
define gb_LinkTarget__use_icuuc
$(call gb_LinkTarget_add_libs,$(1),-licuuc)
endef
@@ -273,9 +306,15 @@ endef
else # !SYSTEM_ICU
$(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \
+ icule \
icuuc \
))
+define gb_LinkTarget__use_icule
+$(call gb_LinkTarget_add_linked_libs,$(1),\
+ icule \
+)
+endef
define gb_LinkTarget__use_icuuc
$(call gb_LinkTarget_add_linked_libs,$(1),\
icuuc \
Modified:
openoffice/branches/gbuild-reintegration/main/vcl/Library_desktop_detector.mk
URL:
http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/vcl/Library_desktop_detector.mk?rev=1734824&r1=1734823&r2=1734824&view=diff
==============================================================================
---
openoffice/branches/gbuild-reintegration/main/vcl/Library_desktop_detector.mk
(original)
+++
openoffice/branches/gbuild-reintegration/main/vcl/Library_desktop_detector.mk
Sun Mar 13 16:18:36 2016
@@ -55,8 +55,6 @@ $(eval $(call gb_Library_add_linked_libs
basegfx \
comphelper \
cppuhelper \
- icuuc \
- icule \
i18nisolang1 \
i18npaper \
i18nutil \
@@ -72,6 +70,11 @@ $(eval $(call gb_Library_add_linked_libs
$(gb_STDLIBS) \
))
+$(call gb_Library_use_externals,desktop_detector,\
+ icule \
+ icuuc \
+)
+
$(eval $(call gb_Library_add_exception_objects,desktop_detector,\
vcl/unx/generic/desktopdetect/desktopdetector \
))
Modified: openoffice/branches/gbuild-reintegration/main/vcl/Library_vcl.mk
URL:
http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/vcl/Library_vcl.mk?rev=1734824&r1=1734823&r2=1734824&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/vcl/Library_vcl.mk (original)
+++ openoffice/branches/gbuild-reintegration/main/vcl/Library_vcl.mk Sun Mar 13
16:18:36 2016
@@ -76,8 +76,6 @@ $(eval $(call gb_Library_add_linked_libs
basegfx \
comphelper \
cppuhelper \
- icuuc \
- icule \
i18nisolang1 \
i18npaper \
i18nutil \
@@ -89,6 +87,11 @@ $(eval $(call gb_Library_add_linked_libs
$(gb_STDLIBS) \
))
+$(call gb_Library_use_externals,vcl,\
+ icule \
+ icuuc \
+)
+
ifeq ($(GUIBASE),unx)
$(eval $(call gb_Library_add_linked_libs,vcl,\
freetype \
@@ -470,22 +473,9 @@ $(eval $(call gb_Library_add_exception_o
vcl/source/glyphs/graphite_adaptors \
vcl/source/glyphs/graphite_serverfont \
))
-ifeq ($(SYSTEM_GRAPHITE),YES)
-$(eval $(call gb_Library_add_libs,vcl,\
- $(GRAPHITE_LIBS) \
-))
-else
-$(eval $(call gb_Library_add_linked_static_libs,vcl,\
- graphite \
-))
-endif
-endif
-# on windows link static graphite library
-ifeq ($(OS),WNT)
-$(eval $(call gb_Library_add_linked_static_libs,vcl,\
- graphite \
-))
endif
+
+$(call gb_Library_use_external,vcl,graphite)
endif
ifeq ($(OS),LINUX)
Modified:
openoffice/branches/gbuild-reintegration/main/vcl/Library_vclplug_gen.mk
URL:
http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/vcl/Library_vclplug_gen.mk?rev=1734824&r1=1734823&r2=1734824&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/vcl/Library_vclplug_gen.mk
(original)
+++ openoffice/branches/gbuild-reintegration/main/vcl/Library_vclplug_gen.mk
Sun Mar 13 16:18:36 2016
@@ -46,8 +46,6 @@ $(eval $(call gb_Library_add_linked_libs
basegfx \
comphelper \
cppuhelper \
- icuuc \
- icule \
i18nisolang1 \
i18npaper \
i18nutil \
@@ -63,6 +61,11 @@ $(eval $(call gb_Library_add_linked_libs
$(gb_STDLIBS) \
))
+$(call gb_Library_use_externals,vclplug_gen,\
+ icule \
+ icuuc \
+)
+
$(eval $(call gb_Library_add_exception_objects,vclplug_gen,\
vcl/unx/generic/app/i18n_cb \
vcl/unx/generic/app/i18n_ic \
Modified:
openoffice/branches/gbuild-reintegration/main/vcl/Library_vclplug_gtk.mk
URL:
http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/vcl/Library_vclplug_gtk.mk?rev=1734824&r1=1734823&r2=1734824&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/vcl/Library_vclplug_gtk.mk
(original)
+++ openoffice/branches/gbuild-reintegration/main/vcl/Library_vclplug_gtk.mk
Sun Mar 13 16:18:36 2016
@@ -77,8 +77,6 @@ $(eval $(call gb_Library_add_linked_libs
basegfx \
comphelper \
cppuhelper \
- icuuc \
- icule \
i18nisolang1 \
i18npaper \
i18nutil \
@@ -94,6 +92,11 @@ $(eval $(call gb_Library_add_linked_libs
$(gb_STDLIBS) \
))
+$(call gb_Library_use_externals,vclplug_gtk,\
+ icule \
+ icuuc \
+)
+
$(eval $(call gb_Library_add_exception_objects,vclplug_gtk,\
vcl/unx/gtk/a11y/atkaction \
vcl/unx/gtk/a11y/atkbridge \
Modified:
openoffice/branches/gbuild-reintegration/main/vcl/Library_vclplug_kde.mk
URL:
http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/vcl/Library_vclplug_kde.mk?rev=1734824&r1=1734823&r2=1734824&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/vcl/Library_vclplug_kde.mk
(original)
+++ openoffice/branches/gbuild-reintegration/main/vcl/Library_vclplug_kde.mk
Sun Mar 13 16:18:36 2016
@@ -61,8 +61,6 @@ $(eval $(call gb_Library_add_linked_libs
basegfx \
comphelper \
cppuhelper \
- icuuc \
- icule \
i18nisolang1 \
i18npaper \
i18nutil \
@@ -77,6 +75,11 @@ $(eval $(call gb_Library_add_linked_libs
ICE \
))
+$(call gb_Library_use_externals,vclplug_kde,\
+ icule \
+ icuuc \
+)
+
$(eval $(call gb_Library_add_exception_objects,vclplug_kde,\
vcl/unx/kde/kdedata \
vcl/unx/kde/salnativewidgets-kde \
Modified:
openoffice/branches/gbuild-reintegration/main/vcl/Library_vclplug_kde4.mk
URL:
http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/vcl/Library_vclplug_kde4.mk?rev=1734824&r1=1734823&r2=1734824&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/vcl/Library_vclplug_kde4.mk
(original)
+++ openoffice/branches/gbuild-reintegration/main/vcl/Library_vclplug_kde4.mk
Sun Mar 13 16:18:36 2016
@@ -61,8 +61,6 @@ $(eval $(call gb_Library_add_linked_libs
basegfx \
comphelper \
cppuhelper \
- icuuc \
- icule \
i18nisolang1 \
i18npaper \
i18nutil \
@@ -77,6 +75,11 @@ $(eval $(call gb_Library_add_linked_libs
ICE \
))
+$(call gb_Library_use_externals,vclplug_kde4,\
+ icule \
+ icuuc \
+)
+
$(eval $(call gb_Library_add_exception_objects,vclplug_kde4,\
vcl/unx/kde4/KDEData \
vcl/unx/kde4/KDESalDisplay \
Modified:
openoffice/branches/gbuild-reintegration/main/vcl/Library_vclplug_svp.mk
URL:
http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/vcl/Library_vclplug_svp.mk?rev=1734824&r1=1734823&r2=1734824&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/vcl/Library_vclplug_svp.mk
(original)
+++ openoffice/branches/gbuild-reintegration/main/vcl/Library_vclplug_svp.mk
Sun Mar 13 16:18:36 2016
@@ -52,8 +52,6 @@ $(eval $(call gb_Library_add_linked_libs
basebmp \
comphelper \
cppuhelper \
- icuuc \
- icule \
i18nisolang1 \
i18npaper \
i18nutil \
@@ -69,6 +67,11 @@ $(eval $(call gb_Library_add_linked_libs
$(gb_STDLIBS) \
))
+$(call gb_Library_use_externals,vclplug_svp,\
+ icule \
+ icuuc \
+)
+
$(eval $(call gb_Library_add_exception_objects,vclplug_svp,\
vcl/unx/generic/printergfx/bitmap_gfx \
vcl/unx/generic/printergfx/common_gfx \
