From 31948291a230685ee12af88c35d53a671e0d968f Mon Sep 17 00:00:00 2001 From: Erik de Castro Lopo Date: Wed, 9 Jul 2014 19:02:35 +1000 Subject: [PATCH] Makefile.ams: Add MSVS project files to EXTRA_DIST. Patch-from: lvqcl --- Makefile.am | 1 + examples/c/decode/file/Makefile.am | 4 +++- examples/c/encode/file/Makefile.am | 4 +++- examples/cpp/decode/file/Makefile.am | 4 +++- examples/cpp/encode/file/Makefile.am | 4 +++- src/flac/Makefile.am | 6 +++++- src/libFLAC++/Makefile.am | 4 ++++ src/libFLAC/Makefile.am | 4 ++++ src/metaflac/Makefile.am | 4 +++- src/plugin_common/Makefile.am | 4 +++- src/share/Makefile.am | 14 +++++++++++++- src/share/utf8/Makefile.am | 4 +++- src/test_grabbag/cuesheet/Makefile.am | 4 +++- src/test_grabbag/picture/Makefile.am | 4 +++- src/test_libFLAC++/Makefile.am | 4 +++- src/test_libFLAC/Makefile.am | 4 +++- src/test_libs_common/Makefile.am | 4 +++- src/test_seeking/Makefile.am | 4 +++- src/test_streams/Makefile.am | 4 +++- src/utils/flacdiff/Makefile.am | 2 ++ src/utils/flactimer/Makefile.am | 2 ++ 21 files changed, 73 insertions(+), 16 deletions(-) diff --git a/Makefile.am b/Makefile.am index 451921da..9cf9e3e0 100644 --- a/Makefile.am +++ b/Makefile.am @@ -39,6 +39,7 @@ EXTRA_DIST = \ COPYING.LGPL \ COPYING.Xiph \ FLAC.sln \ + FLAC-vs2010.sln \ Makefile.lite \ autogen.sh \ config.rpath \ diff --git a/examples/c/decode/file/Makefile.am b/examples/c/decode/file/Makefile.am index 37f16123..ebad2dda 100644 --- a/examples/c/decode/file/Makefile.am +++ b/examples/c/decode/file/Makefile.am @@ -18,7 +18,9 @@ EXTRA_DIST = \ Makefile.lite \ - example_c_decode_file.vcproj + example_c_decode_file.vcproj \ + example_c_decode_file.vcxproj \ + example_c_decode_file.vcxproj.filters AM_CPPFLAGS = -I$(top_builddir) -I$(srcdir)/include -I$(top_srcdir)/include noinst_PROGRAMS = example_c_decode_file diff --git a/examples/c/encode/file/Makefile.am b/examples/c/encode/file/Makefile.am index c2b3f5da..4faa4b57 100644 --- a/examples/c/encode/file/Makefile.am +++ b/examples/c/encode/file/Makefile.am @@ -18,7 +18,9 @@ EXTRA_DIST = \ Makefile.lite \ - example_c_encode_file.vcproj + example_c_encode_file.vcproj \ + example_c_encode_file.vcxproj \ + example_c_encode_file.vcxproj.filters AM_CPPFLAGS = -I$(top_builddir) -I$(srcdir)/include -I$(top_srcdir)/include noinst_PROGRAMS = example_c_encode_file diff --git a/examples/cpp/decode/file/Makefile.am b/examples/cpp/decode/file/Makefile.am index 330d4224..8b167a71 100644 --- a/examples/cpp/decode/file/Makefile.am +++ b/examples/cpp/decode/file/Makefile.am @@ -18,7 +18,9 @@ EXTRA_DIST = \ Makefile.lite \ - example_cpp_decode_file.vcproj + example_cpp_decode_file.vcproj \ + example_cpp_decode_file.vcxproj \ + example_cpp_decode_file.vcxproj.filters AM_CPPFLAGS = -I$(top_builddir) -I$(srcdir)/include -I$(top_srcdir)/include noinst_PROGRAMS = example_cpp_decode_file diff --git a/examples/cpp/encode/file/Makefile.am b/examples/cpp/encode/file/Makefile.am index 5c9183f1..dafa1dd8 100644 --- a/examples/cpp/encode/file/Makefile.am +++ b/examples/cpp/encode/file/Makefile.am @@ -18,7 +18,9 @@ EXTRA_DIST = \ Makefile.lite \ - example_cpp_encode_file.vcproj + example_cpp_encode_file.vcproj \ + example_cpp_encode_file.vcxproj \ + example_cpp_encode_file.vcxproj.filters AM_CPPFLAGS = -I$(top_builddir) -I$(srcdir)/include -I$(top_srcdir)/include noinst_PROGRAMS = example_cpp_encode_file diff --git a/src/flac/Makefile.am b/src/flac/Makefile.am index 389215e2..fbef2a19 100644 --- a/src/flac/Makefile.am +++ b/src/flac/Makefile.am @@ -24,8 +24,12 @@ EXTRA_DIST = \ Makefile.lite \ Makefile.lite.iffscan \ flac.vcproj \ + flac.vcxproj \ + flac.vcxproj.filters \ iffscan.c \ - iffscan.vcproj + iffscan.vcproj \ + iffscan.vcxproj \ + iffscan.vcxproj.filters flac_SOURCES = \ analyze.c \ diff --git a/src/libFLAC++/Makefile.am b/src/libFLAC++/Makefile.am index b84f3e4f..ed052f81 100644 --- a/src/libFLAC++/Makefile.am +++ b/src/libFLAC++/Makefile.am @@ -41,7 +41,11 @@ EXTRA_DIST = \ Makefile.lite \ flac++.pc.in \ libFLAC++_dynamic.vcproj \ + libFLAC++_dynamic.vcxproj \ + libFLAC++_dynamic.vcxproj.filters \ libFLAC++_static.vcproj \ + libFLAC++_static.vcxproj \ + libFLAC++_static.vcxproj.filters \ libFLAC++.m4 # see 'http://www.gnu.org/software/libtool/manual/libtool.html#Libtool-versioning' for numbering convention diff --git a/src/libFLAC/Makefile.am b/src/libFLAC/Makefile.am index b6e1f471..0fcd64ee 100644 --- a/src/libFLAC/Makefile.am +++ b/src/libFLAC/Makefile.am @@ -100,7 +100,11 @@ EXTRA_DIST = \ Makefile.lite \ flac.pc.in \ libFLAC_dynamic.vcproj \ + libFLAC_dynamic.vcxproj \ + libFLAC_dynamic.vcxproj.filters \ libFLAC_static.vcproj \ + libFLAC_static.vcxproj \ + libFLAC_static.vcxproj.filters \ libFLAC.m4 if FLaC__HAS_OGG diff --git a/src/metaflac/Makefile.am b/src/metaflac/Makefile.am index d6e76e84..3f1b485a 100644 --- a/src/metaflac/Makefile.am +++ b/src/metaflac/Makefile.am @@ -22,7 +22,9 @@ AM_CFLAGS = @OGG_CFLAGS@ AM_CPPFLAGS = -I$(top_builddir) -I$(srcdir)/include -I$(top_srcdir)/include EXTRA_DIST = \ Makefile.lite \ - metaflac.vcproj + metaflac.vcproj \ + metaflac.vcxproj \ + metaflac.vcxproj.filters metaflac_SOURCES = \ main.c \ diff --git a/src/plugin_common/Makefile.am b/src/plugin_common/Makefile.am index dcf02984..9cd87aa1 100644 --- a/src/plugin_common/Makefile.am +++ b/src/plugin_common/Makefile.am @@ -37,7 +37,9 @@ libplugin_common_la_SOURCES = \ EXTRA_DIST = \ Makefile.lite \ README \ - plugin_common_static.vcproj + plugin_common_static.vcproj \ + plugin_common_static.vcxproj \ + plugin_common_static.vcxproj.filters debug: $(MAKE) all CFLAGS="@DEBUG@" diff --git a/src/share/Makefile.am b/src/share/Makefile.am index 3eca1346..b7f54cfa 100644 --- a/src/share/Makefile.am +++ b/src/share/Makefile.am @@ -25,12 +25,20 @@ EXTRA_DIST = \ README \ getopt/Makefile.lite \ getopt/getopt_static.vcproj \ + getopt/getopt_static.vcxproj \ + getopt/getopt_static.vcxproj.filters \ grabbag/Makefile.lite \ grabbag/grabbag_static.vcproj \ + grabbag/grabbag_static.vcxproj \ + grabbag/grabbag_static.vcxproj.filters \ 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/Makefile.lite \ replaygain_synthesis/replaygain_synthesis_static.vcproj \ + replaygain_synthesis/replaygain_synthesis_static.vcxproj \ + replaygain_synthesis/replaygain_synthesis_static.vcxproj.filters \ utf8/Makefile.lite \ utf8/charmaps.h \ utf8/makemap.c \ @@ -38,7 +46,11 @@ EXTRA_DIST = \ utf8/charsetmap.h \ utf8/iconvert.h \ utf8/utf8_static.vcproj \ - win_utf8_io/win_utf8_io_static.vcproj + utf8/utf8_static.vcxproj \ + utf8/utf8_static.vcxproj.filters \ + win_utf8_io/win_utf8_io_static.vcproj \ + win_utf8_io/win_utf8_io_static.vcxproj \ + win_utf8_io/win_utf8_io_static.vcxproj.filters noinst_LTLIBRARIES = \ diff --git a/src/share/utf8/Makefile.am b/src/share/utf8/Makefile.am index 50226ca7..edf7612e 100644 --- a/src/share/utf8/Makefile.am +++ b/src/share/utf8/Makefile.am @@ -28,7 +28,9 @@ EXTRA_DIST = \ charset_test.c \ charsetmap.h \ iconvert.h \ - utf8_static.vcproj + utf8_static.vcproj \ + utf8_static.vcxproj \ + utf8_static.vcxproj.filters debug: $(MAKE) all CFLAGS="@DEBUG@" diff --git a/src/test_grabbag/cuesheet/Makefile.am b/src/test_grabbag/cuesheet/Makefile.am index a7fc5c50..67c25b23 100644 --- a/src/test_grabbag/cuesheet/Makefile.am +++ b/src/test_grabbag/cuesheet/Makefile.am @@ -18,7 +18,9 @@ EXTRA_DIST = \ Makefile.lite \ - test_cuesheet.vcproj + test_cuesheet.vcproj \ + test_cuesheet.vcxproj \ + test_cuesheet.vcxproj.filters AM_CPPFLAGS = -I$(top_builddir) -I$(srcdir)/include -I$(top_srcdir)/include noinst_PROGRAMS = test_cuesheet diff --git a/src/test_grabbag/picture/Makefile.am b/src/test_grabbag/picture/Makefile.am index 677fe5c0..3f1e68e5 100644 --- a/src/test_grabbag/picture/Makefile.am +++ b/src/test_grabbag/picture/Makefile.am @@ -18,7 +18,9 @@ EXTRA_DIST = \ Makefile.lite \ - test_picture.vcproj + test_picture.vcproj \ + test_picture.vcxproj \ + test_picture.vcxproj.filters AM_CPPFLAGS = -I$(top_builddir) -I$(srcdir)/include -I$(top_srcdir)/include noinst_PROGRAMS = test_picture diff --git a/src/test_libFLAC++/Makefile.am b/src/test_libFLAC++/Makefile.am index 281557d0..b509d152 100644 --- a/src/test_libFLAC++/Makefile.am +++ b/src/test_libFLAC++/Makefile.am @@ -18,7 +18,9 @@ EXTRA_DIST = \ Makefile.lite \ - test_libFLAC++.vcproj + test_libFLAC++.vcproj \ + test_libFLAC++.vcxproj \ + test_libFLAC++.vcxproj.filters AM_CPPFLAGS = -I$(top_builddir) -I$(srcdir)/include -I$(top_srcdir)/include noinst_PROGRAMS = test_libFLAC++ diff --git a/src/test_libFLAC/Makefile.am b/src/test_libFLAC/Makefile.am index a2e0180b..3b6841a6 100644 --- a/src/test_libFLAC/Makefile.am +++ b/src/test_libFLAC/Makefile.am @@ -18,7 +18,9 @@ EXTRA_DIST = \ Makefile.lite \ - test_libFLAC.vcproj + test_libFLAC.vcproj \ + test_libFLAC.vcxproj \ + test_libFLAC.vcxproj.filters AM_CPPFLAGS = -I$(top_builddir) -I$(srcdir)/include -I$(top_srcdir)/include -I$(top_srcdir)/src/libFLAC/include diff --git a/src/test_libs_common/Makefile.am b/src/test_libs_common/Makefile.am index 3077235d..a4c1896a 100644 --- a/src/test_libs_common/Makefile.am +++ b/src/test_libs_common/Makefile.am @@ -27,4 +27,6 @@ libtest_libs_common_la_SOURCES = \ EXTRA_DIST = \ Makefile.lite \ README \ - test_libs_common_static.vcproj + test_libs_common_static.vcproj \ + test_libs_common_static.vcxproj \ + test_libs_common_static.vcxproj.filters diff --git a/src/test_seeking/Makefile.am b/src/test_seeking/Makefile.am index 87ddb360..bb59f3bd 100644 --- a/src/test_seeking/Makefile.am +++ b/src/test_seeking/Makefile.am @@ -18,7 +18,9 @@ EXTRA_DIST = \ Makefile.lite \ - test_seeking.vcproj + test_seeking.vcproj \ + test_seeking.vcxproj \ + test_seeking.vcxproj.filters AM_CFLAGS = @OGG_CFLAGS@ diff --git a/src/test_streams/Makefile.am b/src/test_streams/Makefile.am index 75ee684e..8b3641a0 100644 --- a/src/test_streams/Makefile.am +++ b/src/test_streams/Makefile.am @@ -18,7 +18,9 @@ EXTRA_DIST = \ Makefile.lite \ - test_streams.vcproj + test_streams.vcproj \ + test_streams.vcxproj \ + test_streams.vcxproj.filters AM_CPPFLAGS = -I$(top_builddir) -I$(srcdir)/include -I$(top_srcdir)/include noinst_PROGRAMS = test_streams diff --git a/src/utils/flacdiff/Makefile.am b/src/utils/flacdiff/Makefile.am index 6431bb4a..06ec6a2a 100644 --- a/src/utils/flacdiff/Makefile.am +++ b/src/utils/flacdiff/Makefile.am @@ -19,4 +19,6 @@ EXTRA_DIST = \ Makefile.lite \ flacdiff.vcproj \ + flacdiff.vcxproj \ + flacdiff.vcxproj.filters \ main.cpp diff --git a/src/utils/flactimer/Makefile.am b/src/utils/flactimer/Makefile.am index e225d968..c7fbac55 100644 --- a/src/utils/flactimer/Makefile.am +++ b/src/utils/flactimer/Makefile.am @@ -18,4 +18,6 @@ EXTRA_DIST = \ flactimer.vcproj \ + flactimer.vcxproj \ + flactimer.vcxproj.filters \ main.cpp -- 2.11.4.GIT