summaryrefslogtreecommitdiff
path: root/vcl/Library_vcl.mk
diff options
context:
space:
mode:
authorMichael Stahl <mstahl@redhat.com>2012-09-27 21:45:47 +0200
committerMichael Stahl <mstahl@redhat.com>2012-09-28 16:49:07 +0200
commit78b59b8302e79fad71bfff66d5b88db80527e6a1 (patch)
tree877b7bec05cebfa44db36af96b292874d20e3a39 /vcl/Library_vcl.mk
parent40e0ebff76d839a548638ca8709c68c56e2b926c (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 'vcl/Library_vcl.mk')
-rw-r--r--vcl/Library_vcl.mk7
1 files changed, 1 insertions, 6 deletions
diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk
index a7ee6ca8e3d9..ce6d41e4a107 100644
--- a/vcl/Library_vcl.mk
+++ b/vcl/Library_vcl.mk
@@ -44,12 +44,6 @@ endif
$(eval $(call gb_Library_use_package,vcl,vcl_inc))
-ifneq ($(filter X11_EXTENSIONS,$(BUILD_TYPE)),)
-$(eval $(call gb_Library_use_packages,vclplug_gen,\
- x11_extensions_inc \
-))
-endif
-
$(eval $(call gb_Library_use_custom_headers,vcl,vcl/generic/fontmanager))
$(eval $(call gb_Library_set_include,vcl,\
@@ -526,6 +520,7 @@ $(eval $(call gb_Library_use_externals,vcl,\
dbus \
fontconfig \
freetype \
+ x11extensions \
))
endif