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 /vcl | |
| 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 'vcl')
| -rw-r--r-- | vcl/Library_vcl.mk | 7 | ||||
| -rw-r--r-- | vcl/Library_vclplug_gen.mk | 23 |
2 files changed, 6 insertions, 24 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 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: |