summaryrefslogtreecommitdiff
path: root/xserver/hw/xfree86/exa
diff options
context:
space:
mode:
Diffstat (limited to 'xserver/hw/xfree86/exa')
-rw-r--r--xserver/hw/xfree86/exa/Makefile.in14
-rw-r--r--xserver/hw/xfree86/exa/examodule.c2
-rw-r--r--xserver/hw/xfree86/exa/man/Makefile.in56
-rw-r--r--xserver/hw/xfree86/exa/man/exa.man6
4 files changed, 50 insertions, 28 deletions
diff --git a/xserver/hw/xfree86/exa/Makefile.in b/xserver/hw/xfree86/exa/Makefile.in
index ed5242185..b3ce5f0ad 100644
--- a/xserver/hw/xfree86/exa/Makefile.in
+++ b/xserver/hw/xfree86/exa/Makefile.in
@@ -68,7 +68,7 @@ CONFIG_HEADER = $(top_builddir)/include/do-not-use-config.h \
$(top_builddir)/include/xorg-config.h \
$(top_builddir)/include/xkb-config.h \
$(top_builddir)/include/xwin-config.h \
- $(top_builddir)/include/kdrive-config.h \
+ $(top_builddir)/include/xwayland-config.h \
$(top_builddir)/include/version-config.h
CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES =
@@ -377,6 +377,7 @@ RANLIB = @RANLIB@
RAWCPP = @RAWCPP@
RAWCPPFLAGS = @RAWCPPFLAGS@
RELEASE_DATE = @RELEASE_DATE@
+SCANNER_ARG = @SCANNER_ARG@
SDK_REQUIRED_MODULES = @SDK_REQUIRED_MODULES@
SED = @SED@
SELINUX_CFLAGS = @SELINUX_CFLAGS@
@@ -395,15 +396,18 @@ SYSCONFDIR = @SYSCONFDIR@
SYSTEMD_DAEMON_CFLAGS = @SYSTEMD_DAEMON_CFLAGS@
SYSTEMD_DAEMON_LIBS = @SYSTEMD_DAEMON_LIBS@
TRADITIONALCPPFLAGS = @TRADITIONALCPPFLAGS@
-TSLIB_CFLAGS = @TSLIB_CFLAGS@
-TSLIB_LIBS = @TSLIB_LIBS@
UDEV_CFLAGS = @UDEV_CFLAGS@
UDEV_LIBS = @UDEV_LIBS@
UTILS_SYS_LIBS = @UTILS_SYS_LIBS@
VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@
VERSION = @VERSION@
+WAYLAND_EGLSTREAM_CFLAGS = @WAYLAND_EGLSTREAM_CFLAGS@
+WAYLAND_EGLSTREAM_DATADIR = @WAYLAND_EGLSTREAM_DATADIR@
+WAYLAND_EGLSTREAM_LIBS = @WAYLAND_EGLSTREAM_LIBS@
WAYLAND_PROTOCOLS_DATADIR = @WAYLAND_PROTOCOLS_DATADIR@
WAYLAND_SCANNER = @WAYLAND_SCANNER@
+WAYLAND_SCANNER_CFLAGS = @WAYLAND_SCANNER_CFLAGS@
+WAYLAND_SCANNER_LIBS = @WAYLAND_SCANNER_LIBS@
WINDOWSDRI_CFLAGS = @WINDOWSDRI_CFLAGS@
WINDOWSDRI_LIBS = @WINDOWSDRI_LIBS@
WINDOWSWM_CFLAGS = @WINDOWSWM_CFLAGS@
@@ -411,6 +415,8 @@ WINDOWSWM_LIBS = @WINDOWSWM_LIBS@
WINDRES = @WINDRES@
X11EXAMPLES_DEP_CFLAGS = @X11EXAMPLES_DEP_CFLAGS@
X11EXAMPLES_DEP_LIBS = @X11EXAMPLES_DEP_LIBS@
+XCONFIGDIR = @XCONFIGDIR@
+XCONFIGFILE = @XCONFIGFILE@
XDMCP_CFLAGS = @XDMCP_CFLAGS@
XDMCP_LIBS = @XDMCP_LIBS@
XDMXCONFIG_DEP_CFLAGS = @XDMXCONFIG_DEP_CFLAGS@
@@ -482,8 +488,6 @@ XWIN_SERVER_NAME = @XWIN_SERVER_NAME@
XWIN_SYS_LIBS = @XWIN_SYS_LIBS@
YACC = @YACC@
YFLAGS = @YFLAGS@
-__XCONFIGDIR__ = @__XCONFIGDIR__@
-__XCONFIGFILE__ = @__XCONFIGFILE__@
abi_ansic = @abi_ansic@
abi_extension = @abi_extension@
abi_videodrv = @abi_videodrv@
diff --git a/xserver/hw/xfree86/exa/examodule.c b/xserver/hw/xfree86/exa/examodule.c
index 76f780ab6..0bbd93e34 100644
--- a/xserver/hw/xfree86/exa/examodule.c
+++ b/xserver/hw/xfree86/exa/examodule.c
@@ -25,7 +25,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
+#ifdef HAVE_XORG_CONFIG_H
#include <xorg-config.h>
#endif
diff --git a/xserver/hw/xfree86/exa/man/Makefile.in b/xserver/hw/xfree86/exa/man/Makefile.in
index b1b288a25..de4f13fc7 100644
--- a/xserver/hw/xfree86/exa/man/Makefile.in
+++ b/xserver/hw/xfree86/exa/man/Makefile.in
@@ -68,7 +68,7 @@ CONFIG_HEADER = $(top_builddir)/include/do-not-use-config.h \
$(top_builddir)/include/xorg-config.h \
$(top_builddir)/include/xkb-config.h \
$(top_builddir)/include/xwin-config.h \
- $(top_builddir)/include/kdrive-config.h \
+ $(top_builddir)/include/xwayland-config.h \
$(top_builddir)/include/version-config.h
CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES =
@@ -263,22 +263,36 @@ MAIN_LIB = @MAIN_LIB@
MAKEINFO = @MAKEINFO@
MANIFEST_TOOL = @MANIFEST_TOOL@
+# xorg-macros.m4 has these bracketed by double underscores, but meson
+# wants ats.
+
# Add server specific man pages string substitution from XORG_MANPAGE_SECTIONS
# 's|/,|/, |g' will add a space to help font path formatting
-MAN_SUBSTS = @MAN_SUBSTS@ -e 's|__logdir__|$(logdir)|g' -e \
- 's|__datadir__|$(datadir)|g' -e 's|__mandir__|$(mandir)|g' -e \
- 's|__sysconfdir__|$(sysconfdir)|g' -e \
- 's|__xconfigdir__|$(__XCONFIGDIR__)|g' -e \
- 's|__xkbdir__|$(XKB_BASE_DIRECTORY)|g' -e \
- 's|__XKB_DFLT_RULES__|$(XKB_DFLT_RULES)|g' -e \
- 's|__XKB_DFLT_MODEL__|$(XKB_DFLT_MODEL)|g' -e \
- 's|__XKB_DFLT_LAYOUT__|$(XKB_DFLT_LAYOUT)|g' -e \
- 's|__XKB_DFLT_VARIANT__|$(XKB_DFLT_VARIANT)|g' -e \
- 's|__XKB_DFLT_OPTIONS__|$(XKB_DFLT_OPTIONS)|g' -e \
- 's|__bundle_id_prefix__|$(BUNDLE_ID_PREFIX)|g' -e \
- 's|__modulepath__|$(DEFAULT_MODULE_PATH)|g' -e \
- 's|__suid_wrapper_dir__|$(SUID_WRAPPER_DIR)|g' -e \
- 's|__default_font_path__|$(COMPILEDDEFAULTFONTPATH)|g' -e \
+MAN_SUBSTS = @MAN_SUBSTS@ -e 's|@vendorversion@|"$(PACKAGE_STRING)" \
+ "$(XORG_MAN_PAGE)"|' -e 's|@xorgversion@|"$(PACKAGE_STRING)" \
+ "$(XORG_MAN_PAGE)"|' -e 's|@xservername@|Xorg|g' -e \
+ 's|@xconfigfile@|xorg.conf|g' -e 's|@projectroot@|$(prefix)|g' \
+ -e 's|@apploaddir@|$(appdefaultdir)|g' -e \
+ 's|@appmansuffix@|$(APP_MAN_SUFFIX)|g' -e \
+ 's|@drivermansuffix@|$(DRIVER_MAN_SUFFIX)|g' -e \
+ 's|@adminmansuffix@|$(ADMIN_MAN_SUFFIX)|g' -e \
+ 's|@libmansuffix@|$(LIB_MAN_SUFFIX)|g' -e \
+ 's|@miscmansuffix@|$(MISC_MAN_SUFFIX)|g' -e \
+ 's|@filemansuffix@|$(FILE_MAN_SUFFIX)|g' -e \
+ 's|[@]logdir[@]|$(logdir)|g' -e 's|[@]datadir[@]|$(datadir)|g' \
+ -e 's|[@]mandir[@]|$(mandir)|g' -e \
+ 's|[@]sysconfdir[@]|$(sysconfdir)|g' -e \
+ 's|[@]xconfigdir[@]|$(XCONFIGDIR)|g' -e \
+ 's|[@]xkbdir[@]|$(XKB_BASE_DIRECTORY)|g' -e \
+ 's|[@]XKB_DFLT_RULES[@]|$(XKB_DFLT_RULES)|g' -e \
+ 's|[@]XKB_DFLT_MODEL[@]|$(XKB_DFLT_MODEL)|g' -e \
+ 's|[@]XKB_DFLT_LAYOUT[@]|$(XKB_DFLT_LAYOUT)|g' -e \
+ 's|[@]XKB_DFLT_VARIANT[@]|$(XKB_DFLT_VARIANT)|g' -e \
+ 's|[@]XKB_DFLT_OPTIONS[@]|$(XKB_DFLT_OPTIONS)|g' -e \
+ 's|[@]bundle_id_prefix[@]|$(BUNDLE_ID_PREFIX)|g' -e \
+ 's|[@]modulepath[@]|$(DEFAULT_MODULE_PATH)|g' -e \
+ 's|[@]suid_wrapper_dir[@]|$(SUID_WRAPPER_DIR)|g' -e \
+ 's|[@]default_font_path[@]|$(COMPILEDDEFAULTFONTPATH)|g' -e \
'\|$(COMPILEDDEFAULTFONTPATH)| s|/,|/, |g'
MISC_MAN_DIR = @MISC_MAN_DIR@
MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@
@@ -322,6 +336,7 @@ RANLIB = @RANLIB@
RAWCPP = @RAWCPP@
RAWCPPFLAGS = @RAWCPPFLAGS@
RELEASE_DATE = @RELEASE_DATE@
+SCANNER_ARG = @SCANNER_ARG@
SDK_REQUIRED_MODULES = @SDK_REQUIRED_MODULES@
SED = @SED@
SELINUX_CFLAGS = @SELINUX_CFLAGS@
@@ -340,15 +355,18 @@ SYSCONFDIR = @SYSCONFDIR@
SYSTEMD_DAEMON_CFLAGS = @SYSTEMD_DAEMON_CFLAGS@
SYSTEMD_DAEMON_LIBS = @SYSTEMD_DAEMON_LIBS@
TRADITIONALCPPFLAGS = @TRADITIONALCPPFLAGS@
-TSLIB_CFLAGS = @TSLIB_CFLAGS@
-TSLIB_LIBS = @TSLIB_LIBS@
UDEV_CFLAGS = @UDEV_CFLAGS@
UDEV_LIBS = @UDEV_LIBS@
UTILS_SYS_LIBS = @UTILS_SYS_LIBS@
VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@
VERSION = @VERSION@
+WAYLAND_EGLSTREAM_CFLAGS = @WAYLAND_EGLSTREAM_CFLAGS@
+WAYLAND_EGLSTREAM_DATADIR = @WAYLAND_EGLSTREAM_DATADIR@
+WAYLAND_EGLSTREAM_LIBS = @WAYLAND_EGLSTREAM_LIBS@
WAYLAND_PROTOCOLS_DATADIR = @WAYLAND_PROTOCOLS_DATADIR@
WAYLAND_SCANNER = @WAYLAND_SCANNER@
+WAYLAND_SCANNER_CFLAGS = @WAYLAND_SCANNER_CFLAGS@
+WAYLAND_SCANNER_LIBS = @WAYLAND_SCANNER_LIBS@
WINDOWSDRI_CFLAGS = @WINDOWSDRI_CFLAGS@
WINDOWSDRI_LIBS = @WINDOWSDRI_LIBS@
WINDOWSWM_CFLAGS = @WINDOWSWM_CFLAGS@
@@ -356,6 +374,8 @@ WINDOWSWM_LIBS = @WINDOWSWM_LIBS@
WINDRES = @WINDRES@
X11EXAMPLES_DEP_CFLAGS = @X11EXAMPLES_DEP_CFLAGS@
X11EXAMPLES_DEP_LIBS = @X11EXAMPLES_DEP_LIBS@
+XCONFIGDIR = @XCONFIGDIR@
+XCONFIGFILE = @XCONFIGFILE@
XDMCP_CFLAGS = @XDMCP_CFLAGS@
XDMCP_LIBS = @XDMCP_LIBS@
XDMXCONFIG_DEP_CFLAGS = @XDMXCONFIG_DEP_CFLAGS@
@@ -427,8 +447,6 @@ XWIN_SERVER_NAME = @XWIN_SERVER_NAME@
XWIN_SYS_LIBS = @XWIN_SYS_LIBS@
YACC = @YACC@
YFLAGS = @YFLAGS@
-__XCONFIGDIR__ = @__XCONFIGDIR__@
-__XCONFIGFILE__ = @__XCONFIGFILE__@
abi_ansic = @abi_ansic@
abi_extension = @abi_extension@
abi_videodrv = @abi_videodrv@
diff --git a/xserver/hw/xfree86/exa/man/exa.man b/xserver/hw/xfree86/exa/man/exa.man
index 42a8de31d..c051b998b 100644
--- a/xserver/hw/xfree86/exa/man/exa.man
+++ b/xserver/hw/xfree86/exa/man/exa.man
@@ -1,6 +1,6 @@
.\" shorthand for double quote that works everywhere.
.ds q \N'34'
-.TH EXA __drivermansuffix__ __vendorversion__
+.TH EXA @drivermansuffix@ @vendorversion@
.SH NAME
exa \- new 2D acceleration architecture for X.Org
.SH DESCRIPTION
@@ -36,7 +36,7 @@ default is intended to be the best performing one for general use, though others
may help with specific use cases. Available options include \*qalways\*q,
\*qgreedy\*q, and \*qsmart\*q. Default: always.
.SH "SEE ALSO"
-.BR Xorg (__appmansuffix__),
-.BR xorg.conf(__filemansuffix__).
+.BR Xorg (@appmansuffix@),
+.BR xorg.conf(@filemansuffix@).
.SH AUTHORS
Authors include: Keith Packard, Eric Anholt, Zack Rusin, and Michel D\(:anzer
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-29 08:21:21 +0000