[Pkg-mpd-commits] [SCM] Git repository for pkg-mpd branch, master, updated. debian/0.16.8-1
Alexander Wirt
formorer at debian.org
Wed Jun 27 06:00:51 UTC 2012
The following commit has been merged in the master branch:
commit 73d225a3550263a0a9d54f8845baf43569eb86f2
Author: Alexander Wirt <formorer at debian.org>
Date: Tue Jun 26 21:04:14 2012 +0200
Imported Upstream version 0.16.8
diff --git a/Makefile.am b/Makefile.am
index 6401e3a..ca7d8c7 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1003,6 +1003,26 @@ test_run_encoder_LDADD = $(MPD_LIBS) \
$(GLIB_LIBS)
endif
+if ENABLE_VORBIS_ENCODER
+noinst_PROGRAMS += test/test_vorbis_encoder
+test_test_vorbis_encoder_SOURCES = test/test_vorbis_encoder.c \
+ test/stdbin.h \
+ src/conf.c src/tokenizer.c \
+ src/utils.c \
+ src/tag.c src/tag_pool.c \
+ src/audio_check.c \
+ src/audio_format.c \
+ src/audio_parser.c \
+ src/pcm_buffer.c \
+ src/fifo_buffer.c src/growing_fifo.c \
+ $(ENCODER_SRC)
+test_test_vorbis_encoder_CPPFLAGS = $(AM_CPPFLAGS) \
+ $(ENCODER_CFLAGS)
+test_test_vorbis_encoder_LDADD = $(MPD_LIBS) \
+ $(ENCODER_LIBS) \
+ $(GLIB_LIBS)
+endif
+
test_software_volume_SOURCES = test/software_volume.c \
test/stdbin.h \
src/audio_check.c \
diff --git a/Makefile.in b/Makefile.in
index fafce47..2ea47fe 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.11.3 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
-# Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
+# Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -140,7 +140,7 @@ bin_PROGRAMS = src/mpd$(EXEEXT)
@ENABLE_TEST_TRUE@ test/run_normalize$(EXEEXT) \
@ENABLE_TEST_TRUE@ test/software_volume$(EXEEXT) \
@ENABLE_TEST_TRUE@ $(am__EXEEXT_1) $(am__EXEEXT_2) \
- at ENABLE_TEST_TRUE@ $(am__EXEEXT_3)
+ at ENABLE_TEST_TRUE@ $(am__EXEEXT_3) $(am__EXEEXT_4)
# this debug program is still ALSA specific
@ENABLE_TEST_TRUE@@HAVE_ALSA_TRUE at am__append_66 = test/read_mixer
@@ -151,11 +151,12 @@ bin_PROGRAMS = src/mpd$(EXEEXT)
@ENABLE_TEST_TRUE@@HAVE_LIBSAMPLERATE_TRUE at am__append_69 = src/pcm_resample_libsamplerate.c
@ENABLE_ENCODER_TRUE@@ENABLE_TEST_TRUE at am__append_70 = test/run_encoder
- at ENABLE_TEST_TRUE@@HAVE_LIBSAMPLERATE_TRUE at am__append_71 = src/pcm_resample_libsamplerate.c
- at ENABLE_BZIP2_TEST_TRUE@@ENABLE_TEST_TRUE at am__append_72 = test/test_archive_bzip2.sh
- at ENABLE_TEST_TRUE@@ENABLE_ZZIP_TEST_TRUE at am__append_73 = test/test_archive_zzip.sh
- at ENABLE_ISO9660_TEST_TRUE@@ENABLE_TEST_TRUE at am__append_74 = test/test_archive_iso9660.sh
- at ENABLE_INOTIFY_TRUE@@ENABLE_TEST_TRUE at am__append_75 = test/run_inotify
+ at ENABLE_TEST_TRUE@@ENABLE_VORBIS_ENCODER_TRUE at am__append_71 = test/test_vorbis_encoder
+ at ENABLE_TEST_TRUE@@HAVE_LIBSAMPLERATE_TRUE at am__append_72 = src/pcm_resample_libsamplerate.c
+ at ENABLE_BZIP2_TEST_TRUE@@ENABLE_TEST_TRUE at am__append_73 = test/test_archive_bzip2.sh
+ at ENABLE_TEST_TRUE@@ENABLE_ZZIP_TEST_TRUE at am__append_74 = test/test_archive_zzip.sh
+ at ENABLE_ISO9660_TEST_TRUE@@ENABLE_TEST_TRUE at am__append_75 = test/test_archive_iso9660.sh
+ at ENABLE_INOTIFY_TRUE@@ENABLE_TEST_TRUE at am__append_76 = test/run_inotify
subdir = .
DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
$(srcdir)/Makefile.in $(srcdir)/config.h.in \
@@ -194,7 +195,8 @@ am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man1dir)" \
@ENABLE_TEST_TRUE@@HAVE_ALSA_TRUE at am__EXEEXT_1 = \
@ENABLE_TEST_TRUE@@HAVE_ALSA_TRUE@ test/read_mixer$(EXEEXT)
@ENABLE_ENCODER_TRUE@@ENABLE_TEST_TRUE at am__EXEEXT_2 = test/run_encoder$(EXEEXT)
- at ENABLE_INOTIFY_TRUE@@ENABLE_TEST_TRUE at am__EXEEXT_3 = test/run_inotify$(EXEEXT)
+ at ENABLE_TEST_TRUE@@ENABLE_VORBIS_ENCODER_TRUE at am__EXEEXT_3 = test/test_vorbis_encoder$(EXEEXT)
+ at ENABLE_INOTIFY_TRUE@@ENABLE_TEST_TRUE at am__EXEEXT_4 = test/run_inotify$(EXEEXT)
PROGRAMS = $(bin_PROGRAMS) $(noinst_PROGRAMS)
am__src_mpd_SOURCES_DIST = src/check.h src/notify.h src/ack.h \
src/ape.h src/audio.h src/audio_format.h src/audio_check.h \
@@ -1328,6 +1330,43 @@ am__test_software_volume_SOURCES_DIST = test/software_volume.c \
test_software_volume_OBJECTS = $(am_test_software_volume_OBJECTS)
@ENABLE_TEST_TRUE at test_software_volume_DEPENDENCIES = \
@ENABLE_TEST_TRUE@ $(am__DEPENDENCIES_1)
+am__test_test_vorbis_encoder_SOURCES_DIST = \
+ test/test_vorbis_encoder.c test/stdbin.h src/conf.c \
+ src/tokenizer.c src/utils.c src/tag.c src/tag_pool.c \
+ src/audio_check.c src/audio_format.c src/audio_parser.c \
+ src/pcm_buffer.c src/fifo_buffer.c src/growing_fifo.c \
+ src/encoder_list.c src/encoder/null_encoder.c \
+ src/encoder/wave_encoder.c src/encoder/vorbis_encoder.c \
+ src/encoder/lame_encoder.c src/encoder/twolame_encoder.c \
+ src/encoder/flac_encoder.c
+ at ENABLE_ENCODER_TRUE@am__objects_208 = src/test_test_vorbis_encoder-encoder_list.$(OBJEXT) \
+ at ENABLE_ENCODER_TRUE@ src/encoder/test_test_vorbis_encoder-null_encoder.$(OBJEXT)
+ at ENABLE_ENCODER_TRUE@@ENABLE_WAVE_ENCODER_TRUE at am__objects_209 = src/encoder/test_test_vorbis_encoder-wave_encoder.$(OBJEXT)
+ at ENABLE_ENCODER_TRUE@@ENABLE_VORBIS_ENCODER_TRUE at am__objects_210 = src/encoder/test_test_vorbis_encoder-vorbis_encoder.$(OBJEXT)
+ at ENABLE_ENCODER_TRUE@@ENABLE_LAME_ENCODER_TRUE at am__objects_211 = src/encoder/test_test_vorbis_encoder-lame_encoder.$(OBJEXT)
+ at ENABLE_ENCODER_TRUE@@ENABLE_TWOLAME_ENCODER_TRUE at am__objects_212 = src/encoder/test_test_vorbis_encoder-twolame_encoder.$(OBJEXT)
+ at ENABLE_ENCODER_TRUE@@ENABLE_FLAC_ENCODER_TRUE at am__objects_213 = src/encoder/test_test_vorbis_encoder-flac_encoder.$(OBJEXT)
+am__objects_214 = $(am__objects_208) $(am__objects_209) \
+ $(am__objects_210) $(am__objects_211) $(am__objects_212) \
+ $(am__objects_213)
+ at ENABLE_TEST_TRUE@@ENABLE_VORBIS_ENCODER_TRUE at am_test_test_vorbis_encoder_OBJECTS = test/test_test_vorbis_encoder-test_vorbis_encoder.$(OBJEXT) \
+ at ENABLE_TEST_TRUE@@ENABLE_VORBIS_ENCODER_TRUE@ src/test_test_vorbis_encoder-conf.$(OBJEXT) \
+ at ENABLE_TEST_TRUE@@ENABLE_VORBIS_ENCODER_TRUE@ src/test_test_vorbis_encoder-tokenizer.$(OBJEXT) \
+ at ENABLE_TEST_TRUE@@ENABLE_VORBIS_ENCODER_TRUE@ src/test_test_vorbis_encoder-utils.$(OBJEXT) \
+ at ENABLE_TEST_TRUE@@ENABLE_VORBIS_ENCODER_TRUE@ src/test_test_vorbis_encoder-tag.$(OBJEXT) \
+ at ENABLE_TEST_TRUE@@ENABLE_VORBIS_ENCODER_TRUE@ src/test_test_vorbis_encoder-tag_pool.$(OBJEXT) \
+ at ENABLE_TEST_TRUE@@ENABLE_VORBIS_ENCODER_TRUE@ src/test_test_vorbis_encoder-audio_check.$(OBJEXT) \
+ at ENABLE_TEST_TRUE@@ENABLE_VORBIS_ENCODER_TRUE@ src/test_test_vorbis_encoder-audio_format.$(OBJEXT) \
+ at ENABLE_TEST_TRUE@@ENABLE_VORBIS_ENCODER_TRUE@ src/test_test_vorbis_encoder-audio_parser.$(OBJEXT) \
+ at ENABLE_TEST_TRUE@@ENABLE_VORBIS_ENCODER_TRUE@ src/test_test_vorbis_encoder-pcm_buffer.$(OBJEXT) \
+ at ENABLE_TEST_TRUE@@ENABLE_VORBIS_ENCODER_TRUE@ src/test_test_vorbis_encoder-fifo_buffer.$(OBJEXT) \
+ at ENABLE_TEST_TRUE@@ENABLE_VORBIS_ENCODER_TRUE@ src/test_test_vorbis_encoder-growing_fifo.$(OBJEXT) \
+ at ENABLE_TEST_TRUE@@ENABLE_VORBIS_ENCODER_TRUE@ $(am__objects_214)
+test_test_vorbis_encoder_OBJECTS = \
+ $(am_test_test_vorbis_encoder_OBJECTS)
+ at ENABLE_TEST_TRUE@@ENABLE_VORBIS_ENCODER_TRUE at test_test_vorbis_encoder_DEPENDENCIES = $(am__DEPENDENCIES_1) \
+ at ENABLE_TEST_TRUE@@ENABLE_VORBIS_ENCODER_TRUE@ $(am__DEPENDENCIES_7) \
+ at ENABLE_TEST_TRUE@@ENABLE_VORBIS_ENCODER_TRUE@ $(am__DEPENDENCIES_1)
DEFAULT_INCLUDES = -I. at am__isrc@
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
@@ -1348,7 +1387,8 @@ SOURCES = $(libmodplug_decoder_plugin_a_SOURCES) $(src_mpd_SOURCES) \
$(test_run_encoder_SOURCES) $(test_run_filter_SOURCES) \
$(test_run_inotify_SOURCES) $(test_run_input_SOURCES) \
$(test_run_normalize_SOURCES) $(test_run_output_SOURCES) \
- $(test_software_volume_SOURCES)
+ $(test_software_volume_SOURCES) \
+ $(test_test_vorbis_encoder_SOURCES)
DIST_SOURCES = $(am__libmodplug_decoder_plugin_a_SOURCES_DIST) \
$(am__src_mpd_SOURCES_DIST) \
$(am__test_dump_playlist_SOURCES_DIST) \
@@ -1363,7 +1403,8 @@ DIST_SOURCES = $(am__libmodplug_decoder_plugin_a_SOURCES_DIST) \
$(am__test_run_input_SOURCES_DIST) \
$(am__test_run_normalize_SOURCES_DIST) \
$(am__test_run_output_SOURCES_DIST) \
- $(am__test_software_volume_SOURCES_DIST)
+ $(am__test_software_volume_SOURCES_DIST) \
+ $(am__test_test_vorbis_encoder_SOURCES_DIST)
am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
am__vpath_adj = case $$p in \
$(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
@@ -1385,6 +1426,12 @@ am__nobase_list = $(am__nobase_strip_setup); \
am__base_list = \
sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__uninstall_files_from_dir = { \
+ test -z "$$files" \
+ || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+ $(am__cd) "$$dir" && rm -f $$files; }; \
+ }
man1dir = $(mandir)/man1
man5dir = $(mandir)/man5
NROFF = nroff
@@ -1399,12 +1446,16 @@ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
distdir = $(PACKAGE)-$(VERSION)
top_distdir = $(distdir)
am__remove_distdir = \
- { test ! -d "$(distdir)" \
- || { find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \
- && rm -fr "$(distdir)"; }; }
+ if test -d "$(distdir)"; then \
+ find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \
+ && rm -rf "$(distdir)" \
+ || { sleep 5 && rm -rf "$(distdir)"; }; \
+ else :; fi
DIST_ARCHIVES = $(distdir).tar.gz $(distdir).tar.bz2
GZIP_ENV = --best
distuninstallcheck_listfiles = find . -type f -print
+am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \
+ | sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$'
distcleancheck_listfiles = find . -type f -print
ACLOCAL = @ACLOCAL@
ALSA_CFLAGS = @ALSA_CFLAGS@
@@ -2050,8 +2101,8 @@ SPARSE_CPPFLAGS = $(DEFAULT_INCLUDES) -I$(shell $(CC) \
#
# Test programs
#
- at ENABLE_TEST_TRUE@TESTS = $(am__append_72) $(am__append_73) \
- at ENABLE_TEST_TRUE@ $(am__append_74)
+ at ENABLE_TEST_TRUE@TESTS = $(am__append_73) $(am__append_74) \
+ at ENABLE_TEST_TRUE@ $(am__append_75)
@ENABLE_TEST_TRUE at test_read_conf_CPPFLAGS = $(AM_CPPFLAGS) \
@ENABLE_TEST_TRUE@ $(GLIB_CFLAGS)
@@ -2189,6 +2240,25 @@ SPARSE_CPPFLAGS = $(DEFAULT_INCLUDES) -I$(shell $(CC) \
@ENABLE_ENCODER_TRUE@@ENABLE_TEST_TRUE@ $(ENCODER_LIBS) \
@ENABLE_ENCODER_TRUE@@ENABLE_TEST_TRUE@ $(GLIB_LIBS)
+ at ENABLE_TEST_TRUE@@ENABLE_VORBIS_ENCODER_TRUE at test_test_vorbis_encoder_SOURCES = test/test_vorbis_encoder.c \
+ at ENABLE_TEST_TRUE@@ENABLE_VORBIS_ENCODER_TRUE@ test/stdbin.h \
+ at ENABLE_TEST_TRUE@@ENABLE_VORBIS_ENCODER_TRUE@ src/conf.c src/tokenizer.c \
+ at ENABLE_TEST_TRUE@@ENABLE_VORBIS_ENCODER_TRUE@ src/utils.c \
+ at ENABLE_TEST_TRUE@@ENABLE_VORBIS_ENCODER_TRUE@ src/tag.c src/tag_pool.c \
+ at ENABLE_TEST_TRUE@@ENABLE_VORBIS_ENCODER_TRUE@ src/audio_check.c \
+ at ENABLE_TEST_TRUE@@ENABLE_VORBIS_ENCODER_TRUE@ src/audio_format.c \
+ at ENABLE_TEST_TRUE@@ENABLE_VORBIS_ENCODER_TRUE@ src/audio_parser.c \
+ at ENABLE_TEST_TRUE@@ENABLE_VORBIS_ENCODER_TRUE@ src/pcm_buffer.c \
+ at ENABLE_TEST_TRUE@@ENABLE_VORBIS_ENCODER_TRUE@ src/fifo_buffer.c src/growing_fifo.c \
+ at ENABLE_TEST_TRUE@@ENABLE_VORBIS_ENCODER_TRUE@ $(ENCODER_SRC)
+
+ at ENABLE_TEST_TRUE@@ENABLE_VORBIS_ENCODER_TRUE at test_test_vorbis_encoder_CPPFLAGS = $(AM_CPPFLAGS) \
+ at ENABLE_TEST_TRUE@@ENABLE_VORBIS_ENCODER_TRUE@ $(ENCODER_CFLAGS)
+
+ at ENABLE_TEST_TRUE@@ENABLE_VORBIS_ENCODER_TRUE at test_test_vorbis_encoder_LDADD = $(MPD_LIBS) \
+ at ENABLE_TEST_TRUE@@ENABLE_VORBIS_ENCODER_TRUE@ $(ENCODER_LIBS) \
+ at ENABLE_TEST_TRUE@@ENABLE_VORBIS_ENCODER_TRUE@ $(GLIB_LIBS)
+
@ENABLE_TEST_TRUE at test_software_volume_SOURCES = test/software_volume.c \
@ENABLE_TEST_TRUE@ test/stdbin.h \
@ENABLE_TEST_TRUE@ src/audio_check.c \
@@ -2215,7 +2285,7 @@ SPARSE_CPPFLAGS = $(DEFAULT_INCLUDES) -I$(shell $(CC) \
@ENABLE_TEST_TRUE@ src/pcm_dither.c src/pcm_byteswap.c \
@ENABLE_TEST_TRUE@ src/pcm_resample.c \
@ENABLE_TEST_TRUE@ src/pcm_resample_fallback.c \
- at ENABLE_TEST_TRUE@ src/pcm_convert.c $(am__append_71)
+ at ENABLE_TEST_TRUE@ src/pcm_convert.c $(am__append_72)
@ENABLE_TEST_TRUE at test_run_convert_CPPFLAGS = $(AM_CPPFLAGS) $(SAMPLERATE_CFLAGS)
@ENABLE_TEST_TRUE at test_run_convert_LDADD = \
@ENABLE_TEST_TRUE@ $(SAMPLERATE_LIBS) \
@@ -2314,7 +2384,7 @@ all: config.h
.SUFFIXES:
.SUFFIXES: .c .cxx .o .obj
-am--refresh:
+am--refresh: Makefile
@:
$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
@for dep in $?; do \
@@ -2350,10 +2420,8 @@ $(ACLOCAL_M4): $(am__aclocal_m4_deps)
$(am__aclocal_m4_deps):
config.h: stamp-h1
- @if test ! -f $@; then \
- rm -f stamp-h1; \
- $(MAKE) $(AM_MAKEFLAGS) stamp-h1; \
- else :; fi
+ @if test ! -f $@; then rm -f stamp-h1; else :; fi
+ @if test ! -f $@; then $(MAKE) $(AM_MAKEFLAGS) stamp-h1; else :; fi
stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status
@rm -f stamp-h1
@@ -2379,7 +2447,7 @@ src/decoder/$(DEPDIR)/$(am__dirstamp):
src/decoder/libmodplug_decoder_plugin_a-modplug_decoder_plugin.$(OBJEXT): \
src/decoder/$(am__dirstamp) \
src/decoder/$(DEPDIR)/$(am__dirstamp)
-libmodplug_decoder_plugin.a: $(libmodplug_decoder_plugin_a_OBJECTS) $(libmodplug_decoder_plugin_a_DEPENDENCIES)
+libmodplug_decoder_plugin.a: $(libmodplug_decoder_plugin_a_OBJECTS) $(libmodplug_decoder_plugin_a_DEPENDENCIES) $(EXTRA_libmodplug_decoder_plugin_a_DEPENDENCIES)
-rm -f libmodplug_decoder_plugin.a
$(libmodplug_decoder_plugin_a_AR) libmodplug_decoder_plugin.a $(libmodplug_decoder_plugin_a_OBJECTS) $(libmodplug_decoder_plugin_a_LIBADD)
$(RANLIB) libmodplug_decoder_plugin.a
@@ -3002,7 +3070,7 @@ src/src_mpd-zeroconf-avahi.$(OBJEXT): src/$(am__dirstamp) \
src/$(DEPDIR)/$(am__dirstamp)
src/src_mpd-zeroconf-bonjour.$(OBJEXT): src/$(am__dirstamp) \
src/$(DEPDIR)/$(am__dirstamp)
-src/mpd$(EXEEXT): $(src_mpd_OBJECTS) $(src_mpd_DEPENDENCIES) src/$(am__dirstamp)
+src/mpd$(EXEEXT): $(src_mpd_OBJECTS) $(src_mpd_DEPENDENCIES) $(EXTRA_src_mpd_DEPENDENCIES) src/$(am__dirstamp)
@rm -f src/mpd$(EXEEXT)
$(CXXLINK) $(src_mpd_OBJECTS) $(src_mpd_LDADD) $(LIBS)
test/$(am__dirstamp):
@@ -3106,7 +3174,7 @@ src/test_dump_playlist-replay_gain_info.$(OBJEXT): \
src/decoder/test_dump_playlist-flac_metadata.$(OBJEXT): \
src/decoder/$(am__dirstamp) \
src/decoder/$(DEPDIR)/$(am__dirstamp)
-test/dump_playlist$(EXEEXT): $(test_dump_playlist_OBJECTS) $(test_dump_playlist_DEPENDENCIES) test/$(am__dirstamp)
+test/dump_playlist$(EXEEXT): $(test_dump_playlist_OBJECTS) $(test_dump_playlist_DEPENDENCIES) $(EXTRA_test_dump_playlist_DEPENDENCIES) test/$(am__dirstamp)
@rm -f test/dump_playlist$(EXEEXT)
$(LINK) $(test_dump_playlist_OBJECTS) $(test_dump_playlist_LDADD) $(LIBS)
test/test_read_conf-read_conf.$(OBJEXT): test/$(am__dirstamp) \
@@ -3117,7 +3185,7 @@ src/test_read_conf-tokenizer.$(OBJEXT): src/$(am__dirstamp) \
src/$(DEPDIR)/$(am__dirstamp)
src/test_read_conf-utils.$(OBJEXT): src/$(am__dirstamp) \
src/$(DEPDIR)/$(am__dirstamp)
-test/read_conf$(EXEEXT): $(test_read_conf_OBJECTS) $(test_read_conf_DEPENDENCIES) test/$(am__dirstamp)
+test/read_conf$(EXEEXT): $(test_read_conf_OBJECTS) $(test_read_conf_DEPENDENCIES) $(EXTRA_test_read_conf_DEPENDENCIES) test/$(am__dirstamp)
@rm -f test/read_conf$(EXEEXT)
$(LINK) $(test_read_conf_OBJECTS) $(test_read_conf_LDADD) $(LIBS)
test/test_read_mixer-read_mixer.$(OBJEXT): test/$(am__dirstamp) \
@@ -3153,7 +3221,7 @@ src/mixer/test_read_mixer-pulse_mixer_plugin.$(OBJEXT): \
src/mixer/$(am__dirstamp) src/mixer/$(DEPDIR)/$(am__dirstamp)
src/mixer/test_read_mixer-winmm_mixer_plugin.$(OBJEXT): \
src/mixer/$(am__dirstamp) src/mixer/$(DEPDIR)/$(am__dirstamp)
-test/read_mixer$(EXEEXT): $(test_read_mixer_OBJECTS) $(test_read_mixer_DEPENDENCIES) test/$(am__dirstamp)
+test/read_mixer$(EXEEXT): $(test_read_mixer_OBJECTS) $(test_read_mixer_DEPENDENCIES) $(EXTRA_test_read_mixer_DEPENDENCIES) test/$(am__dirstamp)
@rm -f test/read_mixer$(EXEEXT)
$(LINK) $(test_read_mixer_OBJECTS) $(test_read_mixer_LDADD) $(LIBS)
test/test_read_tags-read_tags.$(OBJEXT): test/$(am__dirstamp) \
@@ -3302,7 +3370,7 @@ src/decoder/test_read_tags-gme_decoder_plugin.$(OBJEXT): \
src/decoder/$(DEPDIR)/$(am__dirstamp)
src/cue/test_read_tags-cue_tag.$(OBJEXT): src/cue/$(am__dirstamp) \
src/cue/$(DEPDIR)/$(am__dirstamp)
-test/read_tags$(EXEEXT): $(test_read_tags_OBJECTS) $(test_read_tags_DEPENDENCIES) test/$(am__dirstamp)
+test/read_tags$(EXEEXT): $(test_read_tags_OBJECTS) $(test_read_tags_DEPENDENCIES) $(EXTRA_test_read_tags_DEPENDENCIES) test/$(am__dirstamp)
@rm -f test/read_tags$(EXEEXT)
$(CXXLINK) $(test_read_tags_OBJECTS) $(test_read_tags_LDADD) $(LIBS)
test/test_run_convert-run_convert.$(OBJEXT): test/$(am__dirstamp) \
@@ -3335,7 +3403,7 @@ src/test_run_convert-pcm_convert.$(OBJEXT): src/$(am__dirstamp) \
src/$(DEPDIR)/$(am__dirstamp)
src/test_run_convert-pcm_resample_libsamplerate.$(OBJEXT): \
src/$(am__dirstamp) src/$(DEPDIR)/$(am__dirstamp)
-test/run_convert$(EXEEXT): $(test_run_convert_OBJECTS) $(test_run_convert_DEPENDENCIES) test/$(am__dirstamp)
+test/run_convert$(EXEEXT): $(test_run_convert_OBJECTS) $(test_run_convert_DEPENDENCIES) $(EXTRA_test_run_convert_DEPENDENCIES) test/$(am__dirstamp)
@rm -f test/run_convert$(EXEEXT)
$(LINK) $(test_run_convert_OBJECTS) $(test_run_convert_LDADD) $(LIBS)
test/test_run_decoder-run_decoder.$(OBJEXT): test/$(am__dirstamp) \
@@ -3486,7 +3554,7 @@ src/decoder/test_run_decoder-gme_decoder_plugin.$(OBJEXT): \
src/decoder/$(DEPDIR)/$(am__dirstamp)
src/cue/test_run_decoder-cue_tag.$(OBJEXT): src/cue/$(am__dirstamp) \
src/cue/$(DEPDIR)/$(am__dirstamp)
-test/run_decoder$(EXEEXT): $(test_run_decoder_OBJECTS) $(test_run_decoder_DEPENDENCIES) test/$(am__dirstamp)
+test/run_decoder$(EXEEXT): $(test_run_decoder_OBJECTS) $(test_run_decoder_DEPENDENCIES) $(EXTRA_test_run_decoder_DEPENDENCIES) test/$(am__dirstamp)
@rm -f test/run_decoder$(EXEEXT)
$(CXXLINK) $(test_run_decoder_OBJECTS) $(test_run_decoder_LDADD) $(LIBS)
test/test_run_encoder-run_encoder.$(OBJEXT): test/$(am__dirstamp) \
@@ -3533,7 +3601,7 @@ src/encoder/test_run_encoder-twolame_encoder.$(OBJEXT): \
src/encoder/test_run_encoder-flac_encoder.$(OBJEXT): \
src/encoder/$(am__dirstamp) \
src/encoder/$(DEPDIR)/$(am__dirstamp)
-test/run_encoder$(EXEEXT): $(test_run_encoder_OBJECTS) $(test_run_encoder_DEPENDENCIES) test/$(am__dirstamp)
+test/run_encoder$(EXEEXT): $(test_run_encoder_OBJECTS) $(test_run_encoder_DEPENDENCIES) $(EXTRA_test_run_encoder_DEPENDENCIES) test/$(am__dirstamp)
@rm -f test/run_encoder$(EXEEXT)
$(LINK) $(test_run_encoder_OBJECTS) $(test_run_encoder_LDADD) $(LIBS)
test/test_run_filter-run_filter.$(OBJEXT): test/$(am__dirstamp) \
@@ -3607,7 +3675,7 @@ src/filter/test_run_filter-volume_filter_plugin.$(OBJEXT): \
src/filter/$(DEPDIR)/$(am__dirstamp)
src/test_run_filter-pcm_resample_libsamplerate.$(OBJEXT): \
src/$(am__dirstamp) src/$(DEPDIR)/$(am__dirstamp)
-test/run_filter$(EXEEXT): $(test_run_filter_OBJECTS) $(test_run_filter_DEPENDENCIES) test/$(am__dirstamp)
+test/run_filter$(EXEEXT): $(test_run_filter_OBJECTS) $(test_run_filter_DEPENDENCIES) $(EXTRA_test_run_filter_DEPENDENCIES) test/$(am__dirstamp)
@rm -f test/run_filter$(EXEEXT)
$(LINK) $(test_run_filter_OBJECTS) $(test_run_filter_LDADD) $(LIBS)
test/run_inotify.$(OBJEXT): test/$(am__dirstamp) \
@@ -3618,7 +3686,7 @@ src/fifo_buffer.$(OBJEXT): src/$(am__dirstamp) \
src/$(DEPDIR)/$(am__dirstamp)
src/inotify_source.$(OBJEXT): src/$(am__dirstamp) \
src/$(DEPDIR)/$(am__dirstamp)
-test/run_inotify$(EXEEXT): $(test_run_inotify_OBJECTS) $(test_run_inotify_DEPENDENCIES) test/$(am__dirstamp)
+test/run_inotify$(EXEEXT): $(test_run_inotify_OBJECTS) $(test_run_inotify_DEPENDENCIES) $(EXTRA_test_run_inotify_DEPENDENCIES) test/$(am__dirstamp)
@rm -f test/run_inotify$(EXEEXT)
$(LINK) $(test_run_inotify_OBJECTS) $(test_run_inotify_LDADD) $(LIBS)
test/test_run_input-run_input.$(OBJEXT): test/$(am__dirstamp) \
@@ -3672,7 +3740,7 @@ src/input/test_run_input-ffmpeg_input_plugin.$(OBJEXT): \
src/input/$(am__dirstamp) src/input/$(DEPDIR)/$(am__dirstamp)
src/input/test_run_input-mms_input_plugin.$(OBJEXT): \
src/input/$(am__dirstamp) src/input/$(DEPDIR)/$(am__dirstamp)
-test/run_input$(EXEEXT): $(test_run_input_OBJECTS) $(test_run_input_DEPENDENCIES) test/$(am__dirstamp)
+test/run_input$(EXEEXT): $(test_run_input_OBJECTS) $(test_run_input_DEPENDENCIES) $(EXTRA_test_run_input_DEPENDENCIES) test/$(am__dirstamp)
@rm -f test/run_input$(EXEEXT)
$(LINK) $(test_run_input_OBJECTS) $(test_run_input_LDADD) $(LIBS)
test/run_normalize.$(OBJEXT): test/$(am__dirstamp) \
@@ -3684,7 +3752,7 @@ src/audio_parser.$(OBJEXT): src/$(am__dirstamp) \
src/AudioCompress/compress.$(OBJEXT): \
src/AudioCompress/$(am__dirstamp) \
src/AudioCompress/$(DEPDIR)/$(am__dirstamp)
-test/run_normalize$(EXEEXT): $(test_run_normalize_OBJECTS) $(test_run_normalize_DEPENDENCIES) test/$(am__dirstamp)
+test/run_normalize$(EXEEXT): $(test_run_normalize_OBJECTS) $(test_run_normalize_DEPENDENCIES) $(EXTRA_test_run_normalize_DEPENDENCIES) test/$(am__dirstamp)
@rm -f test/run_normalize$(EXEEXT)
$(LINK) $(test_run_normalize_OBJECTS) $(test_run_normalize_LDADD) $(LIBS)
test/test_run_output-run_output.$(OBJEXT): test/$(am__dirstamp) \
@@ -3850,16 +3918,63 @@ src/output/test_run_output-solaris_output_plugin.$(OBJEXT): \
src/output/test_run_output-winmm_output_plugin.$(OBJEXT): \
src/output/$(am__dirstamp) \
src/output/$(DEPDIR)/$(am__dirstamp)
-test/run_output$(EXEEXT): $(test_run_output_OBJECTS) $(test_run_output_DEPENDENCIES) test/$(am__dirstamp)
+test/run_output$(EXEEXT): $(test_run_output_OBJECTS) $(test_run_output_DEPENDENCIES) $(EXTRA_test_run_output_DEPENDENCIES) test/$(am__dirstamp)
@rm -f test/run_output$(EXEEXT)
$(test_run_output_LINK) $(test_run_output_OBJECTS) $(test_run_output_LDADD) $(LIBS)
test/software_volume.$(OBJEXT): test/$(am__dirstamp) \
test/$(DEPDIR)/$(am__dirstamp)
src/pcm_volume.$(OBJEXT): src/$(am__dirstamp) \
src/$(DEPDIR)/$(am__dirstamp)
-test/software_volume$(EXEEXT): $(test_software_volume_OBJECTS) $(test_software_volume_DEPENDENCIES) test/$(am__dirstamp)
+test/software_volume$(EXEEXT): $(test_software_volume_OBJECTS) $(test_software_volume_DEPENDENCIES) $(EXTRA_test_software_volume_DEPENDENCIES) test/$(am__dirstamp)
@rm -f test/software_volume$(EXEEXT)
$(LINK) $(test_software_volume_OBJECTS) $(test_software_volume_LDADD) $(LIBS)
+test/test_test_vorbis_encoder-test_vorbis_encoder.$(OBJEXT): \
+ test/$(am__dirstamp) test/$(DEPDIR)/$(am__dirstamp)
+src/test_test_vorbis_encoder-conf.$(OBJEXT): src/$(am__dirstamp) \
+ src/$(DEPDIR)/$(am__dirstamp)
+src/test_test_vorbis_encoder-tokenizer.$(OBJEXT): src/$(am__dirstamp) \
+ src/$(DEPDIR)/$(am__dirstamp)
+src/test_test_vorbis_encoder-utils.$(OBJEXT): src/$(am__dirstamp) \
+ src/$(DEPDIR)/$(am__dirstamp)
+src/test_test_vorbis_encoder-tag.$(OBJEXT): src/$(am__dirstamp) \
+ src/$(DEPDIR)/$(am__dirstamp)
+src/test_test_vorbis_encoder-tag_pool.$(OBJEXT): src/$(am__dirstamp) \
+ src/$(DEPDIR)/$(am__dirstamp)
+src/test_test_vorbis_encoder-audio_check.$(OBJEXT): \
+ src/$(am__dirstamp) src/$(DEPDIR)/$(am__dirstamp)
+src/test_test_vorbis_encoder-audio_format.$(OBJEXT): \
+ src/$(am__dirstamp) src/$(DEPDIR)/$(am__dirstamp)
+src/test_test_vorbis_encoder-audio_parser.$(OBJEXT): \
+ src/$(am__dirstamp) src/$(DEPDIR)/$(am__dirstamp)
+src/test_test_vorbis_encoder-pcm_buffer.$(OBJEXT): \
+ src/$(am__dirstamp) src/$(DEPDIR)/$(am__dirstamp)
+src/test_test_vorbis_encoder-fifo_buffer.$(OBJEXT): \
+ src/$(am__dirstamp) src/$(DEPDIR)/$(am__dirstamp)
+src/test_test_vorbis_encoder-growing_fifo.$(OBJEXT): \
+ src/$(am__dirstamp) src/$(DEPDIR)/$(am__dirstamp)
+src/test_test_vorbis_encoder-encoder_list.$(OBJEXT): \
+ src/$(am__dirstamp) src/$(DEPDIR)/$(am__dirstamp)
+src/encoder/test_test_vorbis_encoder-null_encoder.$(OBJEXT): \
+ src/encoder/$(am__dirstamp) \
+ src/encoder/$(DEPDIR)/$(am__dirstamp)
+src/encoder/test_test_vorbis_encoder-wave_encoder.$(OBJEXT): \
+ src/encoder/$(am__dirstamp) \
+ src/encoder/$(DEPDIR)/$(am__dirstamp)
+src/encoder/test_test_vorbis_encoder-vorbis_encoder.$(OBJEXT): \
+ src/encoder/$(am__dirstamp) \
+ src/encoder/$(DEPDIR)/$(am__dirstamp)
+src/encoder/test_test_vorbis_encoder-lame_encoder.$(OBJEXT): \
+ src/encoder/$(am__dirstamp) \
+ src/encoder/$(DEPDIR)/$(am__dirstamp)
+src/encoder/test_test_vorbis_encoder-twolame_encoder.$(OBJEXT): \
+ src/encoder/$(am__dirstamp) \
+ src/encoder/$(DEPDIR)/$(am__dirstamp)
+src/encoder/test_test_vorbis_encoder-flac_encoder.$(OBJEXT): \
+ src/encoder/$(am__dirstamp) \
+ src/encoder/$(DEPDIR)/$(am__dirstamp)
+test/test_vorbis_encoder$(EXEEXT): $(test_test_vorbis_encoder_OBJECTS) $(test_test_vorbis_encoder_DEPENDENCIES) $(EXTRA_test_test_vorbis_encoder_DEPENDENCIES) test/$(am__dirstamp)
+ @rm -f test/test_vorbis_encoder$(EXEEXT)
+ $(LINK) $(test_test_vorbis_encoder_OBJECTS) $(test_test_vorbis_encoder_LDADD) $(LIBS)
mostlyclean-compile:
-rm -f *.$(OBJEXT)
@@ -3971,6 +4086,12 @@ mostlyclean-compile:
-rm -f src/encoder/test_run_output-twolame_encoder.$(OBJEXT)
-rm -f src/encoder/test_run_output-vorbis_encoder.$(OBJEXT)
-rm -f src/encoder/test_run_output-wave_encoder.$(OBJEXT)
+ -rm -f src/encoder/test_test_vorbis_encoder-flac_encoder.$(OBJEXT)
+ -rm -f src/encoder/test_test_vorbis_encoder-lame_encoder.$(OBJEXT)
+ -rm -f src/encoder/test_test_vorbis_encoder-null_encoder.$(OBJEXT)
+ -rm -f src/encoder/test_test_vorbis_encoder-twolame_encoder.$(OBJEXT)
+ -rm -f src/encoder/test_test_vorbis_encoder-vorbis_encoder.$(OBJEXT)
+ -rm -f src/encoder/test_test_vorbis_encoder-wave_encoder.$(OBJEXT)
-rm -f src/fd_util.$(OBJEXT)
-rm -f src/fifo_buffer.$(OBJEXT)
-rm -f src/filter/src_mpd-autoconvert_filter_plugin.$(OBJEXT)
@@ -4431,6 +4552,18 @@ mostlyclean-compile:
-rm -f src/test_run_output-timer.$(OBJEXT)
-rm -f src/test_run_output-tokenizer.$(OBJEXT)
-rm -f src/test_run_output-utils.$(OBJEXT)
+ -rm -f src/test_test_vorbis_encoder-audio_check.$(OBJEXT)
+ -rm -f src/test_test_vorbis_encoder-audio_format.$(OBJEXT)
+ -rm -f src/test_test_vorbis_encoder-audio_parser.$(OBJEXT)
+ -rm -f src/test_test_vorbis_encoder-conf.$(OBJEXT)
+ -rm -f src/test_test_vorbis_encoder-encoder_list.$(OBJEXT)
+ -rm -f src/test_test_vorbis_encoder-fifo_buffer.$(OBJEXT)
+ -rm -f src/test_test_vorbis_encoder-growing_fifo.$(OBJEXT)
+ -rm -f src/test_test_vorbis_encoder-pcm_buffer.$(OBJEXT)
+ -rm -f src/test_test_vorbis_encoder-tag.$(OBJEXT)
+ -rm -f src/test_test_vorbis_encoder-tag_pool.$(OBJEXT)
+ -rm -f src/test_test_vorbis_encoder-tokenizer.$(OBJEXT)
+ -rm -f src/test_test_vorbis_encoder-utils.$(OBJEXT)
-rm -f test/run_inotify.$(OBJEXT)
-rm -f test/run_normalize.$(OBJEXT)
-rm -f test/software_volume.$(OBJEXT)
@@ -4444,6 +4577,7 @@ mostlyclean-compile:
-rm -f test/test_run_filter-run_filter.$(OBJEXT)
-rm -f test/test_run_input-run_input.$(OBJEXT)
-rm -f test/test_run_output-run_output.$(OBJEXT)
+ -rm -f test/test_test_vorbis_encoder-test_vorbis_encoder.$(OBJEXT)
distclean-compile:
-rm -f *.tab.c
@@ -4788,6 +4922,18 @@ distclean-compile:
@AMDEP_TRUE@@am__include@ @am__quote at src/$(DEPDIR)/test_run_output-timer.Po at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at src/$(DEPDIR)/test_run_output-tokenizer.Po at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at src/$(DEPDIR)/test_run_output-utils.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at src/$(DEPDIR)/test_test_vorbis_encoder-audio_check.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at src/$(DEPDIR)/test_test_vorbis_encoder-audio_format.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at src/$(DEPDIR)/test_test_vorbis_encoder-audio_parser.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at src/$(DEPDIR)/test_test_vorbis_encoder-conf.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at src/$(DEPDIR)/test_test_vorbis_encoder-encoder_list.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at src/$(DEPDIR)/test_test_vorbis_encoder-fifo_buffer.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at src/$(DEPDIR)/test_test_vorbis_encoder-growing_fifo.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at src/$(DEPDIR)/test_test_vorbis_encoder-pcm_buffer.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at src/$(DEPDIR)/test_test_vorbis_encoder-tag.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at src/$(DEPDIR)/test_test_vorbis_encoder-tag_pool.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at src/$(DEPDIR)/test_test_vorbis_encoder-tokenizer.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at src/$(DEPDIR)/test_test_vorbis_encoder-utils.Po at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at src/AudioCompress/$(DEPDIR)/compress.Po at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at src/AudioCompress/$(DEPDIR)/src_mpd-compress.Po at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at src/AudioCompress/$(DEPDIR)/test_run_filter-compress.Po at am__quote@
@@ -4894,6 +5040,12 @@ distclean-compile:
@AMDEP_TRUE@@am__include@ @am__quote at src/encoder/$(DEPDIR)/test_run_output-twolame_encoder.Po at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at src/encoder/$(DEPDIR)/test_run_output-vorbis_encoder.Po at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at src/encoder/$(DEPDIR)/test_run_output-wave_encoder.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at src/encoder/$(DEPDIR)/test_test_vorbis_encoder-flac_encoder.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at src/encoder/$(DEPDIR)/test_test_vorbis_encoder-lame_encoder.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at src/encoder/$(DEPDIR)/test_test_vorbis_encoder-null_encoder.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at src/encoder/$(DEPDIR)/test_test_vorbis_encoder-twolame_encoder.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at src/encoder/$(DEPDIR)/test_test_vorbis_encoder-vorbis_encoder.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at src/encoder/$(DEPDIR)/test_test_vorbis_encoder-wave_encoder.Po at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at src/filter/$(DEPDIR)/src_mpd-autoconvert_filter_plugin.Po at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at src/filter/$(DEPDIR)/src_mpd-chain_filter_plugin.Po at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at src/filter/$(DEPDIR)/src_mpd-convert_filter_plugin.Po at am__quote@
@@ -5029,6 +5181,7 @@ distclean-compile:
@AMDEP_TRUE@@am__include@ @am__quote at test/$(DEPDIR)/test_run_filter-run_filter.Po at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at test/$(DEPDIR)/test_run_input-run_input.Po at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at test/$(DEPDIR)/test_run_output-run_output.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at test/$(DEPDIR)/test_test_vorbis_encoder-test_vorbis_encoder.Po at am__quote@
.c.o:
@am__fastdepCC_TRUE@ depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
@@ -12998,6 +13151,272 @@ src/output/test_run_output-winmm_output_plugin.obj: src/output/winmm_output_plug
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_run_output_CPPFLAGS) $(CPPFLAGS) $(test_run_output_CFLAGS) $(CFLAGS) -c -o src/output/test_run_output-winmm_output_plugin.obj `if test -f 'src/output/winmm_output_plugin.c'; then $(CYGPATH_W) 'src/output/winmm_output_plugin.c'; else $(CYGPATH_W) '$(srcdir)/src/output/winmm_output_plugin.c'; fi`
+test/test_test_vorbis_encoder-test_vorbis_encoder.o: test/test_vorbis_encoder.c
+ at am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_test_vorbis_encoder_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT test/test_test_vorbis_encoder-test_vorbis_encoder.o -MD -MP -MF test/$(DEPDIR)/test_test_vorbis_encoder-test_vorbis_encoder.Tpo -c -o test/test_test_vorbis_encoder-test_vorbis_encoder.o `test -f 'test/test_vorbis_encoder.c' || echo '$(srcdir)/'`test/test_vorbis_encoder.c
+ at am__fastdepCC_TRUE@ $(am__mv) test/$(DEPDIR)/test_test_vorbis_encoder-test_vorbis_encoder.Tpo test/$(DEPDIR)/test_test_vorbis_encoder-test_vorbis_encoder.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ source='test/test_vorbis_encoder.c' object='test/test_test_vorbis_encoder-test_vorbis_encoder.o' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_test_vorbis_encoder_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o test/test_test_vorbis_encoder-test_vorbis_encoder.o `test -f 'test/test_vorbis_encoder.c' || echo '$(srcdir)/'`test/test_vorbis_encoder.c
+
+test/test_test_vorbis_encoder-test_vorbis_encoder.obj: test/test_vorbis_encoder.c
+ at am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_test_vorbis_encoder_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT test/test_test_vorbis_encoder-test_vorbis_encoder.obj -MD -MP -MF test/$(DEPDIR)/test_test_vorbis_encoder-test_vorbis_encoder.Tpo -c -o test/test_test_vorbis_encoder-test_vorbis_encoder.obj `if test -f 'test/test_vorbis_encoder.c'; then $(CYGPATH_W) 'test/test_vorbis_encoder.c'; else $(CYGPATH_W) '$(srcdir)/test/test_vorbis_encoder.c'; fi`
+ at am__fastdepCC_TRUE@ $(am__mv) test/$(DEPDIR)/test_test_vorbis_encoder-test_vorbis_encoder.Tpo test/$(DEPDIR)/test_test_vorbis_encoder-test_vorbis_encoder.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ source='test/test_vorbis_encoder.c' object='test/test_test_vorbis_encoder-test_vorbis_encoder.obj' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_test_vorbis_encoder_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o test/test_test_vorbis_encoder-test_vorbis_encoder.obj `if test -f 'test/test_vorbis_encoder.c'; then $(CYGPATH_W) 'test/test_vorbis_encoder.c'; else $(CYGPATH_W) '$(srcdir)/test/test_vorbis_encoder.c'; fi`
+
+src/test_test_vorbis_encoder-conf.o: src/conf.c
+ at am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_test_vorbis_encoder_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/test_test_vorbis_encoder-conf.o -MD -MP -MF src/$(DEPDIR)/test_test_vorbis_encoder-conf.Tpo -c -o src/test_test_vorbis_encoder-conf.o `test -f 'src/conf.c' || echo '$(srcdir)/'`src/conf.c
+ at am__fastdepCC_TRUE@ $(am__mv) src/$(DEPDIR)/test_test_vorbis_encoder-conf.Tpo src/$(DEPDIR)/test_test_vorbis_encoder-conf.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ source='src/conf.c' object='src/test_test_vorbis_encoder-conf.o' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_test_vorbis_encoder_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/test_test_vorbis_encoder-conf.o `test -f 'src/conf.c' || echo '$(srcdir)/'`src/conf.c
+
+src/test_test_vorbis_encoder-conf.obj: src/conf.c
+ at am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_test_vorbis_encoder_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/test_test_vorbis_encoder-conf.obj -MD -MP -MF src/$(DEPDIR)/test_test_vorbis_encoder-conf.Tpo -c -o src/test_test_vorbis_encoder-conf.obj `if test -f 'src/conf.c'; then $(CYGPATH_W) 'src/conf.c'; else $(CYGPATH_W) '$(srcdir)/src/conf.c'; fi`
+ at am__fastdepCC_TRUE@ $(am__mv) src/$(DEPDIR)/test_test_vorbis_encoder-conf.Tpo src/$(DEPDIR)/test_test_vorbis_encoder-conf.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ source='src/conf.c' object='src/test_test_vorbis_encoder-conf.obj' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_test_vorbis_encoder_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/test_test_vorbis_encoder-conf.obj `if test -f 'src/conf.c'; then $(CYGPATH_W) 'src/conf.c'; else $(CYGPATH_W) '$(srcdir)/src/conf.c'; fi`
+
+src/test_test_vorbis_encoder-tokenizer.o: src/tokenizer.c
+ at am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_test_vorbis_encoder_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/test_test_vorbis_encoder-tokenizer.o -MD -MP -MF src/$(DEPDIR)/test_test_vorbis_encoder-tokenizer.Tpo -c -o src/test_test_vorbis_encoder-tokenizer.o `test -f 'src/tokenizer.c' || echo '$(srcdir)/'`src/tokenizer.c
+ at am__fastdepCC_TRUE@ $(am__mv) src/$(DEPDIR)/test_test_vorbis_encoder-tokenizer.Tpo src/$(DEPDIR)/test_test_vorbis_encoder-tokenizer.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ source='src/tokenizer.c' object='src/test_test_vorbis_encoder-tokenizer.o' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_test_vorbis_encoder_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/test_test_vorbis_encoder-tokenizer.o `test -f 'src/tokenizer.c' || echo '$(srcdir)/'`src/tokenizer.c
+
+src/test_test_vorbis_encoder-tokenizer.obj: src/tokenizer.c
+ at am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_test_vorbis_encoder_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/test_test_vorbis_encoder-tokenizer.obj -MD -MP -MF src/$(DEPDIR)/test_test_vorbis_encoder-tokenizer.Tpo -c -o src/test_test_vorbis_encoder-tokenizer.obj `if test -f 'src/tokenizer.c'; then $(CYGPATH_W) 'src/tokenizer.c'; else $(CYGPATH_W) '$(srcdir)/src/tokenizer.c'; fi`
+ at am__fastdepCC_TRUE@ $(am__mv) src/$(DEPDIR)/test_test_vorbis_encoder-tokenizer.Tpo src/$(DEPDIR)/test_test_vorbis_encoder-tokenizer.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ source='src/tokenizer.c' object='src/test_test_vorbis_encoder-tokenizer.obj' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_test_vorbis_encoder_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/test_test_vorbis_encoder-tokenizer.obj `if test -f 'src/tokenizer.c'; then $(CYGPATH_W) 'src/tokenizer.c'; else $(CYGPATH_W) '$(srcdir)/src/tokenizer.c'; fi`
+
+src/test_test_vorbis_encoder-utils.o: src/utils.c
+ at am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_test_vorbis_encoder_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/test_test_vorbis_encoder-utils.o -MD -MP -MF src/$(DEPDIR)/test_test_vorbis_encoder-utils.Tpo -c -o src/test_test_vorbis_encoder-utils.o `test -f 'src/utils.c' || echo '$(srcdir)/'`src/utils.c
+ at am__fastdepCC_TRUE@ $(am__mv) src/$(DEPDIR)/test_test_vorbis_encoder-utils.Tpo src/$(DEPDIR)/test_test_vorbis_encoder-utils.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ source='src/utils.c' object='src/test_test_vorbis_encoder-utils.o' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_test_vorbis_encoder_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/test_test_vorbis_encoder-utils.o `test -f 'src/utils.c' || echo '$(srcdir)/'`src/utils.c
+
+src/test_test_vorbis_encoder-utils.obj: src/utils.c
+ at am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_test_vorbis_encoder_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/test_test_vorbis_encoder-utils.obj -MD -MP -MF src/$(DEPDIR)/test_test_vorbis_encoder-utils.Tpo -c -o src/test_test_vorbis_encoder-utils.obj `if test -f 'src/utils.c'; then $(CYGPATH_W) 'src/utils.c'; else $(CYGPATH_W) '$(srcdir)/src/utils.c'; fi`
+ at am__fastdepCC_TRUE@ $(am__mv) src/$(DEPDIR)/test_test_vorbis_encoder-utils.Tpo src/$(DEPDIR)/test_test_vorbis_encoder-utils.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ source='src/utils.c' object='src/test_test_vorbis_encoder-utils.obj' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_test_vorbis_encoder_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/test_test_vorbis_encoder-utils.obj `if test -f 'src/utils.c'; then $(CYGPATH_W) 'src/utils.c'; else $(CYGPATH_W) '$(srcdir)/src/utils.c'; fi`
+
+src/test_test_vorbis_encoder-tag.o: src/tag.c
+ at am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_test_vorbis_encoder_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/test_test_vorbis_encoder-tag.o -MD -MP -MF src/$(DEPDIR)/test_test_vorbis_encoder-tag.Tpo -c -o src/test_test_vorbis_encoder-tag.o `test -f 'src/tag.c' || echo '$(srcdir)/'`src/tag.c
+ at am__fastdepCC_TRUE@ $(am__mv) src/$(DEPDIR)/test_test_vorbis_encoder-tag.Tpo src/$(DEPDIR)/test_test_vorbis_encoder-tag.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ source='src/tag.c' object='src/test_test_vorbis_encoder-tag.o' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_test_vorbis_encoder_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/test_test_vorbis_encoder-tag.o `test -f 'src/tag.c' || echo '$(srcdir)/'`src/tag.c
+
+src/test_test_vorbis_encoder-tag.obj: src/tag.c
+ at am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_test_vorbis_encoder_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/test_test_vorbis_encoder-tag.obj -MD -MP -MF src/$(DEPDIR)/test_test_vorbis_encoder-tag.Tpo -c -o src/test_test_vorbis_encoder-tag.obj `if test -f 'src/tag.c'; then $(CYGPATH_W) 'src/tag.c'; else $(CYGPATH_W) '$(srcdir)/src/tag.c'; fi`
+ at am__fastdepCC_TRUE@ $(am__mv) src/$(DEPDIR)/test_test_vorbis_encoder-tag.Tpo src/$(DEPDIR)/test_test_vorbis_encoder-tag.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ source='src/tag.c' object='src/test_test_vorbis_encoder-tag.obj' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_test_vorbis_encoder_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/test_test_vorbis_encoder-tag.obj `if test -f 'src/tag.c'; then $(CYGPATH_W) 'src/tag.c'; else $(CYGPATH_W) '$(srcdir)/src/tag.c'; fi`
+
+src/test_test_vorbis_encoder-tag_pool.o: src/tag_pool.c
+ at am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_test_vorbis_encoder_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/test_test_vorbis_encoder-tag_pool.o -MD -MP -MF src/$(DEPDIR)/test_test_vorbis_encoder-tag_pool.Tpo -c -o src/test_test_vorbis_encoder-tag_pool.o `test -f 'src/tag_pool.c' || echo '$(srcdir)/'`src/tag_pool.c
+ at am__fastdepCC_TRUE@ $(am__mv) src/$(DEPDIR)/test_test_vorbis_encoder-tag_pool.Tpo src/$(DEPDIR)/test_test_vorbis_encoder-tag_pool.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ source='src/tag_pool.c' object='src/test_test_vorbis_encoder-tag_pool.o' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_test_vorbis_encoder_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/test_test_vorbis_encoder-tag_pool.o `test -f 'src/tag_pool.c' || echo '$(srcdir)/'`src/tag_pool.c
+
+src/test_test_vorbis_encoder-tag_pool.obj: src/tag_pool.c
+ at am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_test_vorbis_encoder_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/test_test_vorbis_encoder-tag_pool.obj -MD -MP -MF src/$(DEPDIR)/test_test_vorbis_encoder-tag_pool.Tpo -c -o src/test_test_vorbis_encoder-tag_pool.obj `if test -f 'src/tag_pool.c'; then $(CYGPATH_W) 'src/tag_pool.c'; else $(CYGPATH_W) '$(srcdir)/src/tag_pool.c'; fi`
+ at am__fastdepCC_TRUE@ $(am__mv) src/$(DEPDIR)/test_test_vorbis_encoder-tag_pool.Tpo src/$(DEPDIR)/test_test_vorbis_encoder-tag_pool.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ source='src/tag_pool.c' object='src/test_test_vorbis_encoder-tag_pool.obj' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_test_vorbis_encoder_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/test_test_vorbis_encoder-tag_pool.obj `if test -f 'src/tag_pool.c'; then $(CYGPATH_W) 'src/tag_pool.c'; else $(CYGPATH_W) '$(srcdir)/src/tag_pool.c'; fi`
+
+src/test_test_vorbis_encoder-audio_check.o: src/audio_check.c
+ at am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_test_vorbis_encoder_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/test_test_vorbis_encoder-audio_check.o -MD -MP -MF src/$(DEPDIR)/test_test_vorbis_encoder-audio_check.Tpo -c -o src/test_test_vorbis_encoder-audio_check.o `test -f 'src/audio_check.c' || echo '$(srcdir)/'`src/audio_check.c
+ at am__fastdepCC_TRUE@ $(am__mv) src/$(DEPDIR)/test_test_vorbis_encoder-audio_check.Tpo src/$(DEPDIR)/test_test_vorbis_encoder-audio_check.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ source='src/audio_check.c' object='src/test_test_vorbis_encoder-audio_check.o' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_test_vorbis_encoder_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/test_test_vorbis_encoder-audio_check.o `test -f 'src/audio_check.c' || echo '$(srcdir)/'`src/audio_check.c
+
+src/test_test_vorbis_encoder-audio_check.obj: src/audio_check.c
+ at am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_test_vorbis_encoder_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/test_test_vorbis_encoder-audio_check.obj -MD -MP -MF src/$(DEPDIR)/test_test_vorbis_encoder-audio_check.Tpo -c -o src/test_test_vorbis_encoder-audio_check.obj `if test -f 'src/audio_check.c'; then $(CYGPATH_W) 'src/audio_check.c'; else $(CYGPATH_W) '$(srcdir)/src/audio_check.c'; fi`
+ at am__fastdepCC_TRUE@ $(am__mv) src/$(DEPDIR)/test_test_vorbis_encoder-audio_check.Tpo src/$(DEPDIR)/test_test_vorbis_encoder-audio_check.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ source='src/audio_check.c' object='src/test_test_vorbis_encoder-audio_check.obj' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_test_vorbis_encoder_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/test_test_vorbis_encoder-audio_check.obj `if test -f 'src/audio_check.c'; then $(CYGPATH_W) 'src/audio_check.c'; else $(CYGPATH_W) '$(srcdir)/src/audio_check.c'; fi`
+
+src/test_test_vorbis_encoder-audio_format.o: src/audio_format.c
+ at am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_test_vorbis_encoder_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/test_test_vorbis_encoder-audio_format.o -MD -MP -MF src/$(DEPDIR)/test_test_vorbis_encoder-audio_format.Tpo -c -o src/test_test_vorbis_encoder-audio_format.o `test -f 'src/audio_format.c' || echo '$(srcdir)/'`src/audio_format.c
+ at am__fastdepCC_TRUE@ $(am__mv) src/$(DEPDIR)/test_test_vorbis_encoder-audio_format.Tpo src/$(DEPDIR)/test_test_vorbis_encoder-audio_format.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ source='src/audio_format.c' object='src/test_test_vorbis_encoder-audio_format.o' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_test_vorbis_encoder_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/test_test_vorbis_encoder-audio_format.o `test -f 'src/audio_format.c' || echo '$(srcdir)/'`src/audio_format.c
+
+src/test_test_vorbis_encoder-audio_format.obj: src/audio_format.c
+ at am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_test_vorbis_encoder_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/test_test_vorbis_encoder-audio_format.obj -MD -MP -MF src/$(DEPDIR)/test_test_vorbis_encoder-audio_format.Tpo -c -o src/test_test_vorbis_encoder-audio_format.obj `if test -f 'src/audio_format.c'; then $(CYGPATH_W) 'src/audio_format.c'; else $(CYGPATH_W) '$(srcdir)/src/audio_format.c'; fi`
+ at am__fastdepCC_TRUE@ $(am__mv) src/$(DEPDIR)/test_test_vorbis_encoder-audio_format.Tpo src/$(DEPDIR)/test_test_vorbis_encoder-audio_format.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ source='src/audio_format.c' object='src/test_test_vorbis_encoder-audio_format.obj' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_test_vorbis_encoder_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/test_test_vorbis_encoder-audio_format.obj `if test -f 'src/audio_format.c'; then $(CYGPATH_W) 'src/audio_format.c'; else $(CYGPATH_W) '$(srcdir)/src/audio_format.c'; fi`
+
+src/test_test_vorbis_encoder-audio_parser.o: src/audio_parser.c
+ at am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_test_vorbis_encoder_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/test_test_vorbis_encoder-audio_parser.o -MD -MP -MF src/$(DEPDIR)/test_test_vorbis_encoder-audio_parser.Tpo -c -o src/test_test_vorbis_encoder-audio_parser.o `test -f 'src/audio_parser.c' || echo '$(srcdir)/'`src/audio_parser.c
+ at am__fastdepCC_TRUE@ $(am__mv) src/$(DEPDIR)/test_test_vorbis_encoder-audio_parser.Tpo src/$(DEPDIR)/test_test_vorbis_encoder-audio_parser.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ source='src/audio_parser.c' object='src/test_test_vorbis_encoder-audio_parser.o' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_test_vorbis_encoder_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/test_test_vorbis_encoder-audio_parser.o `test -f 'src/audio_parser.c' || echo '$(srcdir)/'`src/audio_parser.c
+
+src/test_test_vorbis_encoder-audio_parser.obj: src/audio_parser.c
+ at am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_test_vorbis_encoder_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/test_test_vorbis_encoder-audio_parser.obj -MD -MP -MF src/$(DEPDIR)/test_test_vorbis_encoder-audio_parser.Tpo -c -o src/test_test_vorbis_encoder-audio_parser.obj `if test -f 'src/audio_parser.c'; then $(CYGPATH_W) 'src/audio_parser.c'; else $(CYGPATH_W) '$(srcdir)/src/audio_parser.c'; fi`
+ at am__fastdepCC_TRUE@ $(am__mv) src/$(DEPDIR)/test_test_vorbis_encoder-audio_parser.Tpo src/$(DEPDIR)/test_test_vorbis_encoder-audio_parser.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ source='src/audio_parser.c' object='src/test_test_vorbis_encoder-audio_parser.obj' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_test_vorbis_encoder_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/test_test_vorbis_encoder-audio_parser.obj `if test -f 'src/audio_parser.c'; then $(CYGPATH_W) 'src/audio_parser.c'; else $(CYGPATH_W) '$(srcdir)/src/audio_parser.c'; fi`
+
+src/test_test_vorbis_encoder-pcm_buffer.o: src/pcm_buffer.c
+ at am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_test_vorbis_encoder_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/test_test_vorbis_encoder-pcm_buffer.o -MD -MP -MF src/$(DEPDIR)/test_test_vorbis_encoder-pcm_buffer.Tpo -c -o src/test_test_vorbis_encoder-pcm_buffer.o `test -f 'src/pcm_buffer.c' || echo '$(srcdir)/'`src/pcm_buffer.c
+ at am__fastdepCC_TRUE@ $(am__mv) src/$(DEPDIR)/test_test_vorbis_encoder-pcm_buffer.Tpo src/$(DEPDIR)/test_test_vorbis_encoder-pcm_buffer.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ source='src/pcm_buffer.c' object='src/test_test_vorbis_encoder-pcm_buffer.o' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_test_vorbis_encoder_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/test_test_vorbis_encoder-pcm_buffer.o `test -f 'src/pcm_buffer.c' || echo '$(srcdir)/'`src/pcm_buffer.c
+
+src/test_test_vorbis_encoder-pcm_buffer.obj: src/pcm_buffer.c
+ at am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_test_vorbis_encoder_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/test_test_vorbis_encoder-pcm_buffer.obj -MD -MP -MF src/$(DEPDIR)/test_test_vorbis_encoder-pcm_buffer.Tpo -c -o src/test_test_vorbis_encoder-pcm_buffer.obj `if test -f 'src/pcm_buffer.c'; then $(CYGPATH_W) 'src/pcm_buffer.c'; else $(CYGPATH_W) '$(srcdir)/src/pcm_buffer.c'; fi`
+ at am__fastdepCC_TRUE@ $(am__mv) src/$(DEPDIR)/test_test_vorbis_encoder-pcm_buffer.Tpo src/$(DEPDIR)/test_test_vorbis_encoder-pcm_buffer.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ source='src/pcm_buffer.c' object='src/test_test_vorbis_encoder-pcm_buffer.obj' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_test_vorbis_encoder_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/test_test_vorbis_encoder-pcm_buffer.obj `if test -f 'src/pcm_buffer.c'; then $(CYGPATH_W) 'src/pcm_buffer.c'; else $(CYGPATH_W) '$(srcdir)/src/pcm_buffer.c'; fi`
+
+src/test_test_vorbis_encoder-fifo_buffer.o: src/fifo_buffer.c
+ at am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_test_vorbis_encoder_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/test_test_vorbis_encoder-fifo_buffer.o -MD -MP -MF src/$(DEPDIR)/test_test_vorbis_encoder-fifo_buffer.Tpo -c -o src/test_test_vorbis_encoder-fifo_buffer.o `test -f 'src/fifo_buffer.c' || echo '$(srcdir)/'`src/fifo_buffer.c
+ at am__fastdepCC_TRUE@ $(am__mv) src/$(DEPDIR)/test_test_vorbis_encoder-fifo_buffer.Tpo src/$(DEPDIR)/test_test_vorbis_encoder-fifo_buffer.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ source='src/fifo_buffer.c' object='src/test_test_vorbis_encoder-fifo_buffer.o' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_test_vorbis_encoder_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/test_test_vorbis_encoder-fifo_buffer.o `test -f 'src/fifo_buffer.c' || echo '$(srcdir)/'`src/fifo_buffer.c
+
+src/test_test_vorbis_encoder-fifo_buffer.obj: src/fifo_buffer.c
+ at am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_test_vorbis_encoder_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/test_test_vorbis_encoder-fifo_buffer.obj -MD -MP -MF src/$(DEPDIR)/test_test_vorbis_encoder-fifo_buffer.Tpo -c -o src/test_test_vorbis_encoder-fifo_buffer.obj `if test -f 'src/fifo_buffer.c'; then $(CYGPATH_W) 'src/fifo_buffer.c'; else $(CYGPATH_W) '$(srcdir)/src/fifo_buffer.c'; fi`
+ at am__fastdepCC_TRUE@ $(am__mv) src/$(DEPDIR)/test_test_vorbis_encoder-fifo_buffer.Tpo src/$(DEPDIR)/test_test_vorbis_encoder-fifo_buffer.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ source='src/fifo_buffer.c' object='src/test_test_vorbis_encoder-fifo_buffer.obj' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_test_vorbis_encoder_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/test_test_vorbis_encoder-fifo_buffer.obj `if test -f 'src/fifo_buffer.c'; then $(CYGPATH_W) 'src/fifo_buffer.c'; else $(CYGPATH_W) '$(srcdir)/src/fifo_buffer.c'; fi`
+
+src/test_test_vorbis_encoder-growing_fifo.o: src/growing_fifo.c
+ at am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_test_vorbis_encoder_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/test_test_vorbis_encoder-growing_fifo.o -MD -MP -MF src/$(DEPDIR)/test_test_vorbis_encoder-growing_fifo.Tpo -c -o src/test_test_vorbis_encoder-growing_fifo.o `test -f 'src/growing_fifo.c' || echo '$(srcdir)/'`src/growing_fifo.c
+ at am__fastdepCC_TRUE@ $(am__mv) src/$(DEPDIR)/test_test_vorbis_encoder-growing_fifo.Tpo src/$(DEPDIR)/test_test_vorbis_encoder-growing_fifo.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ source='src/growing_fifo.c' object='src/test_test_vorbis_encoder-growing_fifo.o' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_test_vorbis_encoder_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/test_test_vorbis_encoder-growing_fifo.o `test -f 'src/growing_fifo.c' || echo '$(srcdir)/'`src/growing_fifo.c
+
+src/test_test_vorbis_encoder-growing_fifo.obj: src/growing_fifo.c
+ at am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_test_vorbis_encoder_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/test_test_vorbis_encoder-growing_fifo.obj -MD -MP -MF src/$(DEPDIR)/test_test_vorbis_encoder-growing_fifo.Tpo -c -o src/test_test_vorbis_encoder-growing_fifo.obj `if test -f 'src/growing_fifo.c'; then $(CYGPATH_W) 'src/growing_fifo.c'; else $(CYGPATH_W) '$(srcdir)/src/growing_fifo.c'; fi`
+ at am__fastdepCC_TRUE@ $(am__mv) src/$(DEPDIR)/test_test_vorbis_encoder-growing_fifo.Tpo src/$(DEPDIR)/test_test_vorbis_encoder-growing_fifo.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ source='src/growing_fifo.c' object='src/test_test_vorbis_encoder-growing_fifo.obj' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_test_vorbis_encoder_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/test_test_vorbis_encoder-growing_fifo.obj `if test -f 'src/growing_fifo.c'; then $(CYGPATH_W) 'src/growing_fifo.c'; else $(CYGPATH_W) '$(srcdir)/src/growing_fifo.c'; fi`
+
+src/test_test_vorbis_encoder-encoder_list.o: src/encoder_list.c
+ at am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_test_vorbis_encoder_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/test_test_vorbis_encoder-encoder_list.o -MD -MP -MF src/$(DEPDIR)/test_test_vorbis_encoder-encoder_list.Tpo -c -o src/test_test_vorbis_encoder-encoder_list.o `test -f 'src/encoder_list.c' || echo '$(srcdir)/'`src/encoder_list.c
+ at am__fastdepCC_TRUE@ $(am__mv) src/$(DEPDIR)/test_test_vorbis_encoder-encoder_list.Tpo src/$(DEPDIR)/test_test_vorbis_encoder-encoder_list.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ source='src/encoder_list.c' object='src/test_test_vorbis_encoder-encoder_list.o' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_test_vorbis_encoder_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/test_test_vorbis_encoder-encoder_list.o `test -f 'src/encoder_list.c' || echo '$(srcdir)/'`src/encoder_list.c
+
+src/test_test_vorbis_encoder-encoder_list.obj: src/encoder_list.c
+ at am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_test_vorbis_encoder_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/test_test_vorbis_encoder-encoder_list.obj -MD -MP -MF src/$(DEPDIR)/test_test_vorbis_encoder-encoder_list.Tpo -c -o src/test_test_vorbis_encoder-encoder_list.obj `if test -f 'src/encoder_list.c'; then $(CYGPATH_W) 'src/encoder_list.c'; else $(CYGPATH_W) '$(srcdir)/src/encoder_list.c'; fi`
+ at am__fastdepCC_TRUE@ $(am__mv) src/$(DEPDIR)/test_test_vorbis_encoder-encoder_list.Tpo src/$(DEPDIR)/test_test_vorbis_encoder-encoder_list.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ source='src/encoder_list.c' object='src/test_test_vorbis_encoder-encoder_list.obj' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_test_vorbis_encoder_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/test_test_vorbis_encoder-encoder_list.obj `if test -f 'src/encoder_list.c'; then $(CYGPATH_W) 'src/encoder_list.c'; else $(CYGPATH_W) '$(srcdir)/src/encoder_list.c'; fi`
+
+src/encoder/test_test_vorbis_encoder-null_encoder.o: src/encoder/null_encoder.c
+ at am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_test_vorbis_encoder_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/encoder/test_test_vorbis_encoder-null_encoder.o -MD -MP -MF src/encoder/$(DEPDIR)/test_test_vorbis_encoder-null_encoder.Tpo -c -o src/encoder/test_test_vorbis_encoder-null_encoder.o `test -f 'src/encoder/null_encoder.c' || echo '$(srcdir)/'`src/encoder/null_encoder.c
+ at am__fastdepCC_TRUE@ $(am__mv) src/encoder/$(DEPDIR)/test_test_vorbis_encoder-null_encoder.Tpo src/encoder/$(DEPDIR)/test_test_vorbis_encoder-null_encoder.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ source='src/encoder/null_encoder.c' object='src/encoder/test_test_vorbis_encoder-null_encoder.o' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_test_vorbis_encoder_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/encoder/test_test_vorbis_encoder-null_encoder.o `test -f 'src/encoder/null_encoder.c' || echo '$(srcdir)/'`src/encoder/null_encoder.c
+
+src/encoder/test_test_vorbis_encoder-null_encoder.obj: src/encoder/null_encoder.c
+ at am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_test_vorbis_encoder_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/encoder/test_test_vorbis_encoder-null_encoder.obj -MD -MP -MF src/encoder/$(DEPDIR)/test_test_vorbis_encoder-null_encoder.Tpo -c -o src/encoder/test_test_vorbis_encoder-null_encoder.obj `if test -f 'src/encoder/null_encoder.c'; then $(CYGPATH_W) 'src/encoder/null_encoder.c'; else $(CYGPATH_W) '$(srcdir)/src/encoder/null_encoder.c'; fi`
+ at am__fastdepCC_TRUE@ $(am__mv) src/encoder/$(DEPDIR)/test_test_vorbis_encoder-null_encoder.Tpo src/encoder/$(DEPDIR)/test_test_vorbis_encoder-null_encoder.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ source='src/encoder/null_encoder.c' object='src/encoder/test_test_vorbis_encoder-null_encoder.obj' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_test_vorbis_encoder_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/encoder/test_test_vorbis_encoder-null_encoder.obj `if test -f 'src/encoder/null_encoder.c'; then $(CYGPATH_W) 'src/encoder/null_encoder.c'; else $(CYGPATH_W) '$(srcdir)/src/encoder/null_encoder.c'; fi`
+
+src/encoder/test_test_vorbis_encoder-wave_encoder.o: src/encoder/wave_encoder.c
+ at am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_test_vorbis_encoder_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/encoder/test_test_vorbis_encoder-wave_encoder.o -MD -MP -MF src/encoder/$(DEPDIR)/test_test_vorbis_encoder-wave_encoder.Tpo -c -o src/encoder/test_test_vorbis_encoder-wave_encoder.o `test -f 'src/encoder/wave_encoder.c' || echo '$(srcdir)/'`src/encoder/wave_encoder.c
+ at am__fastdepCC_TRUE@ $(am__mv) src/encoder/$(DEPDIR)/test_test_vorbis_encoder-wave_encoder.Tpo src/encoder/$(DEPDIR)/test_test_vorbis_encoder-wave_encoder.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ source='src/encoder/wave_encoder.c' object='src/encoder/test_test_vorbis_encoder-wave_encoder.o' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_test_vorbis_encoder_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/encoder/test_test_vorbis_encoder-wave_encoder.o `test -f 'src/encoder/wave_encoder.c' || echo '$(srcdir)/'`src/encoder/wave_encoder.c
+
+src/encoder/test_test_vorbis_encoder-wave_encoder.obj: src/encoder/wave_encoder.c
+ at am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_test_vorbis_encoder_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/encoder/test_test_vorbis_encoder-wave_encoder.obj -MD -MP -MF src/encoder/$(DEPDIR)/test_test_vorbis_encoder-wave_encoder.Tpo -c -o src/encoder/test_test_vorbis_encoder-wave_encoder.obj `if test -f 'src/encoder/wave_encoder.c'; then $(CYGPATH_W) 'src/encoder/wave_encoder.c'; else $(CYGPATH_W) '$(srcdir)/src/encoder/wave_encoder.c'; fi`
+ at am__fastdepCC_TRUE@ $(am__mv) src/encoder/$(DEPDIR)/test_test_vorbis_encoder-wave_encoder.Tpo src/encoder/$(DEPDIR)/test_test_vorbis_encoder-wave_encoder.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ source='src/encoder/wave_encoder.c' object='src/encoder/test_test_vorbis_encoder-wave_encoder.obj' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_test_vorbis_encoder_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/encoder/test_test_vorbis_encoder-wave_encoder.obj `if test -f 'src/encoder/wave_encoder.c'; then $(CYGPATH_W) 'src/encoder/wave_encoder.c'; else $(CYGPATH_W) '$(srcdir)/src/encoder/wave_encoder.c'; fi`
+
+src/encoder/test_test_vorbis_encoder-vorbis_encoder.o: src/encoder/vorbis_encoder.c
+ at am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_test_vorbis_encoder_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/encoder/test_test_vorbis_encoder-vorbis_encoder.o -MD -MP -MF src/encoder/$(DEPDIR)/test_test_vorbis_encoder-vorbis_encoder.Tpo -c -o src/encoder/test_test_vorbis_encoder-vorbis_encoder.o `test -f 'src/encoder/vorbis_encoder.c' || echo '$(srcdir)/'`src/encoder/vorbis_encoder.c
+ at am__fastdepCC_TRUE@ $(am__mv) src/encoder/$(DEPDIR)/test_test_vorbis_encoder-vorbis_encoder.Tpo src/encoder/$(DEPDIR)/test_test_vorbis_encoder-vorbis_encoder.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ source='src/encoder/vorbis_encoder.c' object='src/encoder/test_test_vorbis_encoder-vorbis_encoder.o' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_test_vorbis_encoder_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/encoder/test_test_vorbis_encoder-vorbis_encoder.o `test -f 'src/encoder/vorbis_encoder.c' || echo '$(srcdir)/'`src/encoder/vorbis_encoder.c
+
+src/encoder/test_test_vorbis_encoder-vorbis_encoder.obj: src/encoder/vorbis_encoder.c
+ at am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_test_vorbis_encoder_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/encoder/test_test_vorbis_encoder-vorbis_encoder.obj -MD -MP -MF src/encoder/$(DEPDIR)/test_test_vorbis_encoder-vorbis_encoder.Tpo -c -o src/encoder/test_test_vorbis_encoder-vorbis_encoder.obj `if test -f 'src/encoder/vorbis_encoder.c'; then $(CYGPATH_W) 'src/encoder/vorbis_encoder.c'; else $(CYGPATH_W) '$(srcdir)/src/encoder/vorbis_encoder.c'; fi`
+ at am__fastdepCC_TRUE@ $(am__mv) src/encoder/$(DEPDIR)/test_test_vorbis_encoder-vorbis_encoder.Tpo src/encoder/$(DEPDIR)/test_test_vorbis_encoder-vorbis_encoder.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ source='src/encoder/vorbis_encoder.c' object='src/encoder/test_test_vorbis_encoder-vorbis_encoder.obj' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_test_vorbis_encoder_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/encoder/test_test_vorbis_encoder-vorbis_encoder.obj `if test -f 'src/encoder/vorbis_encoder.c'; then $(CYGPATH_W) 'src/encoder/vorbis_encoder.c'; else $(CYGPATH_W) '$(srcdir)/src/encoder/vorbis_encoder.c'; fi`
+
+src/encoder/test_test_vorbis_encoder-lame_encoder.o: src/encoder/lame_encoder.c
+ at am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_test_vorbis_encoder_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/encoder/test_test_vorbis_encoder-lame_encoder.o -MD -MP -MF src/encoder/$(DEPDIR)/test_test_vorbis_encoder-lame_encoder.Tpo -c -o src/encoder/test_test_vorbis_encoder-lame_encoder.o `test -f 'src/encoder/lame_encoder.c' || echo '$(srcdir)/'`src/encoder/lame_encoder.c
+ at am__fastdepCC_TRUE@ $(am__mv) src/encoder/$(DEPDIR)/test_test_vorbis_encoder-lame_encoder.Tpo src/encoder/$(DEPDIR)/test_test_vorbis_encoder-lame_encoder.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ source='src/encoder/lame_encoder.c' object='src/encoder/test_test_vorbis_encoder-lame_encoder.o' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_test_vorbis_encoder_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/encoder/test_test_vorbis_encoder-lame_encoder.o `test -f 'src/encoder/lame_encoder.c' || echo '$(srcdir)/'`src/encoder/lame_encoder.c
+
+src/encoder/test_test_vorbis_encoder-lame_encoder.obj: src/encoder/lame_encoder.c
+ at am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_test_vorbis_encoder_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/encoder/test_test_vorbis_encoder-lame_encoder.obj -MD -MP -MF src/encoder/$(DEPDIR)/test_test_vorbis_encoder-lame_encoder.Tpo -c -o src/encoder/test_test_vorbis_encoder-lame_encoder.obj `if test -f 'src/encoder/lame_encoder.c'; then $(CYGPATH_W) 'src/encoder/lame_encoder.c'; else $(CYGPATH_W) '$(srcdir)/src/encoder/lame_encoder.c'; fi`
+ at am__fastdepCC_TRUE@ $(am__mv) src/encoder/$(DEPDIR)/test_test_vorbis_encoder-lame_encoder.Tpo src/encoder/$(DEPDIR)/test_test_vorbis_encoder-lame_encoder.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ source='src/encoder/lame_encoder.c' object='src/encoder/test_test_vorbis_encoder-lame_encoder.obj' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_test_vorbis_encoder_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/encoder/test_test_vorbis_encoder-lame_encoder.obj `if test -f 'src/encoder/lame_encoder.c'; then $(CYGPATH_W) 'src/encoder/lame_encoder.c'; else $(CYGPATH_W) '$(srcdir)/src/encoder/lame_encoder.c'; fi`
+
+src/encoder/test_test_vorbis_encoder-twolame_encoder.o: src/encoder/twolame_encoder.c
+ at am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_test_vorbis_encoder_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/encoder/test_test_vorbis_encoder-twolame_encoder.o -MD -MP -MF src/encoder/$(DEPDIR)/test_test_vorbis_encoder-twolame_encoder.Tpo -c -o src/encoder/test_test_vorbis_encoder-twolame_encoder.o `test -f 'src/encoder/twolame_encoder.c' || echo '$(srcdir)/'`src/encoder/twolame_encoder.c
+ at am__fastdepCC_TRUE@ $(am__mv) src/encoder/$(DEPDIR)/test_test_vorbis_encoder-twolame_encoder.Tpo src/encoder/$(DEPDIR)/test_test_vorbis_encoder-twolame_encoder.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ source='src/encoder/twolame_encoder.c' object='src/encoder/test_test_vorbis_encoder-twolame_encoder.o' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_test_vorbis_encoder_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/encoder/test_test_vorbis_encoder-twolame_encoder.o `test -f 'src/encoder/twolame_encoder.c' || echo '$(srcdir)/'`src/encoder/twolame_encoder.c
+
+src/encoder/test_test_vorbis_encoder-twolame_encoder.obj: src/encoder/twolame_encoder.c
+ at am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_test_vorbis_encoder_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/encoder/test_test_vorbis_encoder-twolame_encoder.obj -MD -MP -MF src/encoder/$(DEPDIR)/test_test_vorbis_encoder-twolame_encoder.Tpo -c -o src/encoder/test_test_vorbis_encoder-twolame_encoder.obj `if test -f 'src/encoder/twolame_encoder.c'; then $(CYGPATH_W) 'src/encoder/twolame_encoder.c'; else $(CYGPATH_W) '$(srcdir)/src/encoder/twolame_encoder.c'; fi`
+ at am__fastdepCC_TRUE@ $(am__mv) src/encoder/$(DEPDIR)/test_test_vorbis_encoder-twolame_encoder.Tpo src/encoder/$(DEPDIR)/test_test_vorbis_encoder-twolame_encoder.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ source='src/encoder/twolame_encoder.c' object='src/encoder/test_test_vorbis_encoder-twolame_encoder.obj' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_test_vorbis_encoder_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/encoder/test_test_vorbis_encoder-twolame_encoder.obj `if test -f 'src/encoder/twolame_encoder.c'; then $(CYGPATH_W) 'src/encoder/twolame_encoder.c'; else $(CYGPATH_W) '$(srcdir)/src/encoder/twolame_encoder.c'; fi`
+
+src/encoder/test_test_vorbis_encoder-flac_encoder.o: src/encoder/flac_encoder.c
+ at am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_test_vorbis_encoder_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/encoder/test_test_vorbis_encoder-flac_encoder.o -MD -MP -MF src/encoder/$(DEPDIR)/test_test_vorbis_encoder-flac_encoder.Tpo -c -o src/encoder/test_test_vorbis_encoder-flac_encoder.o `test -f 'src/encoder/flac_encoder.c' || echo '$(srcdir)/'`src/encoder/flac_encoder.c
+ at am__fastdepCC_TRUE@ $(am__mv) src/encoder/$(DEPDIR)/test_test_vorbis_encoder-flac_encoder.Tpo src/encoder/$(DEPDIR)/test_test_vorbis_encoder-flac_encoder.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ source='src/encoder/flac_encoder.c' object='src/encoder/test_test_vorbis_encoder-flac_encoder.o' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_test_vorbis_encoder_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/encoder/test_test_vorbis_encoder-flac_encoder.o `test -f 'src/encoder/flac_encoder.c' || echo '$(srcdir)/'`src/encoder/flac_encoder.c
+
+src/encoder/test_test_vorbis_encoder-flac_encoder.obj: src/encoder/flac_encoder.c
+ at am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_test_vorbis_encoder_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/encoder/test_test_vorbis_encoder-flac_encoder.obj -MD -MP -MF src/encoder/$(DEPDIR)/test_test_vorbis_encoder-flac_encoder.Tpo -c -o src/encoder/test_test_vorbis_encoder-flac_encoder.obj `if test -f 'src/encoder/flac_encoder.c'; then $(CYGPATH_W) 'src/encoder/flac_encoder.c'; else $(CYGPATH_W) '$(srcdir)/src/encoder/flac_encoder.c'; fi`
+ at am__fastdepCC_TRUE@ $(am__mv) src/encoder/$(DEPDIR)/test_test_vorbis_encoder-flac_encoder.Tpo src/encoder/$(DEPDIR)/test_test_vorbis_encoder-flac_encoder.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ source='src/encoder/flac_encoder.c' object='src/encoder/test_test_vorbis_encoder-flac_encoder.obj' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_test_vorbis_encoder_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/encoder/test_test_vorbis_encoder-flac_encoder.obj `if test -f 'src/encoder/flac_encoder.c'; then $(CYGPATH_W) 'src/encoder/flac_encoder.c'; else $(CYGPATH_W) '$(srcdir)/src/encoder/flac_encoder.c'; fi`
+
.cxx.o:
@am__fastdepCXX_TRUE@ depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
@@ -13090,9 +13509,7 @@ uninstall-man1:
sed -n '/\.1[a-z]*$$/p'; \
} | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^1][0-9a-z]*$$,1,;x' \
-e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \
- test -z "$$files" || { \
- echo " ( cd '$(DESTDIR)$(man1dir)' && rm -f" $$files ")"; \
- cd "$(DESTDIR)$(man1dir)" && rm -f $$files; }
+ dir='$(DESTDIR)$(man1dir)'; $(am__uninstall_files_from_dir)
install-man5: $(man_MANS)
@$(NORMAL_INSTALL)
test -z "$(man5dir)" || $(MKDIR_P) "$(DESTDIR)$(man5dir)"
@@ -13128,9 +13545,7 @@ uninstall-man5:
sed -n '/\.5[a-z]*$$/p'; \
} | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^5][0-9a-z]*$$,5,;x' \
-e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \
- test -z "$$files" || { \
- echo " ( cd '$(DESTDIR)$(man5dir)' && rm -f" $$files ")"; \
- cd "$(DESTDIR)$(man5dir)" && rm -f $$files; }
+ dir='$(DESTDIR)$(man5dir)'; $(am__uninstall_files_from_dir)
install-developerDATA: $(developer_DATA)
@$(NORMAL_INSTALL)
test -z "$(developerdir)" || $(MKDIR_P) "$(DESTDIR)$(developerdir)"
@@ -13148,9 +13563,7 @@ uninstall-developerDATA:
@$(NORMAL_UNINSTALL)
@list='$(developer_DATA)'; test -n "$(developerdir)" || list=; \
files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
- test -n "$$files" || exit 0; \
- echo " ( cd '$(DESTDIR)$(developerdir)' && rm -f" $$files ")"; \
- cd "$(DESTDIR)$(developerdir)" && rm -f $$files
+ dir='$(DESTDIR)$(developerdir)'; $(am__uninstall_files_from_dir)
install-docDATA: $(doc_DATA)
@$(NORMAL_INSTALL)
test -z "$(docdir)" || $(MKDIR_P) "$(DESTDIR)$(docdir)"
@@ -13168,9 +13581,7 @@ uninstall-docDATA:
@$(NORMAL_UNINSTALL)
@list='$(doc_DATA)'; test -n "$(docdir)" || list=; \
files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
- test -n "$$files" || exit 0; \
- echo " ( cd '$(DESTDIR)$(docdir)' && rm -f" $$files ")"; \
- cd "$(DESTDIR)$(docdir)" && rm -f $$files
+ dir='$(DESTDIR)$(docdir)'; $(am__uninstall_files_from_dir)
install-protocolDATA: $(protocol_DATA)
@$(NORMAL_INSTALL)
test -z "$(protocoldir)" || $(MKDIR_P) "$(DESTDIR)$(protocoldir)"
@@ -13188,9 +13599,7 @@ uninstall-protocolDATA:
@$(NORMAL_UNINSTALL)
@list='$(protocol_DATA)'; test -n "$(protocoldir)" || list=; \
files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
- test -n "$$files" || exit 0; \
- echo " ( cd '$(DESTDIR)$(protocoldir)' && rm -f" $$files ")"; \
- cd "$(DESTDIR)$(protocoldir)" && rm -f $$files
+ dir='$(DESTDIR)$(protocoldir)'; $(am__uninstall_files_from_dir)
install-systemdsystemunitDATA: $(systemdsystemunit_DATA)
@$(NORMAL_INSTALL)
test -z "$(systemdsystemunitdir)" || $(MKDIR_P) "$(DESTDIR)$(systemdsystemunitdir)"
@@ -13208,9 +13617,7 @@ uninstall-systemdsystemunitDATA:
@$(NORMAL_UNINSTALL)
@list='$(systemdsystemunit_DATA)'; test -n "$(systemdsystemunitdir)" || list=; \
files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
- test -n "$$files" || exit 0; \
- echo " ( cd '$(DESTDIR)$(systemdsystemunitdir)' && rm -f" $$files ")"; \
- cd "$(DESTDIR)$(systemdsystemunitdir)" && rm -f $$files
+ dir='$(DESTDIR)$(systemdsystemunitdir)'; $(am__uninstall_files_from_dir)
install-userDATA: $(user_DATA)
@$(NORMAL_INSTALL)
test -z "$(userdir)" || $(MKDIR_P) "$(DESTDIR)$(userdir)"
@@ -13228,9 +13635,7 @@ uninstall-userDATA:
@$(NORMAL_UNINSTALL)
@list='$(user_DATA)'; test -n "$(userdir)" || list=; \
files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
- test -n "$$files" || exit 0; \
- echo " ( cd '$(DESTDIR)$(userdir)' && rm -f" $$files ")"; \
- cd "$(DESTDIR)$(userdir)" && rm -f $$files
+ dir='$(DESTDIR)$(userdir)'; $(am__uninstall_files_from_dir)
ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
@@ -13365,14 +13770,15 @@ check-TESTS: $(TESTS)
fi; \
dashes=`echo "$$dashes" | sed s/./=/g`; \
if test "$$failed" -eq 0; then \
- echo "$$grn$$dashes"; \
+ col="$$grn"; \
else \
- echo "$$red$$dashes"; \
+ col="$$red"; \
fi; \
- echo "$$banner"; \
- test -z "$$skipped" || echo "$$skipped"; \
- test -z "$$report" || echo "$$report"; \
- echo "$$dashes$$std"; \
+ echo "$${col}$$dashes$${std}"; \
+ echo "$${col}$$banner$${std}"; \
+ test -z "$$skipped" || echo "$${col}$$skipped$${std}"; \
+ test -z "$$report" || echo "$${col}$$report$${std}"; \
+ echo "$${col}$$dashes$${std}"; \
test "$$failed" -eq 0; \
else :; fi
@@ -13432,7 +13838,11 @@ dist-gzip: distdir
tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
$(am__remove_distdir)
dist-bzip2: distdir
- tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2
+ tardir=$(distdir) && $(am__tar) | BZIP2=$${BZIP2--9} bzip2 -c >$(distdir).tar.bz2
+ $(am__remove_distdir)
+
+dist-lzip: distdir
+ tardir=$(distdir) && $(am__tar) | lzip -c $${LZIP_OPT--9} >$(distdir).tar.lz
$(am__remove_distdir)
dist-lzma: distdir
@@ -13440,7 +13850,7 @@ dist-lzma: distdir
$(am__remove_distdir)
dist-xz: distdir
- tardir=$(distdir) && $(am__tar) | xz -c >$(distdir).tar.xz
+ tardir=$(distdir) && $(am__tar) | XZ_OPT=$${XZ_OPT--e} xz -c >$(distdir).tar.xz
$(am__remove_distdir)
dist-tarZ: distdir
@@ -13458,7 +13868,7 @@ dist-zip: distdir
dist dist-all: distdir
tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
- tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2
+ tardir=$(distdir) && $(am__tar) | BZIP2=$${BZIP2--9} bzip2 -c >$(distdir).tar.bz2
$(am__remove_distdir)
# This target untars the dist file and tries a VPATH configuration. Then
@@ -13472,6 +13882,8 @@ distcheck: dist
bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\
*.tar.lzma*) \
lzma -dc $(distdir).tar.lzma | $(am__untar) ;;\
+ *.tar.lz*) \
+ lzip -dc $(distdir).tar.lz | $(am__untar) ;;\
*.tar.xz*) \
xz -dc $(distdir).tar.xz | $(am__untar) ;;\
*.tar.Z*) \
@@ -13491,6 +13903,7 @@ distcheck: dist
&& am__cwd=`pwd` \
&& $(am__cd) $(distdir)/_build \
&& ../configure --srcdir=.. --prefix="$$dc_install_base" \
+ $(AM_DISTCHECK_CONFIGURE_FLAGS) \
$(DISTCHECK_CONFIGURE_FLAGS) \
&& $(MAKE) $(AM_MAKEFLAGS) \
&& $(MAKE) $(AM_MAKEFLAGS) dvi \
@@ -13519,8 +13932,16 @@ distcheck: dist
list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \
sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x'
distuninstallcheck:
- @$(am__cd) '$(distuninstallcheck_dir)' \
- && test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \
+ @test -n '$(distuninstallcheck_dir)' || { \
+ echo 'ERROR: trying to run $@ with an empty' \
+ '$$(distuninstallcheck_dir)' >&2; \
+ exit 1; \
+ }; \
+ $(am__cd) '$(distuninstallcheck_dir)' || { \
+ echo 'ERROR: cannot chdir into $(distuninstallcheck_dir)' >&2; \
+ exit 1; \
+ }; \
+ test `$(am__distuninstallcheck_listfiles) | wc -l` -eq 0 \
|| { echo "ERROR: files left after uninstall:" ; \
if test -n "$(DESTDIR)"; then \
echo " (check DESTDIR support)"; \
@@ -13556,10 +13977,15 @@ install-am: all-am
installcheck: installcheck-am
install-strip:
- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
- `test -z '$(STRIP)' || \
- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+ if test -z '$(STRIP)'; then \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ install; \
+ else \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+ fi
mostlyclean-generic:
clean-generic:
@@ -13683,8 +14109,8 @@ uninstall-man: uninstall-man1 uninstall-man5
.PHONY: CTAGS GTAGS all all-am all-local am--refresh check check-TESTS \
check-am clean clean-binPROGRAMS clean-generic clean-local \
clean-noinstLIBRARIES clean-noinstPROGRAMS ctags dist dist-all \
- dist-bzip2 dist-gzip dist-lzma dist-shar dist-tarZ dist-xz \
- dist-zip distcheck distclean distclean-compile \
+ dist-bzip2 dist-gzip dist-lzip dist-lzma dist-shar dist-tarZ \
+ dist-xz dist-zip distcheck distclean distclean-compile \
distclean-generic distclean-hdr distclean-tags distcleancheck \
distdir distuninstallcheck dvi dvi-am html html-am info \
info-am install install-am install-binPROGRAMS install-data \
diff --git a/NEWS b/NEWS
index d66811a..4c2ef4a 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,19 @@
+ver 0.16.8 (2012/04/04)
+* fix for libsamplerate assertion failure
+* decoder:
+ - vorbis (and others): fix seeking at startup
+ - ffmpeg: read the "year" tag
+* encoder:
+ - vorbis: generate end-of-stream packet before tag
+ - vorbis: generate end-of-stream packet when playback ends
+* output:
+ - jack: check for connection failure before starting playback
+ - jack: workaround for libjack1 crash bug
+ - osx: fix stuttering due to buffering bug
+* fix endless loop in text file reader
+* update: skip symlinks in path that is to be updated
+
+
ver 0.16.7 (2012/02/04)
* input:
- ffmpeg: support libavformat 0.7
diff --git a/aclocal.m4 b/aclocal.m4
index 5c401b4..16125a5 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -1,7 +1,8 @@
-# generated automatically by aclocal 1.11.1 -*- Autoconf -*-
+# generated automatically by aclocal 1.11.3 -*- Autoconf -*-
# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-# 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+# 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation,
+# Inc.
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -19,12 +20,15 @@ You have another version of autoconf. It may work, but is not guaranteed to.
If you have problems, you may need to regenerate the build system entirely.
To do so, use the procedure documented by the package, typically `autoreconf'.])])
-# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008, 2011 Free Software
+# Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
+# serial 1
+
# AM_AUTOMAKE_VERSION(VERSION)
# ----------------------------
# Automake X.Y traces this macro to ensure aclocal.m4 has been
@@ -34,7 +38,7 @@ AC_DEFUN([AM_AUTOMAKE_VERSION],
[am__api_version='1.11'
dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
dnl require some minimum version. Point them to the right macro.
-m4_if([$1], [1.11.1], [],
+m4_if([$1], [1.11.3], [],
[AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
])
@@ -50,19 +54,21 @@ m4_define([_AM_AUTOCONF_VERSION], [])
# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
# This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-[AM_AUTOMAKE_VERSION([1.11.1])dnl
+[AM_AUTOMAKE_VERSION([1.11.3])dnl
m4_ifndef([AC_AUTOCONF_VERSION],
[m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
# AM_AUX_DIR_EXPAND -*- Autoconf -*-
-# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc.
+# Copyright (C) 2001, 2003, 2005, 2011 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
+# serial 1
+
# For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets
# $ac_aux_dir to `$srcdir/foo'. In other projects, it is set to
# `$srcdir', `$srcdir/..', or `$srcdir/../..'.
@@ -144,14 +150,14 @@ AC_CONFIG_COMMANDS_PRE(
Usually this means the macro was only invoked conditionally.]])
fi])])
-# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2009
-# Free Software Foundation, Inc.
+# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2009,
+# 2010, 2011 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-# serial 10
+# serial 12
# There are a few dirty hacks below to avoid letting `AC_PROG_CC' be
# written in clear, in which case automake, when reading aclocal.m4,
@@ -191,6 +197,7 @@ AC_CACHE_CHECK([dependency style of $depcc],
# instance it was reported that on HP-UX the gcc test will end up
# making a dummy file named `D' -- because `-MD' means `put the output
# in D'.
+ rm -rf conftest.dir
mkdir conftest.dir
# Copy depcomp to subdir because otherwise we won't find it if we're
# using a relative directory.
@@ -255,7 +262,7 @@ AC_CACHE_CHECK([dependency style of $depcc],
break
fi
;;
- msvisualcpp | msvcmsys)
+ msvc7 | msvc7msys | msvisualcpp | msvcmsys)
# This compiler won't grok `-c -o', but also, the minuso test has
# not run yet. These depmodes are late enough in the game, and
# so weak that their functioning should not be impacted.
@@ -320,10 +327,13 @@ AC_DEFUN([AM_DEP_TRACK],
if test "x$enable_dependency_tracking" != xno; then
am_depcomp="$ac_aux_dir/depcomp"
AMDEPBACKSLASH='\'
+ am__nodep='_no'
fi
AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno])
AC_SUBST([AMDEPBACKSLASH])dnl
_AM_SUBST_NOTMAKE([AMDEPBACKSLASH])dnl
+AC_SUBST([am__nodep])dnl
+_AM_SUBST_NOTMAKE([am__nodep])dnl
])
# Generate code to set up dependency tracking. -*- Autoconf -*-
@@ -557,12 +567,15 @@ for _am_header in $config_headers :; do
done
echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])
-# Copyright (C) 2001, 2003, 2005, 2008 Free Software Foundation, Inc.
+# Copyright (C) 2001, 2003, 2005, 2008, 2011 Free Software Foundation,
+# Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
+# serial 1
+
# AM_PROG_INSTALL_SH
# ------------------
# Define $install_sh.
@@ -694,12 +707,15 @@ else
fi
])
-# Copyright (C) 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+# Copyright (C) 2003, 2004, 2005, 2006, 2011 Free Software Foundation,
+# Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
+# serial 1
+
# AM_PROG_MKDIR_P
# ---------------
# Check for `mkdir -p'.
@@ -722,13 +738,14 @@ esac
# Helper functions for option handling. -*- Autoconf -*-
-# Copyright (C) 2001, 2002, 2003, 2005, 2008 Free Software Foundation, Inc.
+# Copyright (C) 2001, 2002, 2003, 2005, 2008, 2010 Free Software
+# Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-# serial 4
+# serial 5
# _AM_MANGLE_OPTION(NAME)
# -----------------------
@@ -736,13 +753,13 @@ AC_DEFUN([_AM_MANGLE_OPTION],
[[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])])
# _AM_SET_OPTION(NAME)
-# ------------------------------
+# --------------------
# Set option NAME. Presently that only means defining a flag for this option.
AC_DEFUN([_AM_SET_OPTION],
[m4_define(_AM_MANGLE_OPTION([$1]), 1)])
# _AM_SET_OPTIONS(OPTIONS)
-# ----------------------------------
+# ------------------------
# OPTIONS is a space-separated list of Automake options.
AC_DEFUN([_AM_SET_OPTIONS],
[m4_foreach_w([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])])
@@ -818,12 +835,14 @@ Check your system clock])
fi
AC_MSG_RESULT(yes)])
-# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc.
+# Copyright (C) 2001, 2003, 2005, 2011 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
+# serial 1
+
# AM_PROG_INSTALL_STRIP
# ---------------------
# One issue with vendor `install' (even GNU) is that you can't
@@ -846,13 +865,13 @@ fi
INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
AC_SUBST([INSTALL_STRIP_PROGRAM])])
-# Copyright (C) 2006, 2008 Free Software Foundation, Inc.
+# Copyright (C) 2006, 2008, 2010 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-# serial 2
+# serial 3
# _AM_SUBST_NOTMAKE(VARIABLE)
# ---------------------------
@@ -861,13 +880,13 @@ AC_SUBST([INSTALL_STRIP_PROGRAM])])
AC_DEFUN([_AM_SUBST_NOTMAKE])
# AM_SUBST_NOTMAKE(VARIABLE)
-# ---------------------------
+# --------------------------
# Public sister of _AM_SUBST_NOTMAKE.
AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])
# Check how to create a tarball. -*- Autoconf -*-
-# Copyright (C) 2004, 2005 Free Software Foundation, Inc.
+# Copyright (C) 2004, 2005, 2012 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -889,10 +908,11 @@ AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])
# a tarball read from stdin.
# $(am__untar) < result.tar
AC_DEFUN([_AM_PROG_TAR],
-[# Always define AMTAR for backward compatibility.
-AM_MISSING_PROG([AMTAR], [tar])
+[# Always define AMTAR for backward compatibility. Yes, it's still used
+# in the wild :-( We should find a proper way to deprecate it ...
+AC_SUBST([AMTAR], ['$${TAR-tar}'])
m4_if([$1], [v7],
- [am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'],
+ [am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'],
[m4_case([$1], [ustar],, [pax],,
[m4_fatal([Unknown tar format])])
AC_MSG_CHECKING([how to create a $1 tar archive])
diff --git a/config.guess b/config.guess
index 40eaed4..d622a44 100755
--- a/config.guess
+++ b/config.guess
@@ -2,9 +2,9 @@
# Attempt to guess a canonical system name.
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
-# 2011 Free Software Foundation, Inc.
+# 2011, 2012 Free Software Foundation, Inc.
-timestamp='2011-05-11'
+timestamp='2012-02-10'
# This file is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
@@ -17,9 +17,7 @@ timestamp='2011-05-11'
# General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
-# 02110-1301, USA.
+# along with this program; if not, see <http://www.gnu.org/licenses/>.
#
# As a special exception to the GNU General Public License, if you
# distribute this file as part of a program that contains a
@@ -57,8 +55,8 @@ GNU config.guess ($timestamp)
Originally written by Per Bothner.
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
-2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free
-Software Foundation, Inc.
+2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012
+Free Software Foundation, Inc.
This is free software; see the source for copying conditions. There is NO
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -145,7 +143,7 @@ UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
*:NetBSD:*:*)
# NetBSD (nbsd) targets should (where applicable) match one or
- # more of the tupples: *-*-netbsdelf*, *-*-netbsdaout*,
+ # more of the tuples: *-*-netbsdelf*, *-*-netbsdaout*,
# *-*-netbsdecoff* and *-*-netbsd*. For targets that recently
# switched to ELF, *-*-netbsd* would select the old
# object file format. This provides both forward
@@ -792,13 +790,12 @@ EOF
echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
exit ;;
*:FreeBSD:*:*)
- case ${UNAME_MACHINE} in
- pc98)
- echo i386-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
+ UNAME_PROCESSOR=`/usr/bin/uname -p`
+ case ${UNAME_PROCESSOR} in
amd64)
echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
*)
- echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
+ echo ${UNAME_PROCESSOR}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
esac
exit ;;
i*:CYGWIN*:*)
@@ -807,6 +804,9 @@ EOF
*:MINGW*:*)
echo ${UNAME_MACHINE}-pc-mingw32
exit ;;
+ i*:MSYS*:*)
+ echo ${UNAME_MACHINE}-pc-msys
+ exit ;;
i*:windows32*:*)
# uname -m includes "-pc" on this system.
echo ${UNAME_MACHINE}-mingw32
@@ -861,6 +861,13 @@ EOF
i*86:Minix:*:*)
echo ${UNAME_MACHINE}-pc-minix
exit ;;
+ aarch64:Linux:*:*)
+ echo ${UNAME_MACHINE}-unknown-linux-gnu
+ exit ;;
+ aarch64_be:Linux:*:*)
+ UNAME_MACHINE=aarch64_be
+ echo ${UNAME_MACHINE}-unknown-linux-gnu
+ exit ;;
alpha:Linux:*:*)
case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
EV5) UNAME_MACHINE=alphaev5 ;;
@@ -895,13 +902,16 @@ EOF
echo ${UNAME_MACHINE}-unknown-linux-gnu
exit ;;
cris:Linux:*:*)
- echo cris-axis-linux-gnu
+ echo ${UNAME_MACHINE}-axis-linux-gnu
exit ;;
crisv32:Linux:*:*)
- echo crisv32-axis-linux-gnu
+ echo ${UNAME_MACHINE}-axis-linux-gnu
exit ;;
frv:Linux:*:*)
- echo frv-unknown-linux-gnu
+ echo ${UNAME_MACHINE}-unknown-linux-gnu
+ exit ;;
+ hexagon:Linux:*:*)
+ echo ${UNAME_MACHINE}-unknown-linux-gnu
exit ;;
i*86:Linux:*:*)
LIBC=gnu
@@ -943,7 +953,7 @@ EOF
test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
;;
or32:Linux:*:*)
- echo or32-unknown-linux-gnu
+ echo ${UNAME_MACHINE}-unknown-linux-gnu
exit ;;
padre:Linux:*:*)
echo sparc-unknown-linux-gnu
@@ -978,13 +988,13 @@ EOF
echo ${UNAME_MACHINE}-unknown-linux-gnu
exit ;;
tile*:Linux:*:*)
- echo ${UNAME_MACHINE}-tilera-linux-gnu
+ echo ${UNAME_MACHINE}-unknown-linux-gnu
exit ;;
vax:Linux:*:*)
echo ${UNAME_MACHINE}-dec-linux-gnu
exit ;;
x86_64:Linux:*:*)
- echo x86_64-unknown-linux-gnu
+ echo ${UNAME_MACHINE}-unknown-linux-gnu
exit ;;
xtensa*:Linux:*:*)
echo ${UNAME_MACHINE}-unknown-linux-gnu
@@ -1315,6 +1325,9 @@ EOF
i*86:AROS:*:*)
echo ${UNAME_MACHINE}-pc-aros
exit ;;
+ x86_64:VMkernel:*:*)
+ echo ${UNAME_MACHINE}-unknown-esx
+ exit ;;
esac
#echo '(No uname command or uname output not recognized.)' 1>&2
diff --git a/config.sub b/config.sub
index 30fdca8..c894da4 100755
--- a/config.sub
+++ b/config.sub
@@ -2,9 +2,9 @@
# Configuration validation subroutine script.
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
-# 2011 Free Software Foundation, Inc.
+# 2011, 2012 Free Software Foundation, Inc.
-timestamp='2011-03-23'
+timestamp='2012-02-10'
# This file is (in principle) common to ALL GNU software.
# The presence of a machine in this file suggests that SOME GNU software
@@ -21,9 +21,7 @@ timestamp='2011-03-23'
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
-# 02110-1301, USA.
+# along with this program; if not, see <http://www.gnu.org/licenses/>.
#
# As a special exception to the GNU General Public License, if you
# distribute this file as part of a program that contains a
@@ -76,8 +74,8 @@ version="\
GNU config.sub ($timestamp)
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
-2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free
-Software Foundation, Inc.
+2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012
+Free Software Foundation, Inc.
This is free software; see the source for copying conditions. There is NO
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -132,6 +130,10 @@ case $maybe_os in
os=-$maybe_os
basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
;;
+ android-linux)
+ os=-linux-android
+ basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`-unknown
+ ;;
*)
basic_machine=`echo $1 | sed 's/-[^-]*$//'`
if [ $basic_machine != $1 ]
@@ -247,17 +249,22 @@ case $basic_machine in
# Some are omitted here because they have special meanings below.
1750a | 580 \
| a29k \
+ | aarch64 | aarch64_be \
| alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
| am33_2.0 \
| arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \
+ | be32 | be64 \
| bfin \
| c4x | clipper \
| d10v | d30v | dlx | dsp16xx \
+ | epiphany \
| fido | fr30 | frv \
| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
+ | hexagon \
| i370 | i860 | i960 | ia64 \
| ip2k | iq2000 \
+ | le32 | le64 \
| lm32 \
| m32c | m32r | m32rle | m68000 | m68k | m88k \
| maxq | mb | microblaze | mcore | mep | metag \
@@ -291,7 +298,7 @@ case $basic_machine in
| pdp10 | pdp11 | pj | pjl \
| powerpc | powerpc64 | powerpc64le | powerpcle \
| pyramid \
- | rx \
+ | rl78 | rx \
| score \
| sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
| sh64 | sh64le \
@@ -300,7 +307,7 @@ case $basic_machine in
| spu \
| tahoe | tic4x | tic54x | tic55x | tic6x | tic80 | tron \
| ubicom32 \
- | v850 | v850e \
+ | v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \
| we32k \
| x86 | xc16x | xstormy16 | xtensa \
| z8k | z80)
@@ -315,8 +322,7 @@ case $basic_machine in
c6x)
basic_machine=tic6x-unknown
;;
- m6811 | m68hc11 | m6812 | m68hc12 | picochip)
- # Motorola 68HC11/12.
+ m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | picochip)
basic_machine=$basic_machine-unknown
os=-none
;;
@@ -329,7 +335,10 @@ case $basic_machine in
strongarm | thumb | xscale)
basic_machine=arm-unknown
;;
-
+ xgate)
+ basic_machine=$basic_machine-unknown
+ os=-none
+ ;;
xscaleeb)
basic_machine=armeb-unknown
;;
@@ -352,11 +361,13 @@ case $basic_machine in
# Recognize the basic CPU types with company name.
580-* \
| a29k-* \
+ | aarch64-* | aarch64_be-* \
| alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
| alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
| alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
| arm-* | armbe-* | armle-* | armeb-* | armv*-* \
| avr-* | avr32-* \
+ | be32-* | be64-* \
| bfin-* | bs2000-* \
| c[123]* | c30-* | [cjt]90-* | c4x-* \
| clipper-* | craynv-* | cydra-* \
@@ -365,8 +376,10 @@ case $basic_machine in
| f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \
| h8300-* | h8500-* \
| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
+ | hexagon-* \
| i*86-* | i860-* | i960-* | ia64-* \
| ip2k-* | iq2000-* \
+ | le32-* | le64-* \
| lm32-* \
| m32c-* | m32r-* | m32rle-* \
| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
@@ -400,7 +413,7 @@ case $basic_machine in
| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \
| pyramid-* \
- | romp-* | rs6000-* | rx-* \
+ | rl78-* | romp-* | rs6000-* | rx-* \
| sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
| sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
@@ -408,10 +421,11 @@ case $basic_machine in
| sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx?-* \
| tahoe-* \
| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
- | tile-* | tilegx-* \
+ | tile*-* \
| tron-* \
| ubicom32-* \
- | v850-* | v850e-* | vax-* \
+ | v850-* | v850e-* | v850e1-* | v850es-* | v850e2-* | v850e2v3-* \
+ | vax-* \
| we32k-* \
| x86-* | x86_64-* | xc16x-* | xps100-* \
| xstormy16-* | xtensa*-* \
@@ -711,7 +725,6 @@ case $basic_machine in
i370-ibm* | ibm*)
basic_machine=i370-ibm
;;
-# I'm not sure what "Sysv32" means. Should this be sysv3.2?
i*86v32)
basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
os=-sysv32
@@ -808,10 +821,18 @@ case $basic_machine in
ms1-*)
basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'`
;;
+ msys)
+ basic_machine=i386-pc
+ os=-msys
+ ;;
mvs)
basic_machine=i370-ibm
os=-mvs
;;
+ nacl)
+ basic_machine=le32-unknown
+ os=-nacl
+ ;;
ncr3000)
basic_machine=i486-ncr
os=-sysv4
@@ -1120,13 +1141,8 @@ case $basic_machine in
basic_machine=t90-cray
os=-unicos
;;
- # This must be matched before tile*.
- tilegx*)
- basic_machine=tilegx-unknown
- os=-linux-gnu
- ;;
tile*)
- basic_machine=tile-unknown
+ basic_machine=$basic_machine-unknown
os=-linux-gnu
;;
tx39)
@@ -1336,7 +1352,7 @@ case $os in
| -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
| -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
| -chorusos* | -chorusrdb* | -cegcc* \
- | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
+ | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
| -mingw32* | -linux-gnu* | -linux-android* \
| -linux-newlib* | -linux-uclibc* \
| -uxpv* | -beos* | -mpeix* | -udk* \
@@ -1548,9 +1564,6 @@ case $basic_machine in
;;
m68000-sun)
os=-sunos3
- # This also exists in the configure program, but was not the
- # default.
- # os=-sunos4
;;
m68*-cisco)
os=-aout
diff --git a/configure b/configure
index 855bf1b..c98ad09 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.68 for mpd 0.16.7.
+# Generated by GNU Autoconf 2.68 for mpd 0.16.8.
#
# Report bugs to <musicpd-dev-team at lists.sourceforge.net>.
#
@@ -560,8 +560,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='mpd'
PACKAGE_TARNAME='mpd'
-PACKAGE_VERSION='0.16.7'
-PACKAGE_STRING='mpd 0.16.7'
+PACKAGE_VERSION='0.16.8'
+PACKAGE_STRING='mpd 0.16.8'
PACKAGE_BUGREPORT='musicpd-dev-team at lists.sourceforge.net'
PACKAGE_URL=''
@@ -844,6 +844,7 @@ CXX
am__fastdepCC_FALSE
am__fastdepCC_TRUE
CCDEPMODE
+am__nodep
AMDEPBACKSLASH
AMDEP_FALSE
AMDEP_TRUE
@@ -1606,7 +1607,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures mpd 0.16.7 to adapt to many kinds of systems.
+\`configure' configures mpd 0.16.8 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1676,7 +1677,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of mpd 0.16.7:";;
+ short | recursive ) echo "Configuration of mpd 0.16.8:";;
esac
cat <<\_ACEOF
@@ -1950,7 +1951,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-mpd configure 0.16.7
+mpd configure 0.16.8
generated by GNU Autoconf 2.68
Copyright (C) 2010 Free Software Foundation, Inc.
@@ -2460,7 +2461,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by mpd $as_me 0.16.7, which was
+It was created by mpd $as_me 0.16.8, which was
generated by GNU Autoconf 2.68. Invocation command line was
$ $0 $@
@@ -3276,7 +3277,7 @@ fi
# Define the identity of the package.
PACKAGE='mpd'
- VERSION='0.16.7'
+ VERSION='0.16.8'
cat >>confdefs.h <<_ACEOF
@@ -3306,11 +3307,11 @@ MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"}
# We need awk for the "check" target. The system "awk" is bad on
# some platforms.
-# Always define AMTAR for backward compatibility.
+# Always define AMTAR for backward compatibility. Yes, it's still used
+# in the wild :-( We should find a proper way to deprecate it ...
+AMTAR='$${TAR-tar}'
-AMTAR=${AMTAR-"${am_missing_run}tar"}
-
-am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'
+am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'
@@ -3377,6 +3378,7 @@ fi
if test "x$enable_dependency_tracking" != xno; then
am_depcomp="$ac_aux_dir/depcomp"
AMDEPBACKSLASH='\'
+ am__nodep='_no'
fi
if test "x$enable_dependency_tracking" != xno; then
AMDEP_TRUE=
@@ -4190,6 +4192,7 @@ else
# instance it was reported that on HP-UX the gcc test will end up
# making a dummy file named `D' -- because `-MD' means `put the output
# in D'.
+ rm -rf conftest.dir
mkdir conftest.dir
# Copy depcomp to subdir because otherwise we won't find it if we're
# using a relative directory.
@@ -4249,7 +4252,7 @@ else
break
fi
;;
- msvisualcpp | msvcmsys)
+ msvc7 | msvc7msys | msvisualcpp | msvcmsys)
# This compiler won't grok `-c -o', but also, the minuso test has
# not run yet. These depmodes are late enough in the game, and
# so weak that their functioning should not be impacted.
@@ -4751,6 +4754,7 @@ else
# instance it was reported that on HP-UX the gcc test will end up
# making a dummy file named `D' -- because `-MD' means `put the output
# in D'.
+ rm -rf conftest.dir
mkdir conftest.dir
# Copy depcomp to subdir because otherwise we won't find it if we're
# using a relative directory.
@@ -4810,7 +4814,7 @@ else
break
fi
;;
- msvisualcpp | msvcmsys)
+ msvc7 | msvc7msys | msvisualcpp | msvcmsys)
# This compiler won't grok `-c -o', but also, the minuso test has
# not run yet. These depmodes are late enough in the game, and
# so weak that their functioning should not be impacted.
@@ -15280,7 +15284,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by mpd $as_me 0.16.7, which was
+This file was extended by mpd $as_me 0.16.8, which was
generated by GNU Autoconf 2.68. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -15346,7 +15350,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-mpd config.status 0.16.7
+mpd config.status 0.16.8
configured by $0, generated by GNU Autoconf 2.68,
with options \\"\$ac_cs_config\\"
@@ -17010,7 +17014,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by mpd $as_me 0.16.7, which was
+This file was extended by mpd $as_me 0.16.8, which was
generated by GNU Autoconf 2.68. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -17076,7 +17080,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-mpd config.status 0.16.7
+mpd config.status 0.16.8
configured by $0, generated by GNU Autoconf 2.68,
with options \\"\$ac_cs_config\\"
diff --git a/configure.ac b/configure.ac
index d3f4b39..47f7291 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
AC_PREREQ(2.60)
-AC_INIT(mpd, 0.16.7, musicpd-dev-team at lists.sourceforge.net)
+AC_INIT(mpd, 0.16.8, musicpd-dev-team at lists.sourceforge.net)
AC_CONFIG_SRCDIR([src/main.c])
AM_INIT_AUTOMAKE([foreign 1.10 dist-bzip2 subdir-objects])
AM_CONFIG_HEADER(config.h)
diff --git a/depcomp b/depcomp
index df8eea7..bd0ac08 100755
--- a/depcomp
+++ b/depcomp
@@ -1,10 +1,10 @@
#! /bin/sh
# depcomp - compile a program generating dependencies as side-effects
-scriptversion=2009-04-28.21; # UTC
+scriptversion=2011-12-04.11; # UTC
-# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006, 2007, 2009 Free
-# Software Foundation, Inc.
+# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006, 2007, 2009, 2010,
+# 2011 Free Software Foundation, Inc.
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -44,7 +44,7 @@ Environment variables:
object Object file output by `PROGRAMS ARGS'.
DEPDIR directory where to store dependencies.
depfile Dependency file to output.
- tmpdepfile Temporary file to use when outputing dependencies.
+ tmpdepfile Temporary file to use when outputting dependencies.
libtool Whether libtool is used (yes/no).
Report bugs to <bug-automake at gnu.org>.
@@ -90,10 +90,18 @@ if test "$depmode" = msvcmsys; then
# This is just like msvisualcpp but w/o cygpath translation.
# Just convert the backslash-escaped backslashes to single forward
# slashes to satisfy depend.m4
- cygpath_u="sed s,\\\\\\\\,/,g"
+ cygpath_u='sed s,\\\\,/,g'
depmode=msvisualcpp
fi
+if test "$depmode" = msvc7msys; then
+ # This is just like msvc7 but w/o cygpath translation.
+ # Just convert the backslash-escaped backslashes to single forward
+ # slashes to satisfy depend.m4
+ cygpath_u='sed s,\\\\,/,g'
+ depmode=msvc7
+fi
+
case "$depmode" in
gcc3)
## gcc 3 implements dependency tracking that does exactly what
@@ -158,10 +166,12 @@ gcc)
' < "$tmpdepfile" |
## Some versions of gcc put a space before the `:'. On the theory
## that the space means something, we add a space to the output as
-## well.
+## well. hp depmode also adds that space, but also prefixes the VPATH
+## to the object. Take care to not repeat it in the output.
## Some versions of the HPUX 10.20 sed can't process this invocation
## correctly. Breaking it into two sed invocations is a workaround.
- sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile"
+ sed -e 's/^\\$//' -e '/^$/d' -e "s|.*$object$||" -e '/:$/d' \
+ | sed -e 's/$/ :/' >> "$depfile"
rm -f "$tmpdepfile"
;;
@@ -405,6 +415,52 @@ tru64)
rm -f "$tmpdepfile"
;;
+msvc7)
+ if test "$libtool" = yes; then
+ showIncludes=-Wc,-showIncludes
+ else
+ showIncludes=-showIncludes
+ fi
+ "$@" $showIncludes > "$tmpdepfile"
+ stat=$?
+ grep -v '^Note: including file: ' "$tmpdepfile"
+ if test "$stat" = 0; then :
+ else
+ rm -f "$tmpdepfile"
+ exit $stat
+ fi
+ rm -f "$depfile"
+ echo "$object : \\" > "$depfile"
+ # The first sed program below extracts the file names and escapes
+ # backslashes for cygpath. The second sed program outputs the file
+ # name when reading, but also accumulates all include files in the
+ # hold buffer in order to output them again at the end. This only
+ # works with sed implementations that can handle large buffers.
+ sed < "$tmpdepfile" -n '
+/^Note: including file: *\(.*\)/ {
+ s//\1/
+ s/\\/\\\\/g
+ p
+}' | $cygpath_u | sort -u | sed -n '
+s/ /\\ /g
+s/\(.*\)/ \1 \\/p
+s/.\(.*\) \\/\1:/
+H
+$ {
+ s/.*/ /
+ G
+ p
+}' >> "$depfile"
+ rm -f "$tmpdepfile"
+ ;;
+
+msvc7msys)
+ # This case exists only to let depend.m4 do its work. It works by
+ # looking at the text of this script. This case will never be run,
+ # since it is checked for above.
+ exit 1
+ ;;
+
#nosideeffect)
# This comment above is used by automake to tell side-effect
# dependency tracking mechanisms from slower ones.
@@ -503,7 +559,9 @@ makedepend)
touch "$tmpdepfile"
${MAKEDEPEND-makedepend} -o"$obj_suffix" -f"$tmpdepfile" "$@"
rm -f "$depfile"
- cat < "$tmpdepfile" > "$depfile"
+ # makedepend may prepend the VPATH from the source file name to the object.
+ # No need to regex-escape $object, excess matching of '.' is harmless.
+ sed "s|^.*\($object *:\)|\1|" "$tmpdepfile" > "$depfile"
sed '1,2d' "$tmpdepfile" | tr ' ' '
' | \
## Some versions of the HPUX 10.20 sed can't process this invocation
diff --git a/install-sh b/install-sh
index 6781b98..a9244eb 100755
--- a/install-sh
+++ b/install-sh
@@ -1,7 +1,7 @@
#!/bin/sh
# install - install a program, script, or datafile
-scriptversion=2009-04-28.21; # UTC
+scriptversion=2011-01-19.21; # UTC
# This originates from X11R5 (mit/util/scripts/install.sh), which was
# later released in X11R6 (xc/config/util/install.sh) with the
@@ -156,6 +156,10 @@ while test $# -ne 0; do
-s) stripcmd=$stripprog;;
-t) dst_arg=$2
+ # Protect names problematic for `test' and other utilities.
+ case $dst_arg in
+ -* | [=\(\)!]) dst_arg=./$dst_arg;;
+ esac
shift;;
-T) no_target_directory=true;;
@@ -186,6 +190,10 @@ if test $# -ne 0 && test -z "$dir_arg$dst_arg"; then
fi
shift # arg
dst_arg=$arg
+ # Protect names problematic for `test' and other utilities.
+ case $dst_arg in
+ -* | [=\(\)!]) dst_arg=./$dst_arg;;
+ esac
done
fi
@@ -200,7 +208,11 @@ if test $# -eq 0; then
fi
if test -z "$dir_arg"; then
- trap '(exit $?); exit' 1 2 13 15
+ do_exit='(exit $ret); exit $ret'
+ trap "ret=129; $do_exit" 1
+ trap "ret=130; $do_exit" 2
+ trap "ret=141; $do_exit" 13
+ trap "ret=143; $do_exit" 15
# Set umask so as not to create temps with too-generous modes.
# However, 'strip' requires both read and write access to temps.
@@ -228,9 +240,9 @@ fi
for src
do
- # Protect names starting with `-'.
+ # Protect names problematic for `test' and other utilities.
case $src in
- -*) src=./$src;;
+ -* | [=\(\)!]) src=./$src;;
esac
if test -n "$dir_arg"; then
@@ -252,12 +264,7 @@ do
echo "$0: no destination specified." >&2
exit 1
fi
-
dst=$dst_arg
- # Protect names starting with `-'.
- case $dst in
- -*) dst=./$dst;;
- esac
# If destination is a directory, append the input filename; won't work
# if double slashes aren't ignored.
@@ -385,7 +392,7 @@ do
case $dstdir in
/*) prefix='/';;
- -*) prefix='./';;
+ [-=\(\)!]*) prefix='./';;
*) prefix='';;
esac
@@ -403,7 +410,7 @@ do
for d
do
- test -z "$d" && continue
+ test X"$d" = X && continue
prefix=$prefix$d
if test -d "$prefix"; then
diff --git a/missing b/missing
index 28055d2..86a8fc3 100755
--- a/missing
+++ b/missing
@@ -1,10 +1,10 @@
#! /bin/sh
# Common stub for a few missing GNU programs while installing.
-scriptversion=2009-04-28.21; # UTC
+scriptversion=2012-01-06.13; # UTC
# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006,
-# 2008, 2009 Free Software Foundation, Inc.
+# 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc.
# Originally by Fran,cois Pinard <pinard at iro.umontreal.ca>, 1996.
# This program is free software; you can redistribute it and/or modify
@@ -84,7 +84,6 @@ Supported PROGRAM values:
help2man touch the output file
lex create \`lex.yy.c', if possible, from existing .c
makeinfo touch the output file
- tar try tar, gnutar, gtar, then tar without non-portable flags
yacc create \`y.tab.[ch]', if possible, from existing .[ch]
Version suffixes to PROGRAM as well as the prefixes \`gnu-', \`gnu', and
@@ -122,15 +121,6 @@ case $1 in
# Not GNU programs, they don't have --version.
;;
- tar*)
- if test -n "$run"; then
- echo 1>&2 "ERROR: \`tar' requires --run"
- exit 1
- elif test "x$2" = "x--version" || test "x$2" = "x--help"; then
- exit 1
- fi
- ;;
-
*)
if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
# We have it, but it failed.
@@ -226,7 +216,7 @@ WARNING: \`$1' $msg. You should only need it if
\`Bison' from any GNU archive site."
rm -f y.tab.c y.tab.h
if test $# -ne 1; then
- eval LASTARG="\${$#}"
+ eval LASTARG=\${$#}
case $LASTARG in
*.y)
SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'`
@@ -256,7 +246,7 @@ WARNING: \`$1' is $msg. You should only need it if
\`Flex' from any GNU archive site."
rm -f lex.yy.c
if test $# -ne 1; then
- eval LASTARG="\${$#}"
+ eval LASTARG=\${$#}
case $LASTARG in
*.l)
SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'`
@@ -318,41 +308,6 @@ WARNING: \`$1' is $msg. You should only need it if
touch $file
;;
- tar*)
- shift
-
- # We have already tried tar in the generic part.
- # Look for gnutar/gtar before invocation to avoid ugly error
- # messages.
- if (gnutar --version > /dev/null 2>&1); then
- gnutar "$@" && exit 0
- fi
- if (gtar --version > /dev/null 2>&1); then
- gtar "$@" && exit 0
- fi
- firstarg="$1"
- if shift; then
- case $firstarg in
- *o*)
- firstarg=`echo "$firstarg" | sed s/o//`
- tar "$firstarg" "$@" && exit 0
- ;;
- esac
- case $firstarg in
- *h*)
- firstarg=`echo "$firstarg" | sed s/h//`
- tar "$firstarg" "$@" && exit 0
- ;;
- esac
- fi
-
- echo 1>&2 "\
-WARNING: I can't seem to be able to run \`tar' with the given arguments.
- You may want to install GNU tar or Free paxutils, or check the
- command line arguments."
- exit 1
- ;;
-
*)
echo 1>&2 "\
WARNING: \`$1' is needed, and is $msg.
diff --git a/src/decoder/audiofile_decoder_plugin.c b/src/decoder/audiofile_decoder_plugin.c
index a8311a3..de236a6 100644
--- a/src/decoder/audiofile_decoder_plugin.c
+++ b/src/decoder/audiofile_decoder_plugin.c
@@ -64,14 +64,14 @@ audiofile_file_read(AFvirtualfile *vfile, void *data, size_t length)
return nbytes;
}
-static long
+static AFfileoffset
audiofile_file_length(AFvirtualfile *vfile)
{
struct input_stream *is = (struct input_stream *) vfile->closure;
return is->size;
}
-static long
+static AFfileoffset
audiofile_file_tell(AFvirtualfile *vfile)
{
struct input_stream *is = (struct input_stream *) vfile->closure;
@@ -86,8 +86,8 @@ audiofile_file_destroy(AFvirtualfile *vfile)
vfile->closure = NULL;
}
-static long
-audiofile_file_seek(AFvirtualfile *vfile, long offset, int is_relative)
+static AFfileoffset
+audiofile_file_seek(AFvirtualfile *vfile, AFfileoffset offset, int is_relative)
{
struct input_stream *is = (struct input_stream *) vfile->closure;
int whence = (is_relative ? SEEK_CUR : SEEK_SET);
diff --git a/src/decoder/ffmpeg_decoder_plugin.c b/src/decoder/ffmpeg_decoder_plugin.c
index 52632dc..2929d31 100644
--- a/src/decoder/ffmpeg_decoder_plugin.c
+++ b/src/decoder/ffmpeg_decoder_plugin.c
@@ -597,8 +597,8 @@ typedef struct ffmpeg_tag_map {
static const ffmpeg_tag_map ffmpeg_tag_maps[] = {
#if LIBAVFORMAT_VERSION_INT < ((52<<16)+(50<<8))
{ TAG_ARTIST, "author" },
- { TAG_DATE, "year" },
#endif
+ { TAG_DATE, "year" },
{ TAG_ARTIST_SORT, "author-sort" },
{ TAG_ALBUM_ARTIST, "album_artist" },
{ TAG_ALBUM_ARTIST_SORT, "album_artist-sort" },
diff --git a/src/decoder_api.c b/src/decoder_api.c
index 695ca02..19de478 100644
--- a/src/decoder_api.c
+++ b/src/decoder_api.c
@@ -89,6 +89,12 @@ decoder_prepare_initial_seek(struct decoder *decoder)
const struct decoder_control *dc = decoder->dc;
assert(dc->pipe != NULL);
+ if (dc->state != DECODE_STATE_DECODE)
+ /* wait until the decoder has finished initialisation
+ (reading file headers etc.) before emitting the
+ virtual "SEEK" command */
+ return false;
+
if (decoder->initial_seek_running)
/* initial seek has already begun - override any other
command */
diff --git a/src/directory.c b/src/directory.c
index fa15d41..1e3a4cf 100644
--- a/src/directory.c
+++ b/src/directory.c
@@ -68,7 +68,15 @@ directory_free(struct directory *directory)
const char *
directory_get_name(const struct directory *directory)
{
- return g_basename(directory->path);
+ assert(!directory_is_root(directory));
+ assert(directory->path != NULL);
+
+ const char *slash = strrchr(directory->path, '/');
+ assert((slash == NULL) == directory_is_root(directory->parent));
+
+ return slash != NULL
+ ? slash + 1
+ : directory->path;
}
void
diff --git a/src/encoder/flac_encoder.c b/src/encoder/flac_encoder.c
index 6389513..e2c455e 100644
--- a/src/encoder/flac_encoder.c
+++ b/src/encoder/flac_encoder.c
@@ -354,6 +354,7 @@ const struct encoder_plugin flac_encoder_plugin = {
.finish = flac_encoder_finish,
.open = flac_encoder_open,
.close = flac_encoder_close,
+ .end = flac_encoder_flush,
.flush = flac_encoder_flush,
.write = flac_encoder_write,
.read = flac_encoder_read,
diff --git a/src/encoder/twolame_encoder.c b/src/encoder/twolame_encoder.c
index d20af55..073c312 100644
--- a/src/encoder/twolame_encoder.c
+++ b/src/encoder/twolame_encoder.c
@@ -300,6 +300,7 @@ const struct encoder_plugin twolame_encoder_plugin = {
.finish = twolame_encoder_finish,
.open = twolame_encoder_open,
.close = twolame_encoder_close,
+ .end = twolame_encoder_flush,
.flush = twolame_encoder_flush,
.write = twolame_encoder_write,
.read = twolame_encoder_read,
diff --git a/src/encoder/vorbis_encoder.c b/src/encoder/vorbis_encoder.c
index 38a998b..9f09b2a 100644
--- a/src/encoder/vorbis_encoder.c
+++ b/src/encoder/vorbis_encoder.c
@@ -285,8 +285,6 @@ vorbis_encoder_pre_tag(struct encoder *_encoder, G_GNUC_UNUSED GError **error)
vorbis_analysis_init(&encoder->vd, &encoder->vi);
vorbis_block_init(&encoder->vd, &encoder->vb);
- ogg_stream_reset(&encoder->os);
-
encoder->flush = true;
return true;
}
@@ -407,6 +405,7 @@ const struct encoder_plugin vorbis_encoder_plugin = {
.finish = vorbis_encoder_finish,
.open = vorbis_encoder_open,
.close = vorbis_encoder_close,
+ .end = vorbis_encoder_pre_tag,
.flush = vorbis_encoder_flush,
.pre_tag = vorbis_encoder_pre_tag,
.tag = vorbis_encoder_tag,
diff --git a/src/encoder_plugin.h b/src/encoder_plugin.h
index fb00413..70eee51 100644
--- a/src/encoder_plugin.h
+++ b/src/encoder_plugin.h
@@ -22,6 +22,7 @@
#include <glib.h>
+#include <assert.h>
#include <stdbool.h>
#include <stddef.h>
@@ -32,6 +33,10 @@ struct tag;
struct encoder {
const struct encoder_plugin *plugin;
+
+#ifndef NDEBUG
+ bool open, pre_tag, tag, end;
+#endif
};
struct encoder_plugin {
@@ -48,6 +53,8 @@ struct encoder_plugin {
void (*close)(struct encoder *encoder);
+ bool (*end)(struct encoder *encoder, GError **error);
+
bool (*flush)(struct encoder *encoder, GError **error);
bool (*pre_tag)(struct encoder *encoder, GError **error);
@@ -73,6 +80,10 @@ encoder_struct_init(struct encoder *encoder,
const struct encoder_plugin *plugin)
{
encoder->plugin = plugin;
+
+#ifndef NDEBUG
+ encoder->open = false;
+#endif
}
/**
@@ -98,6 +109,8 @@ encoder_init(const struct encoder_plugin *plugin,
static inline void
encoder_finish(struct encoder *encoder)
{
+ assert(!encoder->open);
+
encoder->plugin->finish(encoder);
}
@@ -116,7 +129,14 @@ static inline bool
encoder_open(struct encoder *encoder, struct audio_format *audio_format,
GError **error)
{
- return encoder->plugin->open(encoder, audio_format, error);
+ assert(!encoder->open);
+
+ bool success = encoder->plugin->open(encoder, audio_format, error);
+#ifndef NDEBUG
+ encoder->open = success;
+ encoder->pre_tag = encoder->tag = encoder->end = false;
+#endif
+ return success;
}
/**
@@ -128,8 +148,43 @@ encoder_open(struct encoder *encoder, struct audio_format *audio_format,
static inline void
encoder_close(struct encoder *encoder)
{
+ assert(encoder->open);
+
if (encoder->plugin->close != NULL)
encoder->plugin->close(encoder);
+
+#ifndef NDEBUG
+ encoder->open = false;
+#endif
+}
+
+/**
+ * Ends the stream: flushes the encoder object, generate an
+ * end-of-stream marker (if applicable), make everything which might
+ * currently be buffered available by encoder_read().
+ *
+ * After this function has been called, the encoder may not be usable
+ * for more data, and only encoder_read() and encoder_close() can be
+ * called.
+ *
+ * @param encoder the encoder
+ * @param error location to store the error occuring, or NULL to ignore errors.
+ * @return true on success
+ */
+static inline bool
+encoder_end(struct encoder *encoder, GError **error)
+{
+ assert(encoder->open);
+ assert(!encoder->end);
+
+#ifndef NDEBUG
+ encoder->end = true;
+#endif
+
+ /* this method is optional */
+ return encoder->plugin->end != NULL
+ ? encoder->plugin->end(encoder, error)
+ : true;
}
/**
@@ -143,6 +198,11 @@ encoder_close(struct encoder *encoder)
static inline bool
encoder_flush(struct encoder *encoder, GError **error)
{
+ assert(encoder->open);
+ assert(!encoder->pre_tag);
+ assert(!encoder->tag);
+ assert(!encoder->end);
+
/* this method is optional */
return encoder->plugin->flush != NULL
? encoder->plugin->flush(encoder, error)
@@ -162,10 +222,20 @@ encoder_flush(struct encoder *encoder, GError **error)
static inline bool
encoder_pre_tag(struct encoder *encoder, GError **error)
{
+ assert(encoder->open);
+ assert(!encoder->pre_tag);
+ assert(!encoder->tag);
+ assert(!encoder->end);
+
/* this method is optional */
- return encoder->plugin->pre_tag != NULL
+ bool success = encoder->plugin->pre_tag != NULL
? encoder->plugin->pre_tag(encoder, error)
: true;
+
+#ifndef NDEBUG
+ encoder->pre_tag = success;
+#endif
+ return success;
}
/**
@@ -182,6 +252,15 @@ encoder_pre_tag(struct encoder *encoder, GError **error)
static inline bool
encoder_tag(struct encoder *encoder, const struct tag *tag, GError **error)
{
+ assert(encoder->open);
+ assert(!encoder->pre_tag);
+ assert(encoder->tag);
+ assert(!encoder->end);
+
+#ifndef NDEBUG
+ encoder->tag = false;
+#endif
+
/* this method is optional */
return encoder->plugin->tag != NULL
? encoder->plugin->tag(encoder, tag, error)
@@ -201,6 +280,11 @@ static inline bool
encoder_write(struct encoder *encoder, const void *data, size_t length,
GError **error)
{
+ assert(encoder->open);
+ assert(!encoder->pre_tag);
+ assert(!encoder->tag);
+ assert(!encoder->end);
+
return encoder->plugin->write(encoder, data, length, error);
}
@@ -215,6 +299,16 @@ encoder_write(struct encoder *encoder, const void *data, size_t length,
static inline size_t
encoder_read(struct encoder *encoder, void *dest, size_t length)
{
+ assert(encoder->open);
+ assert(!encoder->pre_tag || !encoder->tag);
+
+#ifndef NDEBUG
+ if (encoder->pre_tag) {
+ encoder->pre_tag = false;
+ encoder->tag = true;
+ }
+#endif
+
return encoder->plugin->read(encoder, dest, length);
}
diff --git a/src/event_pipe.c b/src/event_pipe.c
index 5b51998..484b7a6 100644
--- a/src/event_pipe.c
+++ b/src/event_pipe.c
@@ -159,5 +159,6 @@ void event_pipe_emit_fast(enum pipe_event event)
assert((unsigned)event < PIPE_EVENT_MAX);
pipe_events[event] = true;
- (void)write(event_pipe[1], "", 1);
+
+ G_GNUC_UNUSED ssize_t nbytes = write(event_pipe[1], "", 1);
}
diff --git a/src/output/jack_output_plugin.c b/src/output/jack_output_plugin.c
index 2767d4e..c67fcd3 100644
--- a/src/output/jack_output_plugin.c
+++ b/src/output/jack_output_plugin.c
@@ -143,6 +143,13 @@ mpd_jack_process(jack_nframes_t nframes, void *arg)
for (unsigned i = 0; i < jd->audio_format.channels; ++i) {
out = jack_port_get_buffer(jd->ports[i], nframes);
+ if (out == NULL)
+ /* workaround for libjack1 bug: if the server
+ connection fails, the process callback is
+ invoked anyway, but unable to get a
+ buffer */
+ continue;
+
jack_ringbuffer_read(jd->ringbuffer[i],
(char *)out, available * jack_sample_size);
@@ -156,6 +163,12 @@ mpd_jack_process(jack_nframes_t nframes, void *arg)
for (unsigned i = jd->audio_format.channels;
i < jd->num_source_ports; ++i) {
out = jack_port_get_buffer(jd->ports[i], nframes);
+ if (out == NULL)
+ /* workaround for libjack1 bug: if the server
+ connection fails, the process callback is
+ invoked anyway, but unable to get a
+ buffer */
+ continue;
for (jack_nframes_t f = 0; f < nframes; ++f)
out[f] = 0.0;
@@ -563,6 +576,9 @@ mpd_jack_open(void *data, struct audio_format *audio_format, GError **error_r)
jd->pause = false;
+ if (jd->client != NULL && jd->shutdown)
+ mpd_jack_disconnect(jd);
+
if (jd->client == NULL && !mpd_jack_connect(jd, error_r))
return false;
diff --git a/src/output/osx_plugin.c b/src/output/osx_plugin.c
index 5284afc..501dcec 100644
--- a/src/output/osx_plugin.c
+++ b/src/output/osx_plugin.c
@@ -19,6 +19,7 @@
#include "config.h"
#include "output_api.h"
+#include "fifo_buffer.h"
#include <glib.h>
#include <AudioUnit/AudioUnit.h>
@@ -31,10 +32,8 @@ struct osx_output {
AudioUnit au;
GMutex *mutex;
GCond *condition;
- char *buffer;
- size_t buffer_size;
- size_t pos;
- size_t len;
+
+ struct fifo_buffer *buffer;
};
/**
@@ -64,11 +63,6 @@ osx_output_init(G_GNUC_UNUSED const struct audio_format *audio_format,
oo->mutex = g_mutex_new();
oo->condition = g_cond_new();
- oo->pos = 0;
- oo->len = 0;
- oo->buffer = NULL;
- oo->buffer_size = 0;
-
return oo;
}
@@ -76,7 +70,6 @@ static void osx_output_finish(void *data)
{
struct osx_output *od = data;
- g_free(od->buffer);
g_mutex_free(od->mutex);
g_cond_free(od->condition);
g_free(od);
@@ -87,7 +80,7 @@ static void osx_output_cancel(void *data)
struct osx_output *od = data;
g_mutex_lock(od->mutex);
- od->len = 0;
+ fifo_buffer_clear(od->buffer);
g_mutex_unlock(od->mutex);
}
@@ -98,6 +91,8 @@ static void osx_output_close(void *data)
AudioOutputUnitStop(od->au);
AudioUnitUninitialize(od->au);
CloseComponent(od->au);
+
+ fifo_buffer_free(od->buffer);
}
static OSStatus
@@ -111,37 +106,29 @@ osx_render(void *vdata,
struct osx_output *od = (struct osx_output *) vdata;
AudioBuffer *buffer = &buffer_list->mBuffers[0];
size_t buffer_size = buffer->mDataByteSize;
- size_t bytes_to_copy;
- size_t trailer_length;
- size_t dest_pos = 0;
- g_mutex_lock(od->mutex);
+ assert(od->buffer != NULL);
- bytes_to_copy = MIN(od->len, buffer_size);
- od->len -= bytes_to_copy;
+ g_mutex_lock(od->mutex);
- trailer_length = od->buffer_size - od->pos;
- if (bytes_to_copy > trailer_length) {
- memcpy((unsigned char*)buffer->mData + dest_pos,
- od->buffer + od->pos, trailer_length);
- od->pos = 0;
- dest_pos += trailer_length;
- bytes_to_copy -= trailer_length;
- }
+ size_t nbytes;
+ const void *src = fifo_buffer_read(od->buffer, &nbytes);
- memcpy((unsigned char*)buffer->mData + dest_pos,
- od->buffer + od->pos, bytes_to_copy);
- od->pos += bytes_to_copy;
+ if (src != NULL) {
+ if (nbytes > buffer_size)
+ nbytes = buffer_size;
- if (od->pos >= od->buffer_size)
- od->pos = 0;
+ memcpy(buffer->mData, src, nbytes);
+ fifo_buffer_consume(od->buffer, nbytes);
+ } else
+ nbytes = 0;
g_cond_signal(od->condition);
g_mutex_unlock(od->mutex);
- if (bytes_to_copy < buffer_size)
- memset((unsigned char*)buffer->mData + bytes_to_copy, 0,
- buffer_size - bytes_to_copy);
+ if (nbytes < buffer_size)
+ memset((unsigned char*)buffer->mData + nbytes, 0,
+ buffer_size - nbytes);
return 0;
}
@@ -244,15 +231,12 @@ osx_output_open(void *data, struct audio_format *audio_format, GError **error)
}
/* create a buffer of 1s */
- od->buffer_size = (audio_format->sample_rate) *
- audio_format_frame_size(audio_format);
- od->buffer = g_realloc(od->buffer, od->buffer_size);
-
- od->pos = 0;
- od->len = 0;
+ od->buffer = fifo_buffer_new(audio_format->sample_rate *
+ audio_format_frame_size(audio_format));
status = AudioOutputUnitStart(od->au);
if (status != 0) {
+ fifo_buffer_free(od->buffer);
g_set_error(error, osx_output_quark(), 0,
"unable to start audio output: %s",
GetMacOSStatusCommentString(status));
@@ -267,33 +251,30 @@ osx_output_play(void *data, const void *chunk, size_t size,
G_GNUC_UNUSED GError **error)
{
struct osx_output *od = data;
- size_t start, nbytes;
g_mutex_lock(od->mutex);
- while (od->len >= od->buffer_size)
- /* wait for some free space in the buffer */
- g_cond_wait(od->condition, od->mutex);
-
- start = od->pos + od->len;
- if (start >= od->buffer_size)
- start -= od->buffer_size;
+ void *dest;
+ size_t max_length;
- nbytes = start < od->pos
- ? od->pos - start
- : od->buffer_size - start;
+ while (true) {
+ dest = fifo_buffer_write(od->buffer, &max_length);
+ if (dest != NULL)
+ break;
- assert(nbytes > 0);
+ /* wait for some free space in the buffer */
+ g_cond_wait(od->condition, od->mutex);
+ }
- if (nbytes > size)
- nbytes = size;
+ if (size > max_length)
+ size = max_length;
- memcpy(od->buffer + start, chunk, nbytes);
- od->len += nbytes;
+ memcpy(dest, chunk, size);
+ fifo_buffer_append(od->buffer, size);
g_mutex_unlock(od->mutex);
- return nbytes;
+ return size;
}
const struct audio_output_plugin osxPlugin = {
diff --git a/src/output/recorder_output_plugin.c b/src/output/recorder_output_plugin.c
index 10d6410..2f088a1 100644
--- a/src/output/recorder_output_plugin.c
+++ b/src/output/recorder_output_plugin.c
@@ -191,7 +191,7 @@ recorder_output_close(void *data)
/* flush the encoder and write the rest to the file */
- if (encoder_flush(recorder->encoder, NULL))
+ if (encoder_end(recorder->encoder, NULL))
recorder_output_encoder_to_file(recorder, NULL);
/* now really close everything */
diff --git a/src/output/shout_plugin.c b/src/output/shout_plugin.c
index 35efd9f..27ef3b9 100644
--- a/src/output/shout_plugin.c
+++ b/src/output/shout_plugin.c
@@ -358,7 +358,7 @@ static void close_shout_conn(struct shout_data * sd)
sd->buf.len = 0;
if (sd->encoder != NULL) {
- if (encoder_flush(sd->encoder, NULL))
+ if (encoder_end(sd->encoder, NULL))
write_page(sd, NULL);
encoder_close(sd->encoder);
diff --git a/src/output/winmm_output_plugin.c b/src/output/winmm_output_plugin.c
index b968787..4312c63 100644
--- a/src/output/winmm_output_plugin.c
+++ b/src/output/winmm_output_plugin.c
@@ -200,11 +200,7 @@ winmm_set_buffer(struct winmm_output *wo, struct winmm_buffer *buffer,
GError **error_r)
{
void *dest = pcm_buffer_get(&buffer->buffer, size);
- if (dest == NULL) {
- g_set_error(error_r, winmm_output_quark(), 0,
- "Out of memory");
- return false;
- }
+ assert(dest != NULL);
memcpy(dest, data, size);
diff --git a/src/pcm_buffer.c b/src/pcm_buffer.c
index b0449d4..60a699b 100644
--- a/src/pcm_buffer.c
+++ b/src/pcm_buffer.c
@@ -34,6 +34,11 @@ pcm_buffer_get(struct pcm_buffer *buffer, size_t size)
{
assert(buffer != NULL);
+ if (size == 0)
+ /* never return NULL, because NULL would be assumed to
+ be an error condition */
+ size = 1;
+
if (buffer->size < size) {
/* free the old buffer */
g_free(buffer->buffer);
diff --git a/src/pcm_buffer.h b/src/pcm_buffer.h
index fe223c7..b132d4f 100644
--- a/src/pcm_buffer.h
+++ b/src/pcm_buffer.h
@@ -63,6 +63,10 @@ pcm_buffer_deinit(struct pcm_buffer *buffer)
/**
* Get the buffer, and guarantee a minimum size. This buffer becomes
* invalid with the next pcm_buffer_get() call.
+ *
+ * This function will never return NULL, even if size is zero, because
+ * the PCM library uses the NULL return value to signal "error". An
+ * empty destination buffer is not always an error.
*/
G_GNUC_MALLOC
void *
diff --git a/src/text_input_stream.c b/src/text_input_stream.c
index 29fb6dc..6d0436d 100644
--- a/src/text_input_stream.c
+++ b/src/text_input_stream.c
@@ -24,6 +24,7 @@
#include <glib.h>
+#include <assert.h>
#include <string.h>
struct text_input_stream {
@@ -67,7 +68,12 @@ text_input_stream_read(struct text_input_stream *tis)
do {
dest = fifo_buffer_write(tis->buffer, &length);
- if (dest != NULL) {
+ if (dest != NULL && length >= 2) {
+ /* reserve one byte for the null terminator if
+ the last line is not terminated by a
+ newline character */
+ --length;
+
nbytes = input_stream_read(tis->is, dest, length,
&error);
if (nbytes > 0)
@@ -77,13 +83,22 @@ text_input_stream_read(struct text_input_stream *tis)
g_error_free(error);
return NULL;
}
- }
+ } else
+ nbytes = 0;
src = fifo_buffer_read(tis->buffer, &length);
if (src == NULL)
return NULL;
p = memchr(src, '\n', length);
+ if (p == NULL && nbytes == 0) {
+ /* end of file (or line too long): terminate
+ the current line */
+ dest = fifo_buffer_write(tis->buffer, &nbytes);
+ assert(dest != NULL);
+ *(char *)dest = '\n';
+ fifo_buffer_append(tis->buffer, 1);
+ }
} while (p == NULL);
length = p - src + 1;
diff --git a/src/update_remove.c b/src/update_remove.c
index f7c2342..8d60be2 100644
--- a/src/update_remove.c
+++ b/src/update_remove.c
@@ -49,7 +49,7 @@ song_remove_event(void)
assert(removed_song != NULL);
uri = song_get_uri(removed_song);
- g_debug("removing: %s", uri);
+ g_message("removing %s", uri);
g_free(uri);
#ifdef ENABLE_SQLITE
diff --git a/src/update_walk.c b/src/update_walk.c
index 03fa784..5d2f778 100644
--- a/src/update_walk.c
+++ b/src/update_walk.c
@@ -848,6 +848,9 @@ directory_make_child_checked(struct directory *parent, const char *path)
return NULL;
}
+ if (skip_symlink(parent, path))
+ return NULL;
+
/* if we're adding directory paths, make sure to delete filenames
with potentially the same name */
conflicting = songvec_find(&parent->songs, base);
@@ -896,7 +899,8 @@ updatePath(const char *path)
name = g_path_get_basename(path);
- if (stat_directory_child(parent, name, &st) == 0)
+ if (!skip_symlink(parent, name) &&
+ stat_directory_child(parent, name, &st) == 0)
updateInDirectory(parent, name, &st);
else
delete_name_in(parent, name);
diff --git a/src/uri.c b/src/uri.c
index f4d590a..bd5aa02 100644
--- a/src/uri.c
+++ b/src/uri.c
@@ -34,13 +34,13 @@ bool uri_has_scheme(const char *uri)
const char *
uri_get_suffix(const char *uri)
{
- const char *suffix = strrchr(g_basename(uri), '.');
+ const char *suffix = strrchr(uri, '.');
if (suffix == NULL)
return NULL;
++suffix;
- if (strchr(suffix, '/') != NULL)
+ if (strpbrk(suffix, "/\\") != NULL)
return NULL;
return suffix;
diff --git a/test/read_tags.c b/test/read_tags.c
index 07d1afc..8906e1c 100644
--- a/test/read_tags.c
+++ b/test/read_tags.c
@@ -104,7 +104,7 @@ decoder_data(G_GNUC_UNUSED struct decoder *decoder,
const void *data, size_t datalen,
G_GNUC_UNUSED uint16_t bit_rate)
{
- write(1, data, datalen);
+ G_GNUC_UNUSED ssize_t nbytes = write(1, data, datalen);
return DECODE_COMMAND_NONE;
}
@@ -165,6 +165,7 @@ int main(int argc, char **argv)
decoder_name = argv[1];
path = argv[2];
+ g_thread_init(NULL);
tag_pool_init();
if (!input_stream_global_init(&error)) {
diff --git a/test/run_convert.c b/test/run_convert.c
index 415d753..ae76bc3 100644
--- a/test/run_convert.c
+++ b/test/run_convert.c
@@ -115,7 +115,7 @@ int main(int argc, char **argv)
return 2;
}
- write(1, output, length);
+ G_GNUC_UNUSED ssize_t ignored = write(1, output, length);
}
pcm_convert_deinit(&state);
diff --git a/test/run_decoder.c b/test/run_decoder.c
index 8dbd530..154b473 100644
--- a/test/run_decoder.c
+++ b/test/run_decoder.c
@@ -126,7 +126,7 @@ decoder_data(G_GNUC_UNUSED struct decoder *decoder,
const void *data, size_t datalen,
G_GNUC_UNUSED uint16_t kbit_rate)
{
- write(1, data, datalen);
+ G_GNUC_UNUSED ssize_t nbytes = write(1, data, datalen);
return DECODE_COMMAND_NONE;
}
@@ -179,6 +179,7 @@ int main(int argc, char **argv)
decoder_name = argv[1];
decoder.uri = argv[2];
+ g_thread_init(NULL);
g_log_set_default_handler(my_log_func, NULL);
tag_pool_init();
diff --git a/test/run_encoder.c b/test/run_encoder.c
index 4b512d4..4c05a06 100644
--- a/test/run_encoder.c
+++ b/test/run_encoder.c
@@ -36,8 +36,9 @@ encoder_to_stdout(struct encoder *encoder)
size_t length;
static char buffer[32768];
- while ((length = encoder_read(encoder, buffer, sizeof(buffer))) > 0)
- write(1, buffer, length);
+ while ((length = encoder_read(encoder, buffer, sizeof(buffer))) > 0) {
+ G_GNUC_UNUSED ssize_t ignored = write(1, buffer, length);
+ }
}
int main(int argc, char **argv)
@@ -120,7 +121,7 @@ int main(int argc, char **argv)
encoder_to_stdout(encoder);
}
- ret = encoder_flush(encoder, &error);
+ ret = encoder_end(encoder, &error);
if (!ret) {
g_printerr("encoder_flush() failed: %s\n",
error->message);
diff --git a/test/run_normalize.c b/test/run_normalize.c
index dd11407..9580159 100644
--- a/test/run_normalize.c
+++ b/test/run_normalize.c
@@ -65,7 +65,8 @@ int main(int argc, char **argv)
while ((nbytes = read(0, buffer, sizeof(buffer))) > 0) {
Compressor_Process_int16(compressor,
(int16_t *)buffer, nbytes / 2);
- write(1, buffer, nbytes);
+
+ G_GNUC_UNUSED ssize_t ignored = write(1, buffer, nbytes);
}
Compressor_delete(compressor);
diff --git a/test/software_volume.c b/test/software_volume.c
index c4de693..789fffe 100644
--- a/test/software_volume.c
+++ b/test/software_volume.c
@@ -65,6 +65,6 @@ int main(int argc, char **argv)
return 2;
}
- write(1, buffer, nbytes);
+ G_GNUC_UNUSED ssize_t ignored = write(1, buffer, nbytes);
}
}
diff --git a/test/test_vorbis_encoder.c b/test/test_vorbis_encoder.c
new file mode 100644
index 0000000..969ab76
--- /dev/null
+++ b/test/test_vorbis_encoder.c
@@ -0,0 +1,109 @@
+/*
+ * Copyright (C) 2003-2012 The Music Player Daemon Project
+ * http://www.musicpd.org
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+#include "config.h"
+#include "encoder_list.h"
+#include "encoder_plugin.h"
+#include "audio_format.h"
+#include "conf.h"
+#include "stdbin.h"
+#include "tag.h"
+
+#include <glib.h>
+
+#include <stddef.h>
+#include <unistd.h>
+
+static uint8_t zero[256];
+
+static void
+encoder_to_stdout(struct encoder *encoder)
+{
+ size_t length;
+ static char buffer[32768];
+
+ while ((length = encoder_read(encoder, buffer, sizeof(buffer))) > 0) {
+ G_GNUC_UNUSED ssize_t ignored = write(1, buffer, length);
+ }
+}
+
+int
+main(G_GNUC_UNUSED int argc, G_GNUC_UNUSED char **argv)
+{
+ G_GNUC_UNUSED bool success;
+
+ /* create the encoder */
+
+ const struct encoder_plugin *plugin = encoder_plugin_get("vorbis");
+ assert(plugin != NULL);
+
+ struct config_param *param = config_new_param(NULL, -1);
+ config_add_block_param(param, "quality", "5.0", -1, NULL);
+
+ struct encoder *encoder = encoder_init(plugin, param, NULL);
+ assert(encoder != NULL);
+
+ /* open the encoder */
+
+ struct audio_format audio_format;
+
+ audio_format_init(&audio_format, 44100, SAMPLE_FORMAT_S16, 2);
+ success = encoder_open(encoder, &audio_format, NULL);
+ assert(success);
+
+ /* write a block of data */
+
+ success = encoder_write(encoder, zero, sizeof(zero), NULL);
+ assert(success);
+
+ encoder_to_stdout(encoder);
+
+ /* write a tag */
+
+ success = encoder_pre_tag(encoder, NULL);
+ assert(success);
+
+ encoder_to_stdout(encoder);
+
+ struct tag *tag = tag_new();
+ tag_add_item(tag, TAG_ARTIST, "Foo");
+ tag_add_item(tag, TAG_TITLE, "Bar");
+
+ success = encoder_tag(encoder, tag, NULL);
+ assert(success);
+
+ tag_free(tag);
+
+ encoder_to_stdout(encoder);
+
+ /* write another block of data */
+
+ success = encoder_write(encoder, zero, sizeof(zero), NULL);
+ assert(success);
+
+ /* finish */
+
+ success = encoder_end(encoder, NULL);
+ assert(success);
+
+ encoder_to_stdout(encoder);
+
+ encoder_close(encoder);
+ encoder_finish(encoder);
+}
--
Git repository for pkg-mpd
More information about the Pkg-mpd-commits
mailing list