[Libreoffice-commits] .: Branch 'feature/gnumake4' - canvas/Module_canvas.mk vcl/Library_vcl.mk
Bjoern Michaelsen
bmichaelsen at kemper.freedesktop.org
Sat Jun 18 05:13:54 PDT 2011
canvas/Module_canvas.mk | 2 +-
vcl/Library_vcl.mk | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
New commits:
commit 036733e1117aa354976f59cd0decd9ca808dea1d
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date: Sat Jun 18 14:12:17 2011 +0200
fixing rebase errors
diff --git a/canvas/Module_canvas.mk b/canvas/Module_canvas.mk
index 8c1970b..07a4ee3 100644
--- a/canvas/Module_canvas.mk
+++ b/canvas/Module_canvas.mk
@@ -53,7 +53,7 @@ $(eval $(call gb_Module_add_targets,canvas,\
endif
endif
-ifneq ($(strip $(ENABLE_CAIRO_CANVAS)),)
+ifeq ($(strip $(ENABLE_CAIRO_CANVAS)),TRUE)
$(eval $(call gb_Module_add_targets,canvas,\
Library_cairocanvas \
))
diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk
index 900ac3a..a2f430e 100755
--- a/vcl/Library_vcl.mk
+++ b/vcl/Library_vcl.mk
@@ -431,6 +431,8 @@ $(eval $(call gb_Library_add_exception_objects,vcl,\
vcl/source/glyphs/graphite_serverfont \
))
endif
+
+$(call gb_Library_use_external,vcl,graphite)
endif
ifeq ($(OS),LINUX)
@@ -451,8 +453,6 @@ $(eval $(call gb_Library_add_ldflags,vcl,\
-R/usr/sfw/lib \
))
endif
-
-$(call gb_Library_use_external,vcl,graphite)
endif
ifeq ($(GUIBASE),aqua)
More information about the Libreoffice-commits
mailing list