You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by ar...@apache.org on 2012/11/15 00:39:55 UTC
svn commit: r1409564 - in /incubator/ooo/branches/gbuild/main: Repository.mk
RepositoryExternal.mk vcl/Library_vcl.mk
Author: arist
Date: Wed Nov 14 23:39:54 2012
New Revision: 1409564
URL: http://svn.apache.org/viewvc?rev=1409564&view=rev
Log:
gnumake4_078_ca1349af0566.patch
# HG changeset patch
# User Michael Stahl <ms...@openoffice.org>
# Date 1302711099 0
# Node ID ca1349af05662d2caaf4a2c1f3ff3e5b7760d627
# Parent 017b3647c72fecd179958975c6763ca7a17e212d
gnumake4: #i117610#: move graphite to RepositoryExternal.mk
Modified:
incubator/ooo/branches/gbuild/main/Repository.mk
incubator/ooo/branches/gbuild/main/RepositoryExternal.mk
incubator/ooo/branches/gbuild/main/vcl/Library_vcl.mk
Modified: incubator/ooo/branches/gbuild/main/Repository.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/Repository.mk?rev=1409564&r1=1409563&r2=1409564&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/Repository.mk (original)
+++ incubator/ooo/branches/gbuild/main/Repository.mk Wed Nov 14 23:39:54 2012
@@ -152,7 +152,6 @@ $(eval $(call gb_Helper_register_static_
basegfx_s \
ooopathutils \
salcpprt \
- graphite \
vclmain \
))
Modified: incubator/ooo/branches/gbuild/main/RepositoryExternal.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/RepositoryExternal.mk?rev=1409564&r1=1409563&r2=1409564&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/RepositoryExternal.mk (original)
+++ incubator/ooo/branches/gbuild/main/RepositoryExternal.mk Wed Nov 14 23:39:54 2012
@@ -258,6 +258,36 @@ 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_icuuc
Modified: incubator/ooo/branches/gbuild/main/vcl/Library_vcl.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/vcl/Library_vcl.mk?rev=1409564&r1=1409563&r2=1409564&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/vcl/Library_vcl.mk (original)
+++ incubator/ooo/branches/gbuild/main/vcl/Library_vcl.mk Wed Nov 14 23:39:54 2012
@@ -457,38 +457,15 @@ $(eval $(call gb_Library_add_exception_o
vcl/source/glyphs/graphite_textsrc \
))
-#building with stlport, but graphite was not built with stlport
-ifneq ($(USE_SYSTEM_STL),YES)
-ifeq ($(SYSTEM_GRAPHITE),YES)
-$(eval $(call gb_Library_set_defs,vcl,\
- $$(DEFS) \
- -DADAPT_EXT_STL \
-))
-endif
-endif
-
# handle X11 platforms, which have additional files and possibly system graphite
ifeq ($(GUIBASE),unx)
$(eval $(call gb_Library_add_exception_objects,vcl,\
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)