From 78b59b8302e79fad71bfff66d5b88db80527e6a1 Mon Sep 17 00:00:00 2001
From: Michael Stahl <mstahl@redhat.com>
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
---
 vcl/Library_vclplug_gen.mk | 23 +++++------------------
 1 file changed, 5 insertions(+), 18 deletions(-)

(limited to 'vcl/Library_vclplug_gen.mk')

diff --git a/vcl/Library_vclplug_gen.mk b/vcl/Library_vclplug_gen.mk
index 0261c036465b..46c5f522820c 100644
--- a/vcl/Library_vclplug_gen.mk
+++ b/vcl/Library_vclplug_gen.mk
@@ -61,6 +61,7 @@ $(eval $(call gb_Library_use_externals,vclplug_gen,\
 	cairo \
 	icule \
 	icuuc \
+	Xrender \
 ))
 
 $(eval $(call gb_Library_add_exception_objects,vclplug_gen,\
@@ -111,23 +112,13 @@ $(eval $(call gb_Library_add_defs,vclplug_gen,\
 
 ## handle RandR 
 ifneq ($(ENABLE_RANDR),)
-$(eval $(call gb_Library_add_defs,vclplug_gen,\
-    -DUSE_RANDR \
-))
-ifeq ($(XRANDR_DLOPEN),FALSE)
-$(eval $(call gb_Library_set_include,vclplug_gen,\
-	$$(INCLUDE) \
-    $$(XRANDR_CFLAGS) \
-))
-$(eval $(call gb_Library_add_libs,vclplug_gen,\
-    $(XRANDR_LIBS) \
+$(eval $(call gb_Library_use_externals,vclplug_gen,\
+	Xrandr \
 ))
-else
 $(eval $(call gb_Library_add_defs,vclplug_gen,\
-    -DXRANDR_DLOPEN \
+    -DUSE_RANDR \
 ))
 endif
-endif
 
 $(eval $(call gb_Library_add_defs,vclplug_gen,\
     $(if $(VALGRIND_CFLAGS), \
@@ -172,11 +163,6 @@ endif
 endif
 endif
 
-## handle Render linking
-$(eval $(call gb_Library_add_libs,vclplug_gen,\
-    $(shell pkg-config --libs xrender) \
-))
-
 ifeq ($(OS),LINUX)
 $(eval $(call gb_Library_use_libraries,vclplug_gen,\
     dl \
@@ -184,4 +170,5 @@ $(eval $(call gb_Library_use_libraries,vclplug_gen,\
     pthread \
 ))
 endif
+
 # vim: set noet sw=4 ts=4:
-- 
cgit v1.2.3