diff options
| -rw-r--r-- | RepositoryExternal.mk | 5 | ||||
| -rw-r--r-- | x11_extensions/Module_x11_extensions.mk | 4 | ||||
| -rw-r--r-- | x11_extensions/Package_inc.mk | 21 | ||||
| -rw-r--r-- | x11_extensions/inc/X11/extensions/Xrandr.h (renamed from x11_extensions/inc/Xrandr.h) | 0 | ||||
| -rw-r--r-- | x11_extensions/inc/X11/extensions/Xrender.h (renamed from x11_extensions/inc/Xrender.h) | 0 | ||||
| -rw-r--r-- | x11_extensions/inc/X11/extensions/randr.h (renamed from x11_extensions/inc/randr.h) | 0 | ||||
| -rw-r--r-- | x11_extensions/inc/X11/extensions/randrproto.h (renamed from x11_extensions/inc/randrproto.h) | 0 | ||||
| -rw-r--r-- | x11_extensions/inc/X11/extensions/render.h (renamed from x11_extensions/inc/render.h) | 0 | ||||
| -rw-r--r-- | x11_extensions/inc/X11/extensions/renderproto.h (renamed from x11_extensions/inc/renderproto.h) | 0 | ||||
| -rw-r--r-- | x11_extensions/inc/X11/extensions/shape.h (renamed from x11_extensions/inc/shape.h) | 0 | ||||
| -rw-r--r-- | x11_extensions/inc/X11/extensions/shapeconst.h (renamed from x11_extensions/inc/shapeconst.h) | 0 |
11 files changed, 3 insertions, 27 deletions
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index 21430ccb7344..c2f21a07a696 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -2456,8 +2456,9 @@ ifeq ($(GUIBASE),unx) ifneq ($(filter X11_EXTENSIONS,$(BUILD_TYPE)),) define gb_LinkTarget__use_x11extensions -$(call gb_LinkTarget_use_packages,$(1),\ - x11_extensions_inc \ +$(call gb_LinkTarget_set_include,$(1),\ + -I$(SRCDIR)/x11_extensions/inc \ + $$(INCLUDE) \ ) endef diff --git a/x11_extensions/Module_x11_extensions.mk b/x11_extensions/Module_x11_extensions.mk index 360c89cb9072..87d6b41685b2 100644 --- a/x11_extensions/Module_x11_extensions.mk +++ b/x11_extensions/Module_x11_extensions.mk @@ -9,8 +9,4 @@ $(eval $(call gb_Module_Module,x11_extensions)) -$(eval $(call gb_Module_add_targets,x11_extensions,\ - Package_inc \ -)) - # vim: set shiftwidth=4 tabstop=4 noexpandtab: diff --git a/x11_extensions/Package_inc.mk b/x11_extensions/Package_inc.mk deleted file mode 100644 index 6cdb592e9c56..000000000000 --- a/x11_extensions/Package_inc.mk +++ /dev/null @@ -1,21 +0,0 @@ -# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- -# -# This file is part of the LibreOffice project. -# -# This Source Code Form is subject to the terms of the Mozilla Public -# License, v. 2.0. If a copy of the MPL was not distributed with this -# file, You can obtain one at http://mozilla.org/MPL/2.0/. -# - -$(eval $(call gb_Package_Package,x11_extensions_inc,$(SRCDIR)/x11_extensions/inc)) - -$(eval $(call gb_Package_add_file,x11_extensions_inc,inc/X11/extensions/randr.h,randr.h)) -$(eval $(call gb_Package_add_file,x11_extensions_inc,inc/X11/extensions/randrproto.h,randrproto.h)) -$(eval $(call gb_Package_add_file,x11_extensions_inc,inc/X11/extensions/render.h,render.h)) -$(eval $(call gb_Package_add_file,x11_extensions_inc,inc/X11/extensions/renderproto.h,renderproto.h)) -$(eval $(call gb_Package_add_file,x11_extensions_inc,inc/X11/extensions/shapeconst.h,shapeconst.h)) -$(eval $(call gb_Package_add_file,x11_extensions_inc,inc/X11/extensions/shape.h,shape.h)) -$(eval $(call gb_Package_add_file,x11_extensions_inc,inc/X11/extensions/Xrandr.h,Xrandr.h)) -$(eval $(call gb_Package_add_file,x11_extensions_inc,inc/X11/extensions/Xrender.h,Xrender.h)) - -# vim: set shiftwidth=4 tabstop=4 noexpandtab: diff --git a/x11_extensions/inc/Xrandr.h b/x11_extensions/inc/X11/extensions/Xrandr.h index 3cf2a674760f..3cf2a674760f 100644 --- a/x11_extensions/inc/Xrandr.h +++ b/x11_extensions/inc/X11/extensions/Xrandr.h diff --git a/x11_extensions/inc/Xrender.h b/x11_extensions/inc/X11/extensions/Xrender.h index 1b3bc939f24e..1b3bc939f24e 100644 --- a/x11_extensions/inc/Xrender.h +++ b/x11_extensions/inc/X11/extensions/Xrender.h diff --git a/x11_extensions/inc/randr.h b/x11_extensions/inc/X11/extensions/randr.h index f4bc2eb096ff..f4bc2eb096ff 100644 --- a/x11_extensions/inc/randr.h +++ b/x11_extensions/inc/X11/extensions/randr.h diff --git a/x11_extensions/inc/randrproto.h b/x11_extensions/inc/X11/extensions/randrproto.h index 714cacda4ae2..714cacda4ae2 100644 --- a/x11_extensions/inc/randrproto.h +++ b/x11_extensions/inc/X11/extensions/randrproto.h diff --git a/x11_extensions/inc/render.h b/x11_extensions/inc/X11/extensions/render.h index aff7c47959d0..aff7c47959d0 100644 --- a/x11_extensions/inc/render.h +++ b/x11_extensions/inc/X11/extensions/render.h diff --git a/x11_extensions/inc/renderproto.h b/x11_extensions/inc/X11/extensions/renderproto.h index 2b2c708d982f..2b2c708d982f 100644 --- a/x11_extensions/inc/renderproto.h +++ b/x11_extensions/inc/X11/extensions/renderproto.h diff --git a/x11_extensions/inc/shape.h b/x11_extensions/inc/X11/extensions/shape.h index 839ec49a2c75..839ec49a2c75 100644 --- a/x11_extensions/inc/shape.h +++ b/x11_extensions/inc/X11/extensions/shape.h diff --git a/x11_extensions/inc/shapeconst.h b/x11_extensions/inc/X11/extensions/shapeconst.h index 9ef01f3d8ebe..9ef01f3d8ebe 100644 --- a/x11_extensions/inc/shapeconst.h +++ b/x11_extensions/inc/X11/extensions/shapeconst.h |