From ed63fde85b6b37d464a926c0c5508eb10c4e6464 Mon Sep 17 00:00:00 2001
From: Caolán McNamara <caolanm@redhat.com>
Date: Mon, 25 Jul 2011 22:09:46 +0100
Subject: use new link mechanism and drop this horrible mess

---
 vcl/Library_vcl.mk                        | 4 ++--
 vcl/Library_vclplug_gen.mk                | 3 +--
 vcl/source/components/rasterizer_rsvg.cxx | 4 ----
 vcl/unx/generic/gdi/salgdi3.cxx           | 6 ------
 4 files changed, 3 insertions(+), 14 deletions(-)

(limited to 'vcl')

diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk
index e7385651a634..20927c7e1077 100644
--- a/vcl/Library_vcl.mk
+++ b/vcl/Library_vcl.mk
@@ -465,7 +465,6 @@ endif
 $(eval $(call gb_Library_use_external,vcl,graphite))
 endif
 
-## handle Cairo
 ifneq ($(ENABLE_LIBRSVG),NO)
 
 $(eval $(call gb_Library_add_exception_objects,vcl,\
@@ -475,10 +474,11 @@ $(eval $(call gb_Library_add_exception_objects,vcl,\
 $(eval $(call gb_Library_add_defs,vcl,\
     -DENABLE_LIBRSVG \
 ))
-endif
 
 $(eval $(call gb_Library_use_external,vcl,cairo))
 
+endif
+
 ifeq ($(GUIBASE),unx)
 $(eval $(call gb_Library_add_ldflags,vcl,\
 	$$(FONTCONFIG_LIBS) \
diff --git a/vcl/Library_vclplug_gen.mk b/vcl/Library_vclplug_gen.mk
index 8f5a2ebd16f2..7b8ae4adbe48 100644
--- a/vcl/Library_vclplug_gen.mk
+++ b/vcl/Library_vclplug_gen.mk
@@ -63,12 +63,11 @@ $(eval $(call gb_Library_add_linked_libs,vclplug_gen,\
 ))
 
 $(eval $(call gb_Library_use_externals,vclplug_gen,\
+	cairo \
 	icule \
 	icuuc \
 ))
 
-$(eval $(call gb_Library_use_external,vclplug_gen,cairo))
-
 $(eval $(call gb_Library_add_exception_objects,vclplug_gen,\
     vcl/unx/generic/app/i18n_cb \
     vcl/unx/generic/app/i18n_ic \
diff --git a/vcl/source/components/rasterizer_rsvg.cxx b/vcl/source/components/rasterizer_rsvg.cxx
index ef0d5f82e937..6746285bca12 100644
--- a/vcl/source/components/rasterizer_rsvg.cxx
+++ b/vcl/source/components/rasterizer_rsvg.cxx
@@ -38,11 +38,7 @@
 #include <cppuhelper/implbase2.hxx>
 #include <osl/module.h>
 
-#ifdef SYSTEM_CAIRO
 #include <cairo.h>
-#else
-#include <cairo/cairo.h>
-#endif
 
 #include <vector>
 
diff --git a/vcl/unx/generic/gdi/salgdi3.cxx b/vcl/unx/generic/gdi/salgdi3.cxx
index 235f08219c69..aa4e90ef3c62 100644
--- a/vcl/unx/generic/gdi/salgdi3.cxx
+++ b/vcl/unx/generic/gdi/salgdi3.cxx
@@ -83,15 +83,9 @@
 #include <graphite_serverfont.hxx>
 #endif
 
-#ifdef SYSTEM_CAIRO
 #include <cairo.h>
 #include <cairo-ft.h>
 #include <cairo-xlib-xrender.h>
-#else
-#include <cairo/cairo.h>
-#include <cairo/cairo-ft.h>
-#include <cairo/cairo-xlib-xrender.h>
-#endif
 
 struct BOX
 {
-- 
cgit v1.2.3