diff options
| author | Max Kellermann <max@duempel.org> | 2011-03-19 09:58:07 +0100 |
|---|---|---|
| committer | Max Kellermann <max@duempel.org> | 2011-03-19 09:58:07 +0100 |
| commit | 0c9fc2f8090ed225c76296088e6760630eb42779 (patch) | |
| tree | 9238436fb89ebf6a91d329eba0f5feec1ad137fd /Makefile.am | |
| parent | 1a954748a027aa5b4fc6c85b0ad96c2fa25d53b8 (diff) | |
| parent | fe588a255ba713875a21bb98d3b7daf60af2844e (diff) | |
| download | mpd-0c9fc2f8090ed225c76296088e6760630eb42779.tar.gz mpd-0c9fc2f8090ed225c76296088e6760630eb42779.tar.xz mpd-0c9fc2f8090ed225c76296088e6760630eb42779.zip | |
Merge commit 'release-0.16.2'
Conflicts:
Makefile.am
NEWS
configure.ac
Diffstat (limited to '')
| -rw-r--r-- | Makefile.am | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/Makefile.am b/Makefile.am index 7b41d1c75..64c474358 100644 --- a/Makefile.am +++ b/Makefile.am @@ -886,6 +886,7 @@ test_run_input_LDADD = $(MPD_LIBS) \ $(INPUT_LIBS) \ $(GLIB_LIBS) test_run_input_SOURCES = test/run_input.c \ + test/stdbin.h \ src/conf.c src/tokenizer.c src/utils.c src/string_util.c\ src/tag.c src/tag_pool.c src/tag_save.c \ src/fd_util.c \ @@ -933,6 +934,7 @@ test_run_decoder_LDADD = $(MPD_LIBS) \ $(INPUT_LIBS) $(DECODER_LIBS) \ $(GLIB_LIBS) test_run_decoder_SOURCES = test/run_decoder.c \ + test/stdbin.h \ src/conf.c src/tokenizer.c src/utils.c src/string_util.c src/log.c \ src/tag.c src/tag_pool.c \ src/replay_gain_info.c \ @@ -973,6 +975,7 @@ test_run_filter_LDADD = $(MPD_LIBS) \ $(SAMPLERATE_LIBS) \ $(GLIB_LIBS) test_run_filter_SOURCES = test/run_filter.c \ + test/stdbin.h \ src/filter_plugin.c \ src/filter_registry.c \ src/conf.c src/tokenizer.c src/utils.c src/string_util.c \ @@ -995,6 +998,7 @@ endif if ENABLE_ENCODER noinst_PROGRAMS += test/run_encoder test_run_encoder_SOURCES = test/run_encoder.c \ + test/stdbin.h \ src/conf.c src/tokenizer.c \ src/utils.c src/string_util.c \ src/tag.c src/tag_pool.c \ @@ -1002,12 +1006,15 @@ test_run_encoder_SOURCES = test/run_encoder.c \ src/audio_format.c \ src/audio_parser.c \ $(ENCODER_SRC) +test_run_encoder_CPPFLAGS = $(AM_CPPFLAGS) \ + $(ENCODER_CFLAGS) test_run_encoder_LDADD = $(MPD_LIBS) \ $(ENCODER_LIBS) \ $(GLIB_LIBS) endif test_software_volume_SOURCES = test/software_volume.c \ + test/stdbin.h \ src/audio_check.c \ src/audio_parser.c \ src/pcm_volume.c @@ -1015,6 +1022,7 @@ test_software_volume_LDADD = \ $(GLIB_LIBS) test_run_normalize_SOURCES = test/run_normalize.c \ + test/stdbin.h \ src/audio_check.c \ src/audio_parser.c \ src/AudioCompress/compress.c @@ -1052,6 +1060,7 @@ test_run_output_LDADD = $(MPD_LIBS) \ $(OUTPUT_LIBS) \ $(GLIB_LIBS) test_run_output_SOURCES = test/run_output.c \ + test/stdbin.h \ src/conf.c src/tokenizer.c src/utils.c src/string_util.c src/log.c \ src/audio_check.c \ src/audio_format.c \ |