From 78b59b8302e79fad71bfff66d5b88db80527e6a1 Mon Sep 17 00:00:00 2001 From: Michael Stahl Date: Thu, 27 Sep 2012 21:45:47 +0200 Subject: gbuild: clean up usage of weird x11_extensions module etc. Move libraries using those headers to RepositoryExternal.mk and also move pkg-config invocation to configure. Change-Id: I17a240fcba83a98f3f248f15b34d245f941c62e2 --- canvas/Library_cairocanvas.mk | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'canvas/Library_cairocanvas.mk') diff --git a/canvas/Library_cairocanvas.mk b/canvas/Library_cairocanvas.mk index 85ea94cda4ed..a30333a3069f 100644 --- a/canvas/Library_cairocanvas.mk +++ b/canvas/Library_cairocanvas.mk @@ -91,7 +91,9 @@ $(eval $(call gb_Library_add_exception_objects,cairocanvas,\ canvas/source/cairo/cairo_textlayout \ )) -$(eval $(call gb_Library_use_external,cairocanvas,cairo)) +$(eval $(call gb_Library_use_externals,cairocanvas,\ + cairo \ +)) ifeq ($(OS),WNT) @@ -116,6 +118,8 @@ $(eval $(call gb_Library_add_exception_objects,cairocanvas,\ # freetype? fontconfig? -> test on Solaris $(eval $(call gb_Library_use_libraries,cairocanvas,\ X11 \ +)) +$(eval $(call gb_Library_use_externals,cairocanvas,\ Xrender \ )) endif -- cgit