From 8828033cc48fccc02729c9261e8f38033540b048 Mon Sep 17 00:00:00 2001 From: Erik de Castro Lopo Date: Sun, 29 Sep 2019 11:57:21 +1000 Subject: Make sure CMake build files end up in release tarball --- Makefile.am | 5 +++++ doc/Makefile.am | 2 +- doc/html/Makefile.am | 2 +- doc/html/images/Makefile.am | 2 +- examples/Makefile.am | 1 + examples/c/Makefile.am | 2 ++ examples/c/decode/file/Makefile.am | 1 + examples/c/encode/file/Makefile.am | 1 + examples/cpp/Makefile.am | 2 ++ examples/cpp/decode/file/Makefile.am | 1 + examples/cpp/encode/file/Makefile.am | 1 + microbench/Makefile.am | 2 ++ src/Makefile.am | 1 + src/flac/Makefile.am | 1 + src/libFLAC++/Makefile.am | 1 + src/libFLAC/Makefile.am | 1 + src/libFLAC/ia32/Makefile.am | 2 ++ src/metaflac/Makefile.am | 1 + src/plugin_common/Makefile.am | 1 + src/plugin_xmms/Makefile.am | 1 + src/share/Makefile.am | 7 +++++++ src/test_grabbag/Makefile.am | 1 + src/test_grabbag/cuesheet/Makefile.am | 1 + src/test_grabbag/picture/Makefile.am | 1 + src/test_libFLAC++/Makefile.am | 1 + src/test_libFLAC/Makefile.am | 1 + src/test_libs_common/Makefile.am | 1 + src/test_seeking/Makefile.am | 1 + src/test_streams/Makefile.am | 1 + src/utils/Makefile.am | 2 ++ src/utils/flacdiff/Makefile.am | 1 + src/utils/flactimer/Makefile.am | 1 + test/Makefile.am | 1 + 33 files changed, 48 insertions(+), 3 deletions(-) diff --git a/Makefile.am b/Makefile.am index 19899cd4..83e0140f 100644 --- a/Makefile.am +++ b/Makefile.am @@ -38,6 +38,11 @@ SUBDIRS += examples endif EXTRA_DIST = \ + CMakeLists.txt \ + config.cmake.h.in \ + flac-config.cmake.in \ + cmake/FindOGG.cmake \ + cmake/UseSystemExtensions.cmake \ COPYING.FDL \ COPYING.GPL \ COPYING.LGPL \ diff --git a/doc/Makefile.am b/doc/Makefile.am index bc9ae52a..8e972594 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -35,7 +35,7 @@ doc_DATA = \ FLAC.tag EXTRA_DIST = Doxyfile.in Makefile.lite doxygen.footer.html doxygen.header.html \ - isoflac.txt $(doc_DATA) + isoflac.txt $(doc_DATA) CMakeLists.txt distclean-local: rm -rf FLAC.tag html/api doxytmp diff --git a/doc/html/Makefile.am b/doc/html/Makefile.am index 2c73fdbb..3a274ef5 100644 --- a/doc/html/Makefile.am +++ b/doc/html/Makefile.am @@ -38,7 +38,7 @@ html_DATA = \ license.html \ ogg_mapping.html -EXTRA_DIST = $(html_DATA) api +EXTRA_DIST = $(html_DATA) api CMakeLists.txt if FLaC__HAS_DOXYGEN # The install targets don't copy whole directories so we have to diff --git a/doc/html/images/Makefile.am b/doc/html/images/Makefile.am index 467651cd..04ad59aa 100644 --- a/doc/html/images/Makefile.am +++ b/doc/html/images/Makefile.am @@ -22,4 +22,4 @@ logos_DATA = \ logo.svg \ logo130.gif -EXTRA_DIST = $(logos_DATA) +EXTRA_DIST = $(logos_DATA) CMakeLists.txt diff --git a/examples/Makefile.am b/examples/Makefile.am index efad1616..9ae4f156 100644 --- a/examples/Makefile.am +++ b/examples/Makefile.am @@ -23,5 +23,6 @@ endif SUBDIRS = c $(CPPLIBS_DIRS) EXTRA_DIST = \ + CMakeLists.txt \ Makefile.lite \ README diff --git a/examples/c/Makefile.am b/examples/c/Makefile.am index e44ad017..b3f58bb3 100644 --- a/examples/c/Makefile.am +++ b/examples/c/Makefile.am @@ -17,3 +17,5 @@ # distribution. SUBDIRS = decode encode + +EXTRA_DIST = CMakeLists.txt diff --git a/examples/c/decode/file/Makefile.am b/examples/c/decode/file/Makefile.am index 7f4c9220..da1bae12 100644 --- a/examples/c/decode/file/Makefile.am +++ b/examples/c/decode/file/Makefile.am @@ -17,6 +17,7 @@ # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. EXTRA_DIST = \ + CMakeLists.txt \ Makefile.lite \ example_c_decode_file.vcproj \ example_c_decode_file.vcxproj \ diff --git a/examples/c/encode/file/Makefile.am b/examples/c/encode/file/Makefile.am index 8c247a6f..17a4491c 100644 --- a/examples/c/encode/file/Makefile.am +++ b/examples/c/encode/file/Makefile.am @@ -17,6 +17,7 @@ # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. EXTRA_DIST = \ + CMakeLists.txt \ Makefile.lite \ example_c_encode_file.vcproj \ example_c_encode_file.vcxproj \ diff --git a/examples/cpp/Makefile.am b/examples/cpp/Makefile.am index e44ad017..b3f58bb3 100644 --- a/examples/cpp/Makefile.am +++ b/examples/cpp/Makefile.am @@ -17,3 +17,5 @@ # distribution. SUBDIRS = decode encode + +EXTRA_DIST = CMakeLists.txt diff --git a/examples/cpp/decode/file/Makefile.am b/examples/cpp/decode/file/Makefile.am index 31ad6d3a..bde9cb2e 100644 --- a/examples/cpp/decode/file/Makefile.am +++ b/examples/cpp/decode/file/Makefile.am @@ -17,6 +17,7 @@ # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. EXTRA_DIST = \ + CMakeLists.txt \ Makefile.lite \ example_cpp_decode_file.vcproj \ example_cpp_decode_file.vcxproj \ diff --git a/examples/cpp/encode/file/Makefile.am b/examples/cpp/encode/file/Makefile.am index 972e09ac..598c765c 100644 --- a/examples/cpp/encode/file/Makefile.am +++ b/examples/cpp/encode/file/Makefile.am @@ -17,6 +17,7 @@ # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. EXTRA_DIST = \ + CMakeLists.txt \ Makefile.lite \ example_cpp_encode_file.vcproj \ example_cpp_encode_file.vcxproj \ diff --git a/microbench/Makefile.am b/microbench/Makefile.am index 9ab6a040..8bad781b 100644 --- a/microbench/Makefile.am +++ b/microbench/Makefile.am @@ -38,3 +38,5 @@ noinst_PROGRAMS = benchmark_residual benchmark_residual_SOURCES = benchmark_residual.c util.c benchmark_residual_LDADD = @LIB_CLOCK_GETTIME@ + +EXTRA_DIST = CMakeLists.txt diff --git a/src/Makefile.am b/src/Makefile.am index 01417362..fcc3cfbf 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -39,4 +39,5 @@ SUBDIRS = \ $(CPPLIBS_DIRS) EXTRA_DIST = \ + CMakeLists.txt \ Makefile.lite diff --git a/src/flac/Makefile.am b/src/flac/Makefile.am index fe6fa489..679e2ee9 100644 --- a/src/flac/Makefile.am +++ b/src/flac/Makefile.am @@ -21,6 +21,7 @@ bin_PROGRAMS = flac AM_CFLAGS = @OGG_CFLAGS@ AM_CPPFLAGS = -I$(top_builddir) -I$(srcdir)/include -I$(top_srcdir)/include EXTRA_DIST = \ + CMakeLists.txt \ Makefile.lite \ Makefile.lite.iffscan \ flac.vcproj \ diff --git a/src/libFLAC++/Makefile.am b/src/libFLAC++/Makefile.am index 41b9576d..763b8b20 100644 --- a/src/libFLAC++/Makefile.am +++ b/src/libFLAC++/Makefile.am @@ -38,6 +38,7 @@ pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = flac++.pc AM_CPPFLAGS = -I$(top_builddir) -I$(srcdir)/include -I$(top_srcdir)/include EXTRA_DIST = \ + CMakeLists.txt \ Makefile.lite \ flac++.pc.in \ libFLAC++_dynamic.vcproj \ diff --git a/src/libFLAC/Makefile.am b/src/libFLAC/Makefile.am index f0f32f04..468939d5 100644 --- a/src/libFLAC/Makefile.am +++ b/src/libFLAC/Makefile.am @@ -72,6 +72,7 @@ pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = flac.pc EXTRA_DIST = \ + CMakeLists.txt \ Makefile.lite \ flac.pc.in \ libFLAC_dynamic.vcproj \ diff --git a/src/libFLAC/ia32/Makefile.am b/src/libFLAC/ia32/Makefile.am index 5b4880bf..fd3d95ac 100644 --- a/src/libFLAC/ia32/Makefile.am +++ b/src/libFLAC/ia32/Makefile.am @@ -42,3 +42,5 @@ libFLAC_asm_la_SOURCES = \ fixed_asm.nasm \ lpc_asm.nasm \ nasm.h + +EXTRA_DIST = CMakeLists.txt diff --git a/src/metaflac/Makefile.am b/src/metaflac/Makefile.am index ec201ddf..3393ec8a 100644 --- a/src/metaflac/Makefile.am +++ b/src/metaflac/Makefile.am @@ -21,6 +21,7 @@ bin_PROGRAMS = metaflac AM_CFLAGS = @OGG_CFLAGS@ AM_CPPFLAGS = -I$(top_builddir) -I$(srcdir)/include -I$(top_srcdir)/include EXTRA_DIST = \ + CMakeLists.txt \ Makefile.lite \ metaflac.vcproj \ metaflac.vcxproj \ diff --git a/src/plugin_common/Makefile.am b/src/plugin_common/Makefile.am index a528fb45..2c41f5bc 100644 --- a/src/plugin_common/Makefile.am +++ b/src/plugin_common/Makefile.am @@ -35,5 +35,6 @@ libplugin_common_la_SOURCES = \ tags.c EXTRA_DIST = \ + CMakeLists.txt \ Makefile.lite \ README diff --git a/src/plugin_xmms/Makefile.am b/src/plugin_xmms/Makefile.am index e80b66a4..3d011a31 100644 --- a/src/plugin_xmms/Makefile.am +++ b/src/plugin_xmms/Makefile.am @@ -21,6 +21,7 @@ # EXTRA_DIST = \ + CMakeLists.txt \ Makefile.lite noinst_HEADERS = \ diff --git a/src/share/Makefile.am b/src/share/Makefile.am index 8e3984a1..00724ec5 100644 --- a/src/share/Makefile.am +++ b/src/share/Makefile.am @@ -21,24 +21,30 @@ AUTOMAKE_OPTIONS = subdir-objects AM_CPPFLAGS = -I$(top_builddir) -I$(srcdir)/include -I$(top_srcdir)/include EXTRA_DIST = \ + CMakeLists.txt \ Makefile.lite \ README \ + getopt/CMakeLists.txt \ getopt/Makefile.lite \ getopt/getopt_static.vcproj \ getopt/getopt_static.vcxproj \ getopt/getopt_static.vcxproj.filters \ + grabbag/CMakeLists.txt \ grabbag/Makefile.lite \ grabbag/grabbag_static.vcproj \ grabbag/grabbag_static.vcxproj \ grabbag/grabbag_static.vcxproj.filters \ + replaygain_analysis/CMakeLists.txt \ replaygain_analysis/Makefile.lite \ replaygain_analysis/replaygain_analysis_static.vcproj \ replaygain_analysis/replaygain_analysis_static.vcxproj \ replaygain_analysis/replaygain_analysis_static.vcxproj.filters \ + replaygain_synthesis/CMakeLists.txt \ replaygain_synthesis/Makefile.lite \ replaygain_synthesis/replaygain_synthesis_static.vcproj \ replaygain_synthesis/replaygain_synthesis_static.vcxproj \ replaygain_synthesis/replaygain_synthesis_static.vcxproj.filters \ + utf8/CMakeLists.txt \ utf8/Makefile.lite \ utf8/charmaps.h \ utf8/makemap.c \ @@ -46,6 +52,7 @@ EXTRA_DIST = \ utf8/utf8_static.vcproj \ utf8/utf8_static.vcxproj \ utf8/utf8_static.vcxproj.filters \ + win_utf8_io/CMakeLists.txt \ win_utf8_io/Makefile.lite \ win_utf8_io/win_utf8_io_static.vcproj \ win_utf8_io/win_utf8_io_static.vcxproj \ diff --git a/src/test_grabbag/Makefile.am b/src/test_grabbag/Makefile.am index ca226771..c13ca3b7 100644 --- a/src/test_grabbag/Makefile.am +++ b/src/test_grabbag/Makefile.am @@ -19,4 +19,5 @@ SUBDIRS = cuesheet picture EXTRA_DIST = \ + CMakeLists.txt \ Makefile.lite diff --git a/src/test_grabbag/cuesheet/Makefile.am b/src/test_grabbag/cuesheet/Makefile.am index 59ae71f4..6b88be4b 100644 --- a/src/test_grabbag/cuesheet/Makefile.am +++ b/src/test_grabbag/cuesheet/Makefile.am @@ -17,6 +17,7 @@ # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. EXTRA_DIST = \ + CMakeLists.txt \ Makefile.lite \ test_cuesheet.vcproj \ test_cuesheet.vcxproj \ diff --git a/src/test_grabbag/picture/Makefile.am b/src/test_grabbag/picture/Makefile.am index 394b6eb0..36b79f84 100644 --- a/src/test_grabbag/picture/Makefile.am +++ b/src/test_grabbag/picture/Makefile.am @@ -17,6 +17,7 @@ # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. EXTRA_DIST = \ + CMakeLists.txt \ Makefile.lite \ test_picture.vcproj \ test_picture.vcxproj \ diff --git a/src/test_libFLAC++/Makefile.am b/src/test_libFLAC++/Makefile.am index e4b0f76c..3183be73 100644 --- a/src/test_libFLAC++/Makefile.am +++ b/src/test_libFLAC++/Makefile.am @@ -17,6 +17,7 @@ # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. EXTRA_DIST = \ + CMakeLists.txt \ Makefile.lite \ test_libFLAC++.vcproj \ test_libFLAC++.vcxproj \ diff --git a/src/test_libFLAC/Makefile.am b/src/test_libFLAC/Makefile.am index 44823fbc..1a361a1b 100644 --- a/src/test_libFLAC/Makefile.am +++ b/src/test_libFLAC/Makefile.am @@ -17,6 +17,7 @@ # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. EXTRA_DIST = \ + CMakeLists.txt \ Makefile.lite \ test_libFLAC.vcproj \ test_libFLAC.vcxproj \ diff --git a/src/test_libs_common/Makefile.am b/src/test_libs_common/Makefile.am index 2bd11c96..a72530ee 100644 --- a/src/test_libs_common/Makefile.am +++ b/src/test_libs_common/Makefile.am @@ -25,6 +25,7 @@ libtest_libs_common_la_SOURCES = \ metadata_utils.c EXTRA_DIST = \ + CMakeLists.txt \ Makefile.lite \ README \ test_libs_common_static.vcproj \ diff --git a/src/test_seeking/Makefile.am b/src/test_seeking/Makefile.am index b7dd852c..a42d78d5 100644 --- a/src/test_seeking/Makefile.am +++ b/src/test_seeking/Makefile.am @@ -17,6 +17,7 @@ # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. EXTRA_DIST = \ + CMakeLists.txt \ Makefile.lite \ test_seeking.vcproj \ test_seeking.vcxproj \ diff --git a/src/test_streams/Makefile.am b/src/test_streams/Makefile.am index fd66342c..ef444ae2 100644 --- a/src/test_streams/Makefile.am +++ b/src/test_streams/Makefile.am @@ -17,6 +17,7 @@ # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. EXTRA_DIST = \ + CMakeLists.txt \ Makefile.lite \ test_streams.vcproj \ test_streams.vcxproj \ diff --git a/src/utils/Makefile.am b/src/utils/Makefile.am index 7696a6cd..9ea289be 100644 --- a/src/utils/Makefile.am +++ b/src/utils/Makefile.am @@ -17,3 +17,5 @@ # distribution. SUBDIRS = flacdiff flactimer + +EXTRA_DIST = CMakeLists.txt diff --git a/src/utils/flacdiff/Makefile.am b/src/utils/flacdiff/Makefile.am index 91912429..65f49d78 100644 --- a/src/utils/flacdiff/Makefile.am +++ b/src/utils/flacdiff/Makefile.am @@ -17,6 +17,7 @@ # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. EXTRA_DIST = \ + CMakeLists.txt \ Makefile.lite \ flacdiff.vcproj \ flacdiff.vcxproj \ diff --git a/src/utils/flactimer/Makefile.am b/src/utils/flactimer/Makefile.am index 3d9e91f4..cfe209cb 100644 --- a/src/utils/flactimer/Makefile.am +++ b/src/utils/flactimer/Makefile.am @@ -17,6 +17,7 @@ # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. EXTRA_DIST = \ + CMakeLists.txt \ Makefile.lite \ flactimer.vcproj \ flactimer.vcxproj \ diff --git a/test/Makefile.am b/test/Makefile.am index 78a6892a..dcd911d9 100644 --- a/test/Makefile.am +++ b/test/Makefile.am @@ -49,6 +49,7 @@ endif @echo "----------------" EXTRA_DIST = \ + CMakeLists.txt \ Makefile.lite \ cuesheet.ok \ metaflac.flac.in \ -- cgit v1.2.1