summaryrefslogtreecommitdiff
path: root/RepositoryExternal.mk
diff options
context:
space:
mode:
authorKhaled Hosny <khaledhosny@eglug.org>2013-07-29 15:58:43 +0200
committerFridrich Strba <fridrich@documentfoundation.org>2013-07-30 13:25:15 +0000
commit9accbedad3648dca197439a8cc39c268cf34ea99 (patch)
tree81bf9ef42bfd908f50ea7092189e1535cbbde137 /RepositoryExternal.mk
parent7afc29809ec9db8c5064d5b5857f64db9bd843be (diff)
Drop internal copies of X11 extensions headers
They are not use by default since 2011, and non of the distro configs uses --without-system-xextensions-headers. Change-Id: I51e88796c22b1b3d0854c3ec1db15fcab720a079 Reviewed-on: https://gerrit.libreoffice.org/5175 Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org> Tested-by: Fridrich Strba <fridrich@documentfoundation.org>
Diffstat (limited to 'RepositoryExternal.mk')
-rw-r--r--RepositoryExternal.mk22
1 files changed, 0 insertions, 22 deletions
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 233e1760e477..f866957e5748 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -2523,27 +2523,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_set_include,$(1),\
- -I$(SRCDIR)/x11_extensions/inc \
- $$(INCLUDE) \
-)
-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) \
$(XRANDR_CFLAGS) \
@@ -2557,8 +2539,6 @@ endef
else # XRANDR_DLOPEN
define gb_LinkTarget__use_Xrandr
-$(call gb_LinkTarget__use_x11extensions,$(1))
-
$(call gb_LinkTarget_add_defs,$(1),\
-DXRANDR_DLOPEN \
)
@@ -2567,8 +2547,6 @@ endef
endif # XRANDR_DLOPEN
define gb_LinkTarget__use_Xrender
-$(call gb_LinkTarget__use_x11extensions,$(1))
-
$(call gb_LinkTarget_set_include,$(1),\
$$(INCLUDE) \
$(XRENDER_CFLAGS) \