diff options
| author | Enrico Weigelt, metux ITS <metuxitservice@googlemail.com> | 2012-11-16 04:40:36 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2012-11-21 14:30:11 +0000 |
| commit | 3f00bc6717964c2d4db26093b64a68f93c7de906 (patch) | |
| tree | c06e2fc0a1cfdc2e43b60e36d066b8cdf9dabafd /RepositoryExternal.mk | |
| parent | 0f834124b11d9fe2485455937b8e668813914c69 (diff) | |
Xlib import via generic pkg-config
Generic importing Xlib+friends via pkg-config, instead of scanning
through a list of directories. This is very helpful for non-standard
installation pathes and crosscompiling, as the generic pkg-config
infrastructure will handle it all.
Also dropping the obsolete bundled Xext headers.
Conflicts:
vcl/prj/build.lst
Change-Id: I6ee381030ff9f1d2d83062a17ab55ad3d847a4c6
Diffstat (limited to 'RepositoryExternal.mk')
| -rw-r--r-- | RepositoryExternal.mk | 18 |
1 files changed, 0 insertions, 18 deletions
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index bc717b10ba8f..a6d92514faae 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -2070,25 +2070,9 @@ endif # SYSTEM_LIBORCUS ifeq ($(GUIBASE),unx) -# TODO: do we really need these X11 headers in the repo? -ifneq ($(filter X11_EXTENSIONS,$(BUILD_TYPE)),) - -define gb_LinkTarget__use_x11extensions -$(call gb_LinkTarget_use_packages,$(1),\ - x11_extensions_inc \ -) -endef - -else # !X11_EXTENSIONS - -gb_LinkTarget__use_x11extensions := - -endif # X11_EXTENSIONS - ifeq ($(XRANDR_DLOPEN),FALSE) define gb_LinkTarget__use_Xrandr -$(call gb_LinkTarget__use_x11extensions,$(1)) $(call gb_LinkTarget_set_include,$(1),\ $$(INCLUDE) \ @@ -2103,7 +2087,6 @@ endef else # XRANDR_DLOPEN define gb_LinkTarget__use_Xrandr -$(call gb_LinkTarget__use_x11extensions,$(1)) $(call gb_LinkTarget_add_defs,$(1),\ -DXRANDR_DLOPEN \ @@ -2113,7 +2096,6 @@ endef endif # XRANDR_DLOPEN define gb_LinkTarget__use_Xrender -$(call gb_LinkTarget__use_x11extensions,$(1)) $(call gb_LinkTarget_set_include,$(1),\ $$(INCLUDE) \ |