mirror of
https://gitlab.freedesktop.org/xorg/xserver.git
synced 2025-12-25 23:30:05 +01:00
'make distcheck' needs to read xkb files and write out compiled
versions as a part of the 'make check' phase. This patch passes
suitable options to the configure stage of the distcheck process to
read xkb files from the system location and write them to the
distcheck _inst directory.
Signed-off-by: Keith Packard <keithp@keithp.com>
(cherry picked from commit 08e7f62faf)
95 lines
1.2 KiB
Makefile
95 lines
1.2 KiB
Makefile
AUTOMAKE_OPTIONS=dist-bzip2 foreign nostdinc
|
|
ACLOCAL_AMFLAGS = -I m4
|
|
|
|
if COMPOSITE
|
|
COMPOSITE_DIR=composite
|
|
endif
|
|
|
|
if GLX
|
|
GLX_DIR=glx
|
|
endif
|
|
|
|
if DBE
|
|
DBE_DIR=dbe
|
|
endif
|
|
|
|
if RECORD
|
|
RECORD_DIR=record
|
|
endif
|
|
|
|
SUBDIRS = \
|
|
doc \
|
|
include \
|
|
dix \
|
|
fb \
|
|
mi \
|
|
Xext \
|
|
miext \
|
|
os \
|
|
randr \
|
|
render \
|
|
Xi \
|
|
xkb \
|
|
$(DBE_DIR) \
|
|
$(RECORD_DIR) \
|
|
xfixes \
|
|
damageext \
|
|
$(COMPOSITE_DIR) \
|
|
$(GLX_DIR) \
|
|
exa \
|
|
config \
|
|
hw \
|
|
test
|
|
|
|
if XORG
|
|
aclocaldir = $(datadir)/aclocal
|
|
aclocal_DATA = xorg-server.m4
|
|
|
|
pkgconfigdir = $(libdir)/pkgconfig
|
|
pkgconfig_DATA = xorg-server.pc
|
|
endif
|
|
|
|
EXTRA_DIST = xorg-server.pc.in xorg-server.m4 ChangeLog autogen.sh
|
|
|
|
DISTCHECK_CONFIGURE_FLAGS=\
|
|
--with-xkb-path=$(XKB_BASE_DIRECTORY) \
|
|
--with-xkb-bin-directory=$(XKB_BIN_DIRECTORY) \
|
|
--with-xkb-output='$${datadir}/X11/xkb/compiled'
|
|
|
|
DISTCLEANFILES = doltcompile doltlibtool
|
|
MAINTAINERCLEANFILES=ChangeLog
|
|
|
|
.PHONY: ChangeLog
|
|
|
|
ChangeLog:
|
|
$(CHANGELOG_CMD)
|
|
|
|
dist-hook: ChangeLog
|
|
|
|
DIST_SUBDIRS = \
|
|
doc \
|
|
include \
|
|
dix \
|
|
fb \
|
|
mi \
|
|
Xext \
|
|
miext \
|
|
os \
|
|
randr \
|
|
render \
|
|
Xi \
|
|
xkb \
|
|
dbe \
|
|
record \
|
|
xfixes \
|
|
damageext \
|
|
composite \
|
|
glx \
|
|
exa \
|
|
config \
|
|
hw \
|
|
test
|
|
|
|
# gross hack
|
|
relink: all
|
|
$(MAKE) -C hw relink
|