There is no alternative to DISTCHECK_CONFIGURE_FLAGS in Meson. We could enable -Werror unconditionally but that would affect all users. It is mainly used in our CI environment so we can run meson with --werror to enable it in configure time which will be picked up by meson dist as well. XZ_OPT is not relevant with meson since it uses shutil.make_archive which uses lzma python module to do the compression. Introducing rpm and srpm rules should be possible with Meson but we don't even use them in our CI and it's easy to run 'ninja dist' followed by rpmbuild manually. As for the ci rules that is simply not possible in the same way, we would have to have a lot of aliases for all the ci rules and that would be just insane. Signed-off-by: Pavel Hrdina <phrdina@xxxxxxxxxx> --- Makefile.am | 35 ----------------------------------- configure.ac | 2 -- 2 files changed, 37 deletions(-) delete mode 100644 Makefile.am diff --git a/Makefile.am b/Makefile.am deleted file mode 100644 index 7490acbcfba..00000000000 --- a/Makefile.am +++ /dev/null @@ -1,35 +0,0 @@ -## Process this file with automake to produce Makefile.in - -## Copyright (C) 2005-2013 Red Hat, Inc. -## -## This library is free software; you can redistribute it and/or -## modify it under the terms of the GNU Lesser General Public -## License as published by the Free Software Foundation; either -## version 2.1 of the License, or (at your option) any later version. -## -## This library is distributed in the hope that it will be useful, -## but WITHOUT ANY WARRANTY; without even the implied warranty of -## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -## Lesser General Public License for more details. -## -## You should have received a copy of the GNU Lesser General Public -## License along with this library. If not, see -## <http://www.gnu.org/licenses/>. - -# when building from tarball -Werror isn't auto enabled -# so force it explicitly -DISTCHECK_CONFIGURE_FLAGS = --enable-werror - -SUBDIRS = . - -XZ_OPT ?= -v -T0 -export XZ_OPT - -rpm: clean - @(unset CDPATH ; $(MAKE) dist && rpmbuild -ta $(distdir).tar.xz) - -srpm: clean - @(unset CDPATH ; $(MAKE) dist && rpmbuild -ts $(distdir).tar.xz) - -ci-%: - $(MAKE) -C $(srcdir)/ci/ $@ diff --git a/configure.ac b/configure.ac index 4ba70bb43b5..3a88a0e0154 100644 --- a/configure.ac +++ b/configure.ac @@ -103,6 +103,4 @@ m4_if(m4_version_compare([2.61a.100], [AC_CONFIG_LINKS([$GNUmakefile:$GNUmakefile], [], [GNUmakefile=$GNUmakefile])]) -AC_CONFIG_FILES([\ - Makefile]) AC_OUTPUT -- 2.26.2
