summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Tardon <dtardon@redhat.com>2012-06-01 10:15:17 +0200
committerDavid Tardon <dtardon@redhat.com>2012-06-01 10:19:30 +0200
commitb42013ee093b7f91f91ec6ca9c3b3c08fe55b530 (patch)
treec6f4dab76ef53b718597594631c4ce231784907d
parent1f33addebbc66f78dd64e382b1dd9bd0dd82cac2 (diff)
vcl uses X11/extension headers too
Change-Id: Ie2ee19ca685d082f50415c2d916f5bfdf842bd84
-rw-r--r--vcl/Library_vcl.mk6
-rw-r--r--vcl/Library_vclplug_gen.mk6
2 files changed, 6 insertions, 6 deletions
diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk
index bf03be2da259..8d9473a25014 100644
--- a/vcl/Library_vcl.mk
+++ b/vcl/Library_vcl.mk
@@ -44,6 +44,12 @@ 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,\
diff --git a/vcl/Library_vclplug_gen.mk b/vcl/Library_vclplug_gen.mk
index 50c0c6469664..3ff257a0ce60 100644
--- a/vcl/Library_vclplug_gen.mk
+++ b/vcl/Library_vclplug_gen.mk
@@ -28,12 +28,6 @@
$(eval $(call gb_Library_Library,vclplug_gen))
-ifneq ($(filter X11_EXTENSIONS,$(BUILD_TYPE)),)
-$(eval $(call gb_Library_use_packages,vclplug_gen,\
- x11_extensions_inc \
-))
-endif
-
$(eval $(call gb_Library_set_include,vclplug_gen,\
$$(INCLUDE) \
-I$(SRCDIR)/vcl/inc \