Commit | Line | Data |
---|---|---|
7712869c FF |
1 | Temporary patch (to avoid having to install autogen) until 1.0.29 is released. |
2 | ||
3 | diff -u -r ../libsndfile-826d5296da54c016e3cb0f7f00de3b9e295b9c4a/Makefile.am ./Makefile.am | |
4 | --- ../libsndfile-826d5296da54c016e3cb0f7f00de3b9e295b9c4a/Makefile.am 2017-10-31 09:30:54.000000000 +0100 | |
5 | +++ ./Makefile.am 2017-11-15 23:24:38.275420688 +0100 | |
6 | @@ -30,18 +30,13 @@ | |
7 | ||
8 | test: check | |
9 | ||
10 | -# Need this target to force building of test programs. | |
11 | -checkprograms: $(check_PROGRAMS) | |
12 | - | |
13 | ######## | |
14 | # src/ # | |
15 | ######## | |
16 | ||
17 | -BUILT_SOURCES = src/test_endswap.c | |
18 | - | |
19 | SYMBOL_FILES = src/Symbols.gnu-binutils src/Symbols.darwin src/libsndfile-1.def src/Symbols.os2 src/Symbols.static | |
20 | ||
21 | -EXTRA_DIST += src/sndfile.h.in src/config.h.in src/test_endswap.tpl src/test_endswap.def \ | |
22 | +EXTRA_DIST += src/sndfile.h.in src/config.h.in \ | |
23 | $(SYMBOL_FILES) src/create_symbols_file.py src/binheader_writef_check.py \ | |
24 | src/GSM610/README src/GSM610/COPYRIGHT src/GSM610/ChangeLog \ | |
25 | src/G72x/README src/G72x/README.original src/G72x/ChangeLog \ | |
26 | @@ -80,13 +75,6 @@ | |
27 | src/ima_oki_adpcm.c src/ima_oki_adpcm.h src/alac.c src/chunk.c src/ogg.c src/chanmap.c \ | |
28 | src/windows.c src/id3.c $(WIN_VERSION_FILE) | |
29 | ||
30 | -check_PROGRAMS = src/test_main | |
31 | -src_test_main_SOURCES = src/test_main.c src/test_main.h src/test_conversions.c src/test_float.c src/test_endswap.c \ | |
32 | - src/test_audio_detect.c src/test_log_printf.c src/test_file_io.c src/test_ima_oki_adpcm.c \ | |
33 | - src/test_strncpy_crlf.c src/test_broadcast_var.c src/test_cart_var.c \ | |
34 | - src/test_binheader_writef.c | |
35 | -src_test_main_LDADD = src/libcommon.la | |
36 | - | |
37 | ############## | |
38 | # src/GSM610 # | |
39 | ############## | |
40 | @@ -106,7 +94,6 @@ | |
41 | src_G72x_libg72x_la_SOURCES = src/G72x/g72x.h src/G72x/g72x_priv.h \ | |
42 | src/G72x/g721.c src/G72x/g723_16.c src/G72x/g723_24.c src/G72x/g723_40.c src/G72x/g72x.c | |
43 | ||
44 | -check_PROGRAMS += src/G72x/g72x_test | |
45 | src_G72x_g72x_test_SOURCES = src/G72x/g72x_test.c | |
46 | src_G72x_g72x_test_LDADD = src/G72x/libg72x.la | |
47 | ||
48 | @@ -167,9 +154,6 @@ | |
49 | # examples/ # | |
50 | ############# | |
51 | ||
52 | -check_PROGRAMS += examples/make_sine examples/sfprocess examples/list_formats examples/generate examples/sndfilehandle \ | |
53 | - examples/sndfile-to-text examples/sndfile-loopify | |
54 | - | |
55 | examples_sndfile_to_text_SOURCES = examples/sndfile-to-text.c | |
56 | examples_sndfile_to_text_LDADD = src/libsndfile.la | |
57 | ||
58 | @@ -191,211 +175,6 @@ | |
59 | examples_sndfilehandle_SOURCES = examples/sndfilehandle.cc | |
60 | examples_sndfilehandle_LDADD = src/libsndfile.la | |
61 | ||
62 | -########## | |
63 | -# tests/ # | |
64 | -########## | |
65 | - | |
66 | -TESTS_ENVIRONMENT = $(SHELL) tests/test_wrapper.sh | |
67 | - | |
68 | -if ENABLE_TEST_COVERAGE | |
69 | -CPP_TEST = | |
70 | -else | |
71 | -CPP_TEST = tests/cpp_test | |
72 | -endif | |
73 | - | |
74 | -TESTS = tests/pedantic-header-test.sh | |
75 | - | |
76 | -check_PROGRAMS += tests/sfversion tests/floating_point_test tests/write_read_test \ | |
77 | - tests/lossy_comp_test tests/error_test tests/ulaw_test tests/alaw_test tests/dwvw_test \ | |
78 | - tests/peak_chunk_test tests/command_test tests/stdio_test \ | |
79 | - tests/pcm_test tests/headerless_test tests/pipe_test tests/header_test tests/misc_test \ | |
80 | - tests/raw_test tests/string_test tests/multi_file_test tests/chunk_test \ | |
81 | - tests/scale_clip_test tests/win32_test tests/aiff_rw_test tests/virtual_io_test \ | |
82 | - tests/locale_test tests/win32_ordinal_test tests/ogg_test tests/compression_size_test \ | |
83 | - tests/checksum_test tests/external_libs_test tests/rdwr_test tests/format_check_test $(CPP_TEST) \ | |
84 | - tests/channel_test tests/long_read_write_test tests/stdin_test tests/stdout_test \ | |
85 | - tests/dither_test tests/fix_this tests/largefile_test tests/benchmark | |
86 | - | |
87 | -BUILT_SOURCES += \ | |
88 | - tests/write_read_test.c \ | |
89 | - tests/pcm_test.c \ | |
90 | - tests/header_test.c \ | |
91 | - tests/utils.c \ | |
92 | - tests/scale_clip_test.c \ | |
93 | - tests/pipe_test.c \ | |
94 | - tests/rdwr_test.c \ | |
95 | - tests/floating_point_test.c \ | |
96 | - tests/benchmark.c | |
97 | - | |
98 | -EXTRA_DIST += $(BUILT_SOURCES) \ | |
99 | - tests/write_read_test.tpl tests/write_read_test.def \ | |
100 | - tests/pcm_test.tpl tests/pcm_test.def \ | |
101 | - tests/header_test.tpl tests/header_test.def \ | |
102 | - tests/utils.tpl tests/utils.def \ | |
103 | - tests/scale_clip_test.tpl tests/scale_clip_test.def \ | |
104 | - tests/pipe_test.tpl tests/pipe_test.def \ | |
105 | - tests/rdwr_test.tpl tests/rdwr_test.def \ | |
106 | - tests/floating_point_test.tpl tests/floating_point_test.def \ | |
107 | - tests/benchmark.tpl tests/benchmark.def | |
108 | - | |
109 | -# If we're cross compiling from Linux to Windows and running the test suite | |
110 | -# under Wine, we need a symbolic link to the generated libsndfile DLL. | |
111 | - | |
112 | -if LINUX_MINGW_CROSS_TEST | |
113 | - | |
114 | -$(check_PROGRAMS) : libsndfile-1.dll | |
115 | - | |
116 | -libsndfile-1.dll : | |
117 | - $(LN_S) src/.libs/$@ $@ | |
118 | - | |
119 | -clean-local : | |
120 | - -rm -f libsndfile-1.dll | |
121 | - | |
122 | -endif | |
123 | - | |
124 | -#=============================================================================== | |
125 | - | |
126 | -tests_sfversion_SOURCES = tests/sfversion.c | |
127 | -tests_sfversion_LDADD = src/libsndfile.la | |
128 | - | |
129 | -tests_write_read_test_SOURCES = tests/utils.c tests/generate.c tests/generate.h tests/write_read_test.c tests/utils.h | |
130 | -tests_write_read_test_LDADD = src/libsndfile.la | |
131 | - | |
132 | -tests_lossy_comp_test_SOURCES = tests/utils.c tests/lossy_comp_test.c tests/utils.h | |
133 | -tests_lossy_comp_test_LDADD = src/libsndfile.la | |
134 | - | |
135 | -tests_fix_this_SOURCES = tests/utils.c tests/fix_this.c tests/utils.h | |
136 | -tests_fix_this_LDADD = src/libsndfile.la | |
137 | - | |
138 | -tests_error_test_SOURCES = tests/error_test.c tests/utils.c tests/utils.h | |
139 | -tests_error_test_LDADD = src/libsndfile.la | |
140 | - | |
141 | -tests_ulaw_test_SOURCES = tests/utils.c tests/ulaw_test.c tests/utils.h | |
142 | -tests_ulaw_test_LDADD = src/libsndfile.la | |
143 | - | |
144 | -tests_alaw_test_SOURCES = tests/utils.c tests/alaw_test.c tests/utils.h | |
145 | -tests_alaw_test_LDADD = src/libsndfile.la | |
146 | - | |
147 | -tests_aiff_rw_test_SOURCES = tests/utils.c tests/aiff_rw_test.c tests/utils.h | |
148 | -tests_aiff_rw_test_LDADD = src/libsndfile.la | |
149 | - | |
150 | -tests_command_test_SOURCES = tests/command_test.c tests/utils.c tests/utils.h | |
151 | -tests_command_test_LDADD = src/libsndfile.la | |
152 | - | |
153 | -tests_locale_test_SOURCES = tests/locale_test.c tests/utils.c tests/utils.h | |
154 | -tests_locale_test_LDADD = src/libsndfile.la | |
155 | - | |
156 | -tests_largefile_test_SOURCES = tests/largefile_test.c tests/utils.c tests/utils.h | |
157 | -tests_largefile_test_LDADD = src/libsndfile.la | |
158 | - | |
159 | -tests_pcm_test_SOURCES = tests/pcm_test.c tests/utils.c tests/utils.h | |
160 | -tests_pcm_test_LDADD = src/libsndfile.la | |
161 | - | |
162 | -tests_headerless_test_SOURCES = tests/utils.c tests/headerless_test.c tests/utils.h | |
163 | -tests_headerless_test_LDADD = src/libsndfile.la | |
164 | - | |
165 | -tests_stdin_test_SOURCES = tests/stdin_test.c tests/utils.c tests/utils.h | |
166 | -tests_stdin_test_LDADD = src/libsndfile.la | |
167 | - | |
168 | -tests_stdout_test_SOURCES = tests/stdout_test.c tests/utils.h | |
169 | -tests_stdout_test_LDADD = src/libsndfile.la | |
170 | - | |
171 | -tests_stdio_test_SOURCES = tests/stdio_test.c tests/utils.c tests/utils.h | |
172 | -tests_stdio_test_LDADD = src/libsndfile.la | |
173 | - | |
174 | -tests_pipe_test_SOURCES = tests/pipe_test.c tests/utils.c tests/utils.h | |
175 | -tests_pipe_test_LDADD = src/libsndfile.la | |
176 | - | |
177 | -tests_benchmark_SOURCES = tests/benchmark.c tests/utils.h | |
178 | -tests_benchmark_LDADD = src/libsndfile.la | |
179 | - | |
180 | -tests_header_test_SOURCES = tests/header_test.c tests/utils.c tests/utils.h | |
181 | -tests_header_test_LDADD = src/libsndfile.la | |
182 | - | |
183 | -tests_misc_test_SOURCES = tests/misc_test.c tests/utils.c tests/utils.h | |
184 | -tests_misc_test_LDADD = src/libsndfile.la | |
185 | - | |
186 | -tests_raw_test_SOURCES = tests/raw_test.c tests/utils.c tests/utils.h | |
187 | -tests_raw_test_LDADD = src/libsndfile.la | |
188 | - | |
189 | -tests_string_test_SOURCES = tests/string_test.c tests/utils.c tests/utils.h | |
190 | -tests_string_test_LDADD = src/libsndfile.la | |
191 | - | |
192 | -tests_dither_test_SOURCES = tests/dither_test.c tests/utils.c tests/utils.h | |
193 | -tests_dither_test_LDADD = src/libsndfile.la | |
194 | - | |
195 | -tests_chunk_test_SOURCES = tests/chunk_test.c tests/utils.c tests/utils.h | |
196 | -tests_chunk_test_LDADD = src/libsndfile.la | |
197 | - | |
198 | -tests_multi_file_test_SOURCES = tests/multi_file_test.c tests/utils.c tests/utils.h | |
199 | -tests_multi_file_test_LDADD = src/libsndfile.la | |
200 | - | |
201 | -tests_virtual_io_test_SOURCES = tests/virtual_io_test.c tests/utils.c tests/utils.h | |
202 | -tests_virtual_io_test_LDADD = src/libsndfile.la | |
203 | - | |
204 | -tests_ogg_test_SOURCES = tests/ogg_test.c tests/utils.c tests/utils.h | |
205 | -tests_ogg_test_LDADD = src/libsndfile.la | |
206 | - | |
207 | -tests_compression_size_test_SOURCES = tests/compression_size_test.c tests/utils.c tests/utils.h tests/dft_cmp.h | |
208 | -tests_compression_size_test_LDADD = src/libsndfile.la | |
209 | - | |
210 | -tests_rdwr_test_SOURCES = tests/rdwr_test.c tests/utils.c tests/utils.h | |
211 | -tests_rdwr_test_LDADD = src/libsndfile.la | |
212 | - | |
213 | -tests_win32_test_SOURCES = tests/win32_test.c | |
214 | -# Link lib here so that generating the testsuite tarball works correctly. | |
215 | -tests_win32_test_LDADD = src/libsndfile.la | |
216 | - | |
217 | -tests_win32_ordinal_test_SOURCES = tests/win32_ordinal_test.c tests/utils.c tests/utils.h | |
218 | -tests_win32_ordinal_test_LDADD = src/libsndfile.la | |
219 | - | |
220 | -tests_external_libs_test_SOURCES = tests/external_libs_test.c tests/utils.c tests/utils.h | |
221 | -tests_external_libs_test_LDADD = src/libsndfile.la | |
222 | - | |
223 | -tests_format_check_test_SOURCES = tests/format_check_test.c tests/utils.c tests/utils.h | |
224 | -tests_format_check_test_LDADD = src/libsndfile.la | |
225 | - | |
226 | -tests_channel_test_SOURCES = tests/channel_test.c tests/utils.c tests/utils.h | |
227 | -tests_channel_test_LDADD = src/libsndfile.la | |
228 | - | |
229 | -tests_long_read_write_test_SOURCES = tests/long_read_write_test.c tests/utils.c tests/utils.h tests/dft_cmp.h | |
230 | -tests_long_read_write_test_LDADD = src/libsndfile.la | |
231 | - | |
232 | -tests_cpp_test_SOURCES = tests/cpp_test.cc tests/utils.c tests/utils.h | |
233 | -tests_cpp_test_LDADD = src/libsndfile.la | |
234 | - | |
235 | -tests_checksum_test_SOURCES = tests/checksum_test.c tests/utils.c tests/utils.h | |
236 | -tests_checksum_test_LDADD = src/libsndfile.la | |
237 | - | |
238 | -# Lite remove start | |
239 | -tests_dwvw_test_SOURCES = tests/dwvw_test.c tests/utils.c tests/utils.h | |
240 | -tests_dwvw_test_LDADD = src/libsndfile.la | |
241 | - | |
242 | -tests_floating_point_test_SOURCES = tests/utils.c tests/utils.h tests/dft_cmp.c tests/dft_cmp.h tests/floating_point_test.c | |
243 | -tests_floating_point_test_LDADD = src/libsndfile.la | |
244 | - | |
245 | -tests_peak_chunk_test_SOURCES = tests/peak_chunk_test.c tests/utils.c tests/utils.h | |
246 | -tests_peak_chunk_test_LDADD = src/libsndfile.la | |
247 | - | |
248 | -tests_scale_clip_test_SOURCES = tests/scale_clip_test.c tests/utils.c tests/utils.h | |
249 | -tests_scale_clip_test_LDADD = src/libsndfile.la | |
250 | -# Lite remove end | |
251 | - | |
252 | -#=============================================================================== | |
253 | -# Autogen generated sources. | |
254 | -# These GNU style rules actually work. The old style suffix rules do not. | |
255 | - | |
256 | -%.c : %.def %.tpl | |
257 | - cd $(top_srcdir)/$(@D) && autogen --writable $(<F) | |
258 | - | |
259 | -# recommended Automake way for multi-output targets: | |
260 | -# https://www.gnu.org/software/automake/manual/html_node/Multiple-Outputs.html | |
261 | -%.h : %.c %.def %.tpl | |
262 | - @if test -f $@; then :; else \ | |
263 | - rm -f $<; \ | |
264 | - $(MAKE) $(AM_MAKEFLAGS) $<; \ | |
265 | - fi | |
266 | - | |
267 | ######## | |
268 | # man/ # | |
269 | ######## | |
270 | @@ -423,9 +202,6 @@ | |
271 | programs/sndfile-deinterleave programs/sndfile-concat programs/sndfile-salvage | |
272 | endif | |
273 | ||
274 | -# required by test-sndfile-metadata-set.py | |
275 | -check_PROGRAMS += programs/sndfile-metadata-set programs/sndfile-metadata-get | |
276 | - | |
277 | # This is the BeOS version of sndfile-play. It needs to be compiled with the C++ | |
278 | # compiler. | |
279 | EXTRA_DIST += programs/sndfile-play-beos.cpp programs/test-sndfile-metadata-set.py | |
280 | @@ -459,22 +235,3 @@ | |
281 | ||
282 | programs_sndfile_salvage_SOURCES = programs/sndfile-salvage.c programs/common.c programs/common.h | |
283 | programs_sndfile_salvage_LDADD = src/libsndfile.la | |
284 | - | |
285 | -############ | |
286 | -# regtest/ # | |
287 | -############ | |
288 | - | |
289 | -if HAVE_SQLITE3 | |
290 | -check_PROGRAMS += regtest/sndfile-regtest | |
291 | -endif | |
292 | - | |
293 | -regtest_sndfile_regtest_SOURCES = regtest/regtest.h regtest/sndfile-regtest.c regtest/database.c regtest/checksum.c | |
294 | -regtest_sndfile_CPPFLAGS = -I$(top_srcdir)/src $(SQLITE3_CFLAGS) $(OS_SPECIFIC_CFLAGS) | |
295 | -regtest_sndfile_regtest_LDADD = src/libsndfile.la $(SQLITE3_LIBS) | |
296 | - | |
297 | -################ | |
298 | -# test-tarball # | |
299 | -################ | |
300 | -test-tarball : Scripts/build-test-tarball.mk | |
301 | - $(MAKE) $(bin_PROGRAMS) $(check_PROGRAMS) | |
302 | - $(MAKE) -f Scripts/build-test-tarball.mk |