>From 8d7942e682ede90c88e28ca7f54ac86f68eeb3e8 Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Fri, 17 Jul 2020 10:55:52 +0200 Subject: [PATCH] Fix build failure during "make distcheck". * testsuite/Makefile.am (EXTRA_DIST): Remove some of the directories. Add individual files instead. * testsuite/.gitignore: New file. * testsuite/poke.libpoke/Makefile.am (EXTRA_DIST): Add libpoke.exp. * testsuite/poke.mi-json/Makefile.am (EXTRA_DIST): Add mi-json.exp. --- ChangeLog | 9 ++++++++ testsuite/.gitignore | 8 ++++++++ testsuite/Makefile.am | 42 +++++++++++++++++++++++++++++++++----- testsuite/poke.libpoke/Makefile.am | 3 +++ testsuite/poke.mi-json/Makefile.am | 3 +++ 5 files changed, 60 insertions(+), 5 deletions(-) create mode 100644 testsuite/.gitignore diff --git a/ChangeLog b/ChangeLog index fac43c2..0e2d7e9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2020-07-17 Bruno Haible + + Fix build failure during "make distcheck". + * testsuite/Makefile.am (EXTRA_DIST): Remove some of the directories. + Add individual files instead. + * testsuite/.gitignore: New file. + * testsuite/poke.libpoke/Makefile.am (EXTRA_DIST): Add libpoke.exp. + * testsuite/poke.mi-json/Makefile.am (EXTRA_DIST): Add mi-json.exp. + 2020-07-14 Kostas Chasialis * etc/pk-mi-json-schema.json (json schema) : Fixed indentation style diff --git a/testsuite/.gitignore b/testsuite/.gitignore new file mode 100644 index 0000000..be22e45 --- /dev/null +++ b/testsuite/.gitignore @@ -0,0 +1,8 @@ +# Since all files in these subdirectories are packaged into the tarballs +# (per EXTRA_DIST, see Makefile.am), they should all be committed into +# version control. Make all uncommitted files, even backup files, appear +# in the "git status" output. +!/poke.cmd/* +!/poke.map/* +!/poke.pkl/* +!/poke.std/* diff --git a/testsuite/Makefile.am b/testsuite/Makefile.am index 4410d40..31f3405 100644 --- a/testsuite/Makefile.am +++ b/testsuite/Makefile.am @@ -13,11 +13,6 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . -SUBDIRS = poke.libpoke poke.mi-json - -EXTRA_DIST = config lib poke.cmd poke.color poke.id3v1 poke.map poke.pkl \ - poke.repl poke.rgb24 poke.std poke.libpoke poke.mi-json - AUTOMAKE_OPTIONS = dejagnu check-DEJAGNU: site.exp @@ -43,3 +38,40 @@ check-DEJAGNU: site.exp >&2 echo "WARNING: could not find \`runtest'"; \ exit 77; :;\ fi + +SUBDIRS = poke.libpoke poke.mi-json + +# It is a bad practice to enumerate directories in EXTRA_DIST. Here we do it +# nevertheless, but only for directories that never contain built files. And +# we make uncommitted files in these directories visible through entries in +# .gitignore. +EXTRA_DIST = \ + poke.cmd \ + poke.map \ + poke.pkl \ + poke.std + +# This is the normal way to use EXTRA_DIST: Enumerate individual files. +EXTRA_DIST += \ + config/default.exp \ + config/unix.exp \ + lib/poke-dg.exp \ + lib/poke.exp \ + poke.color/color.exp \ + poke.color/color-1.pk \ + poke.color/color-2.pk \ + poke.color/color-3.pk \ + poke.color/color-4.pk \ + poke.id3v1/id3v1.exp \ + poke.id3v1/id3v1-1.pk \ + poke.id3v1/id3v1-2.pk \ + poke.id3v1/id3v1-3.pk \ + poke.id3v1/id3v1-4.pk \ + poke.id3v1/id3v1-5.pk \ + poke.id3v1/id3v1-6.pk \ + poke.id3v1/id3v1-7.pk \ + poke.id3v1/id3v1-8.pk \ + poke.id3v1/id3v1-9.pk \ + poke.repl/repl.exp \ + poke.rgb24/rgb24.exp \ + poke.rgb24/rgb24-1.pk diff --git a/testsuite/poke.libpoke/Makefile.am b/testsuite/poke.libpoke/Makefile.am index 95397ae..36ebf2e 100644 --- a/testsuite/poke.libpoke/Makefile.am +++ b/testsuite/poke.libpoke/Makefile.am @@ -13,6 +13,9 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . +EXTRA_DIST = \ + libpoke.exp + COMMON = term-if.h check_PROGRAMS = values diff --git a/testsuite/poke.mi-json/Makefile.am b/testsuite/poke.mi-json/Makefile.am index 2e1ae7a..86e32d8 100644 --- a/testsuite/poke.mi-json/Makefile.am +++ b/testsuite/poke.mi-json/Makefile.am @@ -15,6 +15,9 @@ AUTOMAKE_OPTIONS = subdir-objects +EXTRA_DIST = \ + mi-json.exp + if POKE_MI check_PROGRAMS = mi-json -- 2.7.4