From 1bb80c18da6603e97316c89ebad7f3c73ef6d810 Mon Sep 17 00:00:00 2001 From: Martijn van Beurden Date: Wed, 18 May 2022 20:27:10 +0200 Subject: [PATCH] Small make distcheck fixes --- Makefile.am | 10 ++++++---- include/share/Makefile.am | 3 +-- src/libFLAC/Makefile.am | 1 - test/flac-to-flac-metadata-test-files/Makefile.am | 3 +++ test/test_flac.sh | 2 +- 5 files changed, 11 insertions(+), 8 deletions(-) diff --git a/Makefile.am b/Makefile.am index 9095675b..59654e25 100644 --- a/Makefile.am +++ b/Makefile.am @@ -41,14 +41,16 @@ EXTRA_DIST = \ CMakeLists.txt \ config.cmake.h.in \ flac-config.cmake.in \ - cmake/FindOgg.cmake \ - cmake/UseSystemExtensions.cmake \ - cmake/CheckCPUArch.cmake \ - cmake/CheckCPUArch.c.in \ + cmake/CheckA64NEON.c.in \ + cmake/CheckA64NEON.cmake \ cmake/CheckAttribute.c.in \ cmake/CheckAttribute.cmake \ + cmake/CheckCPUArch.c.in \ + cmake/CheckCPUArch.cmake \ cmake/CheckVSX.c.in \ cmake/CheckVSX.cmake \ + cmake/FindOgg.cmake \ + cmake/UseSystemExtensions.cmake \ COPYING.FDL \ COPYING.GPL \ COPYING.LGPL \ diff --git a/include/share/Makefile.am b/include/share/Makefile.am index 2d8ca503..a6a3ca0f 100644 --- a/include/share/Makefile.am +++ b/include/share/Makefile.am @@ -14,5 +14,4 @@ EXTRA_DIST = \ replaygain_synthesis.h \ safe_str.h \ utf8.h \ - win_utf8_io.h \ - windows_unicode_filenames.h + win_utf8_io.h diff --git a/src/libFLAC/Makefile.am b/src/libFLAC/Makefile.am index 8e182b77..5643bfc0 100644 --- a/src/libFLAC/Makefile.am +++ b/src/libFLAC/Makefile.am @@ -76,7 +76,6 @@ EXTRA_DIST = \ Makefile.lite \ flac.pc.in \ libFLAC.m4 \ - windows_unicode_filenames.c \ deduplication/lpc_compute_autocorrelation_intrin_sse2.c \ deduplication/lpc_compute_autocorrelation_intrin_vsx.c \ deduplication/lpc_compute_autocorrelation_intrin_neon.c diff --git a/test/flac-to-flac-metadata-test-files/Makefile.am b/test/flac-to-flac-metadata-test-files/Makefile.am index fc96f824..2c1cfd3c 100644 --- a/test/flac-to-flac-metadata-test-files/Makefile.am +++ b/test/flac-to-flac-metadata-test-files/Makefile.am @@ -40,6 +40,9 @@ EXTRA_DIST = \ input-SCVPAP.flac \ input-SVAUP.flac \ input-VA.flac \ + 🤔.flac \ + Prøve.flac \ + שלום.flac \ input0.cue clean-local: diff --git a/test/test_flac.sh b/test/test_flac.sh index 3e5f982e..221aaf3b 100755 --- a/test/test_flac.sh +++ b/test/test_flac.sh @@ -1311,7 +1311,7 @@ test_utf8_handling () else die "Encoding failed" fi - rm $1 out.wav + rm -f $1 out.wav } if [ "$WIN32BUSYBOX" != "yes" ]; then