On Wed, Oct 11, 2017 at 11:13:02AM +0200, Olivier Fourdan wrote: > Hi, > > On 11 October 2017 at 11:00, Jonas Ådahl <[email protected]> wrote: > > > It has been replaced by meson. > > --- > > .gitignore | 16 ---------------- > > Makefile.am | 43 ------------------------------------------- > > configure.ac | 45 --------------------------------------------- > > m4/compat.m4 | 12 ------------ > > 4 files changed, 116 deletions(-) > > delete mode 100644 Makefile.am > > delete mode 100644 configure.ac > > delete mode 100644 m4/compat.m4 > > > > diff --git a/.gitignore b/.gitignore > > index 794539b..e69de29 100644 > > --- a/.gitignore > > +++ b/.gitignore > > @@ -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 > > diff --git a/Makefile.am b/Makefile.am > > deleted file mode 100644 > > index 0296d5d..0000000 > > --- a/Makefile.am > > +++ /dev/null > > @@ -1,43 +0,0 @@ > > -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/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 > > \ > > - $(NULL) > > - > > -stable_protocols = > > \ > > - stable/presentation-time/presentation-time.xml > > \ > > - stable/viewporter/viewporter.xml > > \ > > - $(NULL) > > - > > -nobase_dist_pkgdata_DATA = > > \ > > - $(unstable_protocols) > > \ > > - $(stable_protocols) > > \ > > - $(NULL) > > - > > -dist_noinst_DATA = > > \ > > - $(sort $(foreach p,$(unstable_protocols),$(dir $p)README)) > > \ > > - $(sort $(foreach p,$(stable_protocols),$(dir $p)README)) > > \ > > - $(NULL) > > - > > -noarch_pkgconfig_DATA = wayland-protocols.pc > > - > > -dist_check_SCRIPTS = tests/scan.sh > > - > > -TESTS = $(unstable_protocols) $(stable_protocols) > > -TEST_EXTENSIONS = .xml > > -AM_TESTS_ENVIRONMENT = SCANNER='$(wayland_scanner)'; export SCANNER; > > -XML_LOG_COMPILER = $(srcdir)/tests/scan.sh > > diff --git a/configure.ac b/configure.ac > > deleted file mode 100644 > > index 39d54a9..0000000 > > --- a/configure.ac > > +++ /dev/null > > @@ -1,45 +0,0 @@ > > -AC_PREREQ([2.64]) > > - > > -m4_define([wayland_protocols_major_version], [1]) > > -m4_define([wayland_protocols_minor_version], [11]) > > -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} > > - ]) > > diff --git a/m4/compat.m4 b/m4/compat.m4 > > deleted file mode 100644 > > index 290ef03..0000000 > > --- a/m4/compat.m4 > > +++ /dev/null > > @@ -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]) > > -])]) > > -- > > > > The autotools in wayland-protocols are trivial, can't we keep it around? > Meson may not be avaialble in older distros, and other projects (xserver, > mesa) keep both and have much more complex directory structures than > wayland-protocols.
I guess that is an option, at least temporarily. I suspect you'd need to support meson and what it brings in on older distros eventually either way though, as libinput already switched, and wayland/weston will eventually too. > > Besides, wayland-protocol doesn't compile/link anything at all, I'm not > sure what meson buys us here (other than being trendy). It does now, as part of the test suite. FWIW, I first opened Makefile.am and started typing when trying to add the various build testing I wanted to add, but quickly gave trying to fight with autotools yet another time. Jonas > > Cheers, > Olivier _______________________________________________ wayland-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/wayland-devel
