diff options
| author | Michael Stahl <mstahl@redhat.com> | 2012-09-27 21:45:47 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2012-09-28 16:49:07 +0200 |
| commit | 78b59b8302e79fad71bfff66d5b88db80527e6a1 (patch) | |
| tree | 877b7bec05cebfa44db36af96b292874d20e3a39 /canvas | |
| parent | 40e0ebff76d839a548638ca8709c68c56e2b926c (diff) | |
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
Diffstat (limited to 'canvas')
| -rw-r--r-- | canvas/Library_cairocanvas.mk | 6 |
1 files changed, 5 insertions, 1 deletions
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 |