diff options
| author | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-06-18 14:12:17 +0200 |
|---|---|---|
| committer | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-06-18 14:12:17 +0200 |
| commit | 0692507dcc62e94c7af88388961db1d7d12d6dbd (patch) | |
| tree | a3aa09e78c767d8f1356891b0a253ff9cf0c3ef0 | |
| parent | 713088c4b7bf29bc71e1acd3b9eafb0327f5e89e (diff) | |
fixing rebase errors
| -rw-r--r-- | canvas/Module_canvas.mk | 2 | ||||
| -rwxr-xr-x | vcl/Library_vcl.mk | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/canvas/Module_canvas.mk b/canvas/Module_canvas.mk index 8c1970bd0279..07a4ee34474e 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 900ac3aca526..a2f430eb39de 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) |