mirror of
https://gitlab.freedesktop.org/wayland/wayland-protocols.git
synced 2025-12-20 14:00:08 +01:00
Drop autotools
It's been a few releases that we ship Meson support, we should be able to drop the old autotools build system now. Signed-off-by: Simon Ser <contact@emersion.fr>
This commit is contained in:
parent
ce82f16624
commit
61038f8a19
6 changed files with 2 additions and 166 deletions
16
.gitignore
vendored
16
.gitignore
vendored
|
|
@ -1,16 +0,0 @@
|
||||||
Makefile
|
|
||||||
Makefile.in
|
|
||||||
configure
|
|
||||||
config.guess
|
|
||||||
config.log
|
|
||||||
config.status
|
|
||||||
config.sub
|
|
||||||
compile
|
|
||||||
install-sh
|
|
||||||
missing
|
|
||||||
*.pc
|
|
||||||
autom4te.cache
|
|
||||||
aclocal.m4
|
|
||||||
*.trs
|
|
||||||
*.log
|
|
||||||
test-driver
|
|
||||||
|
|
@ -19,8 +19,8 @@ variables:
|
||||||
.debian:
|
.debian:
|
||||||
variables:
|
variables:
|
||||||
FDO_DISTRIBUTION_VERSION: bullseye
|
FDO_DISTRIBUTION_VERSION: bullseye
|
||||||
FDO_DISTRIBUTION_PACKAGES: 'build-essential automake autoconf libtool pkg-config libwayland-dev meson'
|
FDO_DISTRIBUTION_PACKAGES: 'build-essential pkg-config libwayland-dev meson'
|
||||||
FDO_DISTRIBUTION_TAG: '2021-03-24.0'
|
FDO_DISTRIBUTION_TAG: '2021-11-09.0'
|
||||||
|
|
||||||
check-commit:
|
check-commit:
|
||||||
extends:
|
extends:
|
||||||
|
|
@ -52,12 +52,3 @@ test-meson:
|
||||||
- ninja -C build
|
- ninja -C build
|
||||||
- meson test -C build
|
- meson test -C build
|
||||||
- ninja -C build install
|
- ninja -C build install
|
||||||
|
|
||||||
test-autotools:
|
|
||||||
stage: test
|
|
||||||
extends:
|
|
||||||
- .debian
|
|
||||||
- .fdo.distribution-image@debian
|
|
||||||
script:
|
|
||||||
- ./autogen.sh
|
|
||||||
- make check
|
|
||||||
|
|
|
||||||
73
Makefile.am
73
Makefile.am
|
|
@ -1,73 +0,0 @@
|
||||||
ACLOCAL_AMFLAGS = -I m4
|
|
||||||
|
|
||||||
unstable_protocols = \
|
|
||||||
unstable/pointer-gestures/pointer-gestures-unstable-v1.xml \
|
|
||||||
unstable/fullscreen-shell/fullscreen-shell-unstable-v1.xml \
|
|
||||||
unstable/linux-dmabuf/linux-dmabuf-unstable-v1.xml \
|
|
||||||
unstable/text-input/text-input-unstable-v1.xml \
|
|
||||||
unstable/text-input/text-input-unstable-v3.xml \
|
|
||||||
unstable/input-method/input-method-unstable-v1.xml \
|
|
||||||
unstable/xdg-shell/xdg-shell-unstable-v5.xml \
|
|
||||||
unstable/xdg-shell/xdg-shell-unstable-v6.xml \
|
|
||||||
unstable/relative-pointer/relative-pointer-unstable-v1.xml \
|
|
||||||
unstable/pointer-constraints/pointer-constraints-unstable-v1.xml \
|
|
||||||
unstable/tablet/tablet-unstable-v1.xml \
|
|
||||||
unstable/tablet/tablet-unstable-v2.xml \
|
|
||||||
unstable/xdg-foreign/xdg-foreign-unstable-v1.xml \
|
|
||||||
unstable/xdg-foreign/xdg-foreign-unstable-v2.xml \
|
|
||||||
unstable/idle-inhibit/idle-inhibit-unstable-v1.xml \
|
|
||||||
unstable/xwayland-keyboard-grab/xwayland-keyboard-grab-unstable-v1.xml \
|
|
||||||
unstable/keyboard-shortcuts-inhibit/keyboard-shortcuts-inhibit-unstable-v1.xml \
|
|
||||||
unstable/xdg-output/xdg-output-unstable-v1.xml \
|
|
||||||
unstable/input-timestamps/input-timestamps-unstable-v1.xml \
|
|
||||||
unstable/xdg-decoration/xdg-decoration-unstable-v1.xml \
|
|
||||||
unstable/linux-explicit-synchronization/linux-explicit-synchronization-unstable-v1.xml \
|
|
||||||
unstable/primary-selection/primary-selection-unstable-v1.xml \
|
|
||||||
$(NULL)
|
|
||||||
|
|
||||||
stable_protocols = \
|
|
||||||
stable/presentation-time/presentation-time.xml \
|
|
||||||
stable/viewporter/viewporter.xml \
|
|
||||||
stable/xdg-shell/xdg-shell.xml \
|
|
||||||
$(NULL)
|
|
||||||
|
|
||||||
staging_protocols = \
|
|
||||||
staging/drm-lease/drm-lease-v1.xml \
|
|
||||||
staging/xdg-activation/xdg-activation-v1.xml \
|
|
||||||
$(NULL)
|
|
||||||
|
|
||||||
misc_documentation = \
|
|
||||||
staging/xdg-activation/x11-interoperation.rst \
|
|
||||||
$(NULL)
|
|
||||||
|
|
||||||
nobase_dist_pkgdata_DATA = \
|
|
||||||
$(unstable_protocols) \
|
|
||||||
$(stable_protocols) \
|
|
||||||
$(staging_protocols) \
|
|
||||||
$(NULL)
|
|
||||||
|
|
||||||
dist_noinst_DATA = \
|
|
||||||
$(sort $(foreach p,$(unstable_protocols),$(dir $p)README)) \
|
|
||||||
$(sort $(foreach p,$(stable_protocols),$(dir $p)README)) \
|
|
||||||
$(sort $(foreach p,$(staging_protocols),$(dir $p)README)) \
|
|
||||||
$(misc_documentation) \
|
|
||||||
README.md \
|
|
||||||
GOVERNANCE.md \
|
|
||||||
MEMBERS.md \
|
|
||||||
meson.build \
|
|
||||||
meson_options.txt \
|
|
||||||
tests/meson.build \
|
|
||||||
tests/build-cxx.cc.in \
|
|
||||||
tests/build-pedantic.c.in \
|
|
||||||
tests/replace.py \
|
|
||||||
tests/scan.sh \
|
|
||||||
$(NULL)
|
|
||||||
|
|
||||||
noarch_pkgconfig_DATA = wayland-protocols.pc
|
|
||||||
|
|
||||||
dist_check_SCRIPTS = tests/scan.sh
|
|
||||||
|
|
||||||
TESTS = $(unstable_protocols) $(stable_protocols) $(staging_protocols)
|
|
||||||
TEST_EXTENSIONS = .xml
|
|
||||||
AM_TESTS_ENVIRONMENT = SCANNER='$(wayland_scanner)'; export SCANNER;
|
|
||||||
XML_LOG_COMPILER = $(srcdir)/tests/scan.sh
|
|
||||||
|
|
@ -1,9 +0,0 @@
|
||||||
#!/bin/sh
|
|
||||||
|
|
||||||
test -n "$srcdir" || srcdir=`dirname "$0"`
|
|
||||||
test -n "$srcdir" || srcdir=.
|
|
||||||
(
|
|
||||||
cd "$srcdir" &&
|
|
||||||
autoreconf --force -v --install
|
|
||||||
) || exit
|
|
||||||
test -n "$NOCONFIGURE" || "$srcdir/configure" "$@"
|
|
||||||
45
configure.ac
45
configure.ac
|
|
@ -1,45 +0,0 @@
|
||||||
AC_PREREQ([2.64])
|
|
||||||
|
|
||||||
m4_define([wayland_protocols_major_version], [1])
|
|
||||||
m4_define([wayland_protocols_minor_version], [23])
|
|
||||||
m4_define([wayland_protocols_version],
|
|
||||||
[wayland_protocols_major_version.wayland_protocols_minor_version])
|
|
||||||
|
|
||||||
AC_INIT([wayland-protocols],
|
|
||||||
[wayland_protocols_version],
|
|
||||||
[https://bugs.freedesktop.org/enter_bug.cgi?product=Wayland&component=wayland&version=unspecified],
|
|
||||||
[wayland-protocols],
|
|
||||||
[http://wayland.freedesktop.org/])
|
|
||||||
|
|
||||||
AC_CONFIG_MACRO_DIR([m4])
|
|
||||||
|
|
||||||
AC_SUBST([WAYLAND_PROTOCOLS_VERSION], [wayland_protocols_version])
|
|
||||||
|
|
||||||
AC_ARG_VAR([wayland_scanner], [The wayland-scanner executable])
|
|
||||||
AC_PATH_PROG([wayland_scanner], [wayland-scanner])
|
|
||||||
if test x$wayland_scanner = x; then
|
|
||||||
if test "x$cross_compiling" != "xyes"; then
|
|
||||||
PKG_CHECK_MODULES(WAYLAND_SCANNER, [wayland-scanner])
|
|
||||||
wayland_scanner=`$PKG_CONFIG --variable=wayland_scanner wayland-scanner`
|
|
||||||
else
|
|
||||||
AC_MSG_WARN([You are cross compiling without wayland-scanner in your path. make check will fail.])
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
|
|
||||||
AM_INIT_AUTOMAKE([1.11 foreign no-dist-gzip dist-xz tar-ustar])
|
|
||||||
|
|
||||||
AM_SILENT_RULES([yes])
|
|
||||||
|
|
||||||
PKG_NOARCH_INSTALLDIR
|
|
||||||
|
|
||||||
AC_CONFIG_FILES([
|
|
||||||
Makefile
|
|
||||||
wayland-protocols.pc
|
|
||||||
wayland-protocols-uninstalled.pc
|
|
||||||
])
|
|
||||||
AC_OUTPUT
|
|
||||||
|
|
||||||
AC_MSG_RESULT([
|
|
||||||
Version ${WAYLAND_PROTOCOLS_VERSION}
|
|
||||||
Prefix ${prefix}
|
|
||||||
])
|
|
||||||
12
m4/compat.m4
12
m4/compat.m4
|
|
@ -1,12 +0,0 @@
|
||||||
dnl noarch_pkgconfigdir only available in pkg-config 0.27 and newer
|
|
||||||
dnl http://lists.freedesktop.org/archives/pkg-config/2012-July/000875.html
|
|
||||||
dnl Ubuntu 14.04 provides only pkg-config 0.26 so lacks this function.
|
|
||||||
dnl
|
|
||||||
dnl The Wayland project maintains automated builds for Ubuntu 14.04 in
|
|
||||||
dnl a Launchpad PPA. 14.04 is a Long Term Support distro release, which
|
|
||||||
dnl will reach EOL April 2019, however the Wayland PPA may stop targeting
|
|
||||||
dnl it some time after the next LTS release (April 2016).
|
|
||||||
m4_ifndef([PKG_NOARCH_INSTALLDIR], [AC_DEFUN([PKG_NOARCH_INSTALLDIR], [
|
|
||||||
noarch_pkgconfigdir='${datadir}'/pkgconfig
|
|
||||||
AC_SUBST([noarch_pkgconfigdir])
|
|
||||||
])])
|
|
||||||
Loading…
Add table
Reference in a new issue