diff options
| author | Max Kellermann <max@duempel.org> | 2011-11-28 11:56:01 +0100 |
|---|---|---|
| committer | Max Kellermann <max@duempel.org> | 2011-11-28 11:56:01 +0100 |
| commit | 4f093d5b979c3547c8dd8045dde5d91e8cc93461 (patch) | |
| tree | 94b1c12cfce14c90f26852e948ba419a8a7ba7eb /Makefile.am | |
| parent | 37420c342bf9582a0de32d46f78716e913119400 (diff) | |
| parent | e1b032cbad5db7698104a93c2235fb7da1f8b580 (diff) | |
| download | mpd-4f093d5b979c3547c8dd8045dde5d91e8cc93461.tar.gz mpd-4f093d5b979c3547c8dd8045dde5d91e8cc93461.tar.xz mpd-4f093d5b979c3547c8dd8045dde5d91e8cc93461.zip | |
Merge branch 'v0.16.x'
Conflicts:
Makefile.am
NEWS
configure.ac
src/encoder/flac_encoder.c
src/log.c
src/pcm_buffer.c
Diffstat (limited to 'Makefile.am')
| -rw-r--r-- | Makefile.am | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/Makefile.am b/Makefile.am index 22856fe82..19a25079f 100644 --- a/Makefile.am +++ b/Makefile.am @@ -84,7 +84,6 @@ mpd_headers = \ src/encoder_api.h \ src/exclude.h \ src/fd_util.h \ - src/fifo_buffer.h \ src/glib_compat.h \ src/update.h \ src/update_internal.h \ @@ -258,7 +257,8 @@ src_mpd_SOURCES = \ src/dirvec.c \ src/exclude.c \ src/fd_util.c \ - src/fifo_buffer.c \ + src/fifo_buffer.c src/fifo_buffer.h \ + src/growing_fifo.c src/growing_fifo.h \ src/filter_config.c \ src/filter_plugin.c \ src/filter_registry.c \ @@ -1035,6 +1035,9 @@ test_run_decoder_SOURCES = test/run_decoder.c \ src/audio_check.c \ src/audio_format.c \ src/timer.c \ + $(ARCHIVE_SRC) \ + $(INPUT_SRC) \ + $(TAG_SRC) \ $(DECODER_SRC) test_read_tags_LDADD = \ @@ -1093,6 +1096,7 @@ if ENABLE_ENCODER noinst_PROGRAMS += test/run_encoder test_run_encoder_SOURCES = test/run_encoder.c \ test/stdbin.h \ + src/fifo_buffer.c src/growing_fifo.c \ src/conf.c src/tokenizer.c \ src/utils.c src/string_util.c \ src/tag.c src/tag_pool.c \ @@ -1148,7 +1152,7 @@ test_run_output_SOURCES = test/run_output.c \ src/audio_parser.c \ src/timer.c \ src/tag.c src/tag_pool.c \ - src/fifo_buffer.c \ + src/fifo_buffer.c src/growing_fifo.c \ src/page.c \ src/socket_util.c \ src/resolver.c \ |