[Pkg-mpd-commits] [pkg-mpd] 01/10: Imported Upstream version 0.18.6
Florian Schlichting
fsfs at moszumanska.debian.org
Sun Dec 29 01:40:32 UTC 2013
This is an automated email from the git hooks/post-receive script.
fsfs pushed a commit to branch master
in repository pkg-mpd.
commit aa7bfec74a8cf7bcb69e53cdeae08c96d2abbb68
Author: Florian Schlichting <fsfs at debian.org>
Date: Sun Dec 29 00:07:38 2013 +0100
Imported Upstream version 0.18.6
---
Makefile.in | 1274 ++++++++++++++++-----------------
NEWS | 15 +
aclocal.m4 | 653 ++++++++++-------
compile | 347 +++++++++
config.h.in | 3 +
configure | 347 ++++++---
configure.ac | 3 +-
doc/doxygen.conf | 2 +-
doc/mpd.conf.5 | 131 ----
doc/user.xml | 97 +++
src/OutputControl.cxx | 2 +
src/PlayerThread.cxx | 5 +-
src/SongUpdate.cxx | 3 +-
src/TagFile.hxx | 3 +
src/decoder/FfmpegDecoderPlugin.cxx | 17 +-
src/input/CdioParanoiaInputPlugin.cxx | 5 +
src/mixer/AlsaMixerPlugin.cxx | 13 +
src/output/OSXOutputPlugin.cxx | 6 +-
src/output/OpenALOutputPlugin.cxx | 2 +-
src/tag/Riff.cxx | 3 +-
src/util/Error.hxx | 1 +
test-driver | 127 ++++
22 files changed, 1917 insertions(+), 1142 deletions(-)
diff --git a/Makefile.in b/Makefile.in
index f6206fd..d464362 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.6 from Makefile.am.
+# Makefile.in generated by automake 1.14 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
-# Foundation, Inc.
+# Copyright (C) 1994-2013 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.
@@ -18,23 +17,51 @@
VPATH = @srcdir@
-am__make_dryrun = \
- { \
- am__dry=no; \
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+ case $${target_option-} in \
+ ?) ;; \
+ *) echo "am__make_running_with_option: internal error: invalid" \
+ "target option '$${target_option-}' specified" >&2; \
+ exit 1;; \
+ esac; \
+ has_opt=no; \
+ sane_makeflags=$$MAKEFLAGS; \
+ if $(am__is_gnu_make); then \
+ sane_makeflags=$$MFLAGS; \
+ else \
case $$MAKEFLAGS in \
*\\[\ \ ]*) \
- echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \
- | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
- *) \
- for am__flg in $$MAKEFLAGS; do \
- case $$am__flg in \
- *=*|--*) ;; \
- *n*) am__dry=yes; break;; \
- esac; \
- done;; \
+ bs=\\; \
+ sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+ | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \
esac; \
- test $$am__dry = yes; \
- }
+ fi; \
+ skip_next=no; \
+ strip_trailopt () \
+ { \
+ flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+ }; \
+ for flg in $$sane_makeflags; do \
+ test $$skip_next = yes && { skip_next=no; continue; }; \
+ case $$flg in \
+ *=*|--*) continue;; \
+ -*I) strip_trailopt 'I'; skip_next=yes;; \
+ -*I?*) strip_trailopt 'I';; \
+ -*O) strip_trailopt 'O'; skip_next=yes;; \
+ -*O?*) strip_trailopt 'O';; \
+ -*l) strip_trailopt 'l'; skip_next=yes;; \
+ -*l?*) strip_trailopt 'l';; \
+ -[dEDm]) skip_next=yes;; \
+ -[JT]) skip_next=yes;; \
+ esac; \
+ case $$flg in \
+ *$$target_option*) has_opt=yes; break;; \
+ esac; \
+ done; \
+ test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
pkgdatadir = $(datadir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
@@ -373,13 +400,12 @@ bin_PROGRAMS = src/mpd$(EXEEXT)
@ENABLE_ISO9660_TEST_TRUE@@ENABLE_TEST_TRUE at am__append_87 = test/test_archive_iso9660.sh
@ENABLE_INOTIFY_TRUE@@ENABLE_TEST_TRUE at am__append_88 = test/run_inotify
subdir = .
-DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
- $(srcdir)/Makefile.in $(srcdir)/config.h.in \
- $(srcdir)/mpd.service.in $(top_srcdir)/configure \
- $(top_srcdir)/doc/doxygen.conf.in \
- $(top_srcdir)/src/win/mpd_win32_rc.rc.in AUTHORS COPYING \
- INSTALL NEWS config.guess config.sub depcomp install-sh \
- missing
+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
+ $(top_srcdir)/configure $(am__configure_deps) \
+ $(srcdir)/config.h.in $(top_srcdir)/src/win/mpd_win32_rc.rc.in \
+ $(top_srcdir)/doc/doxygen.conf.in $(srcdir)/mpd.service.in \
+ depcomp test-driver AUTHORS COPYING INSTALL NEWS README \
+ compile config.guess config.sub install-sh missing
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/ax_append_compile_flags.m4 \
$(top_srcdir)/m4/ax_append_flag.m4 \
@@ -404,10 +430,8 @@ LIBRARIES = $(noinst_LIBRARIES)
ARFLAGS = cru
AM_V_AR = $(am__v_AR_ at AM_V@)
am__v_AR_ = $(am__v_AR_ at AM_DEFAULT_V@)
-am__v_AR_0 = @echo " AR " $@;
-AM_V_at = $(am__v_at_ at AM_V@)
-am__v_at_ = $(am__v_at_ at AM_DEFAULT_V@)
-am__v_at_0 = @
+am__v_AR_0 = @echo " AR " $@;
+am__v_AR_1 =
libarchive_a_AR = $(AR) $(ARFLAGS)
libarchive_a_LIBADD =
am__libarchive_a_SOURCES_DIST = src/ArchiveDomain.cxx \
@@ -1597,6 +1621,18 @@ test_visit_archive_OBJECTS = $(am_test_visit_archive_OBJECTS)
@ENABLE_ARCHIVE_TRUE@@ENABLE_TEST_TRUE@ libevent.a libthread.a \
@ENABLE_ARCHIVE_TRUE@@ENABLE_TEST_TRUE@ libsystem.a libfs.a \
@ENABLE_ARCHIVE_TRUE@@ENABLE_TEST_TRUE@ $(am__DEPENDENCIES_1)
+AM_V_P = $(am__v_P_ at AM_V@)
+am__v_P_ = $(am__v_P_ at AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_ at AM_V@)
+am__v_GEN_ = $(am__v_GEN_ at AM_DEFAULT_V@)
+am__v_GEN_0 = @echo " GEN " $@;
+am__v_GEN_1 =
+AM_V_at = $(am__v_at_ at AM_V@)
+am__v_at_ = $(am__v_at_ at AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 =
DEFAULT_INCLUDES = -I. at am__isrc@
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
@@ -1604,30 +1640,32 @@ am__mv = mv -f
AM_V_lt = $(am__v_lt_ at AM_V@)
am__v_lt_ = $(am__v_lt_ at AM_DEFAULT_V@)
am__v_lt_0 = --silent
+am__v_lt_1 =
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
AM_V_CC = $(am__v_CC_ at AM_V@)
am__v_CC_ = $(am__v_CC_ at AM_DEFAULT_V@)
-am__v_CC_0 = @echo " CC " $@;
+am__v_CC_0 = @echo " CC " $@;
+am__v_CC_1 =
CCLD = $(CC)
LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
AM_V_CCLD = $(am__v_CCLD_ at AM_V@)
am__v_CCLD_ = $(am__v_CCLD_ at AM_DEFAULT_V@)
-am__v_CCLD_0 = @echo " CCLD " $@;
+am__v_CCLD_0 = @echo " CCLD " $@;
+am__v_CCLD_1 =
CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
AM_V_CXX = $(am__v_CXX_ at AM_V@)
am__v_CXX_ = $(am__v_CXX_ at AM_DEFAULT_V@)
-am__v_CXX_0 = @echo " CXX " $@;
+am__v_CXX_0 = @echo " CXX " $@;
+am__v_CXX_1 =
CXXLD = $(CXX)
CXXLINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) \
-o $@
AM_V_CXXLD = $(am__v_CXXLD_ at AM_V@)
am__v_CXXLD_ = $(am__v_CXXLD_ at AM_DEFAULT_V@)
-am__v_CXXLD_0 = @echo " CXXLD " $@;
-AM_V_GEN = $(am__v_GEN_ at AM_V@)
-am__v_GEN_ = $(am__v_GEN_ at AM_DEFAULT_V@)
-am__v_GEN_0 = @echo " GEN " $@;
+am__v_CXXLD_0 = @echo " CXXLD " $@;
+am__v_CXXLD_1 =
SOURCES = $(libarchive_a_SOURCES) $(libconf_a_SOURCES) \
$(libdb_plugins_a_SOURCES) $(libdecoder_plugins_a_SOURCES) \
$(libencoder_plugins_a_SOURCES) $(libevent_a_SOURCES) \
@@ -1732,10 +1770,204 @@ NROFF = nroff
MANS = $(man_MANS)
DATA = $(developer_DATA) $(doc_DATA) $(noinst_DATA) $(protocol_DATA) \
$(systemdsystemunit_DATA) $(user_DATA)
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) \
+ $(LISP)config.h.in
+# Read a list of newline-separated strings from the standard input,
+# and print each of them once, without duplicates. Input order is
+# *not* preserved.
+am__uniquify_input = $(AWK) '\
+ BEGIN { nonempty = 0; } \
+ { items[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in items) print i; }; } \
+'
+# Make sure the list of sources is unique. This is necessary because,
+# e.g., the same source file might be shared among _SOURCES variables
+# for different programs/libraries.
+am__define_uniq_tagged_files = \
+ list='$(am__tagged_files)'; \
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | $(am__uniquify_input)`
ETAGS = etags
CTAGS = ctags
-am__tty_colors = \
-red=; grn=; lgn=; blu=; std=
+CSCOPE = cscope
+AM_RECURSIVE_TARGETS = cscope check recheck
+am__tty_colors_dummy = \
+ mgn= red= grn= lgn= blu= brg= std=; \
+ am__color_tests=no
+am__tty_colors = { \
+ $(am__tty_colors_dummy); \
+ if test "X$(AM_COLOR_TESTS)" = Xno; then \
+ am__color_tests=no; \
+ elif test "X$(AM_COLOR_TESTS)" = Xalways; then \
+ am__color_tests=yes; \
+ elif test "X$$TERM" != Xdumb && { test -t 1; } 2>/dev/null; then \
+ am__color_tests=yes; \
+ fi; \
+ if test $$am__color_tests = yes; then \
+ red='[0;31m'; \
+ grn='[0;32m'; \
+ lgn='[1;32m'; \
+ blu='[1;34m'; \
+ mgn='[0;35m'; \
+ brg='[1m'; \
+ std='[m'; \
+ fi; \
+}
+am__recheck_rx = ^[ ]*:recheck:[ ]*
+am__global_test_result_rx = ^[ ]*:global-test-result:[ ]*
+am__copy_in_global_log_rx = ^[ ]*:copy-in-global-log:[ ]*
+# A command that, given a newline-separated list of test names on the
+# standard input, print the name of the tests that are to be re-run
+# upon "make recheck".
+am__list_recheck_tests = $(AWK) '{ \
+ recheck = 1; \
+ while ((rc = (getline line < ($$0 ".trs"))) != 0) \
+ { \
+ if (rc < 0) \
+ { \
+ if ((getline line2 < ($$0 ".log")) < 0) \
+ recheck = 0; \
+ break; \
+ } \
+ else if (line ~ /$(am__recheck_rx)[nN][Oo]/) \
+ { \
+ recheck = 0; \
+ break; \
+ } \
+ else if (line ~ /$(am__recheck_rx)[yY][eE][sS]/) \
+ { \
+ break; \
+ } \
+ }; \
+ if (recheck) \
+ print $$0; \
+ close ($$0 ".trs"); \
+ close ($$0 ".log"); \
+}'
+# A command that, given a newline-separated list of test names on the
+# standard input, create the global log from their .trs and .log files.
+am__create_global_log = $(AWK) ' \
+function fatal(msg) \
+{ \
+ print "fatal: making $@: " msg | "cat >&2"; \
+ exit 1; \
+} \
+function rst_section(header) \
+{ \
+ print header; \
+ len = length(header); \
+ for (i = 1; i <= len; i = i + 1) \
+ printf "="; \
+ printf "\n\n"; \
+} \
+{ \
+ copy_in_global_log = 1; \
+ global_test_result = "RUN"; \
+ while ((rc = (getline line < ($$0 ".trs"))) != 0) \
+ { \
+ if (rc < 0) \
+ fatal("failed to read from " $$0 ".trs"); \
+ if (line ~ /$(am__global_test_result_rx)/) \
+ { \
+ sub("$(am__global_test_result_rx)", "", line); \
+ sub("[ ]*$$", "", line); \
+ global_test_result = line; \
+ } \
+ else if (line ~ /$(am__copy_in_global_log_rx)[nN][oO]/) \
+ copy_in_global_log = 0; \
+ }; \
+ if (copy_in_global_log) \
+ { \
+ rst_section(global_test_result ": " $$0); \
+ while ((rc = (getline line < ($$0 ".log"))) != 0) \
+ { \
+ if (rc < 0) \
+ fatal("failed to read from " $$0 ".log"); \
+ print line; \
+ }; \
+ printf "\n"; \
+ }; \
+ close ($$0 ".trs"); \
+ close ($$0 ".log"); \
+}'
+# Restructured Text title.
+am__rst_title = { sed 's/.*/ & /;h;s/./=/g;p;x;s/ *$$//;p;g' && echo; }
+# Solaris 10 'make', and several other traditional 'make' implementations,
+# pass "-e" to $(SHELL), and POSIX 2008 even requires this. Work around it
+# by disabling -e (using the XSI extension "set +e") if it's set.
+am__sh_e_setup = case $$- in *e*) set +e;; esac
+# Default flags passed to test drivers.
+am__common_driver_flags = \
+ --color-tests "$$am__color_tests" \
+ --enable-hard-errors "$$am__enable_hard_errors" \
+ --expect-failure "$$am__expect_failure"
+# To be inserted before the command running the test. Creates the
+# directory for the log if needed. Stores in $dir the directory
+# containing $f, in $tst the test, in $log the log. Executes the
+# developer- defined test setup AM_TESTS_ENVIRONMENT (if any), and
+# passes TESTS_ENVIRONMENT. Set up options for the wrapper that
+# will run the test scripts (or their associated LOG_COMPILER, if
+# thy have one).
+am__check_pre = \
+$(am__sh_e_setup); \
+$(am__vpath_adj_setup) $(am__vpath_adj) \
+$(am__tty_colors); \
+srcdir=$(srcdir); export srcdir; \
+case "$@" in \
+ */*) am__odir=`echo "./$@" | sed 's|/[^/]*$$||'`;; \
+ *) am__odir=.;; \
+esac; \
+test "x$$am__odir" = x"." || test -d "$$am__odir" \
+ || $(MKDIR_P) "$$am__odir" || exit $$?; \
+if test -f "./$$f"; then dir=./; \
+elif test -f "$$f"; then dir=; \
+else dir="$(srcdir)/"; fi; \
+tst=$$dir$$f; log='$@'; \
+if test -n '$(DISABLE_HARD_ERRORS)'; then \
+ am__enable_hard_errors=no; \
+else \
+ am__enable_hard_errors=yes; \
+fi; \
+case " $(XFAIL_TESTS) " in \
+ *[\ \ ]$$f[\ \ ]* | *[\ \ ]$$dir$$f[\ \ ]*) \
+ am__expect_failure=yes;; \
+ *) \
+ am__expect_failure=no;; \
+esac; \
+$(AM_TESTS_ENVIRONMENT) $(TESTS_ENVIRONMENT)
+# A shell command to get the names of the tests scripts with any registered
+# extension removed (i.e., equivalently, the names of the test logs, with
+# the '.log' extension removed). The result is saved in the shell variable
+# '$bases'. This honors runtime overriding of TESTS and TEST_LOGS. Sadly,
+# we cannot use something simpler, involving e.g., "$(TEST_LOGS:.log=)",
+# since that might cause problem with VPATH rewrites for suffix-less tests.
+# See also 'test-harness-vpath-rewrite.sh' and 'test-trs-basic.sh'.
+am__set_TESTS_bases = \
+ bases='$(TEST_LOGS)'; \
+ bases=`for i in $$bases; do echo $$i; done | sed 's/\.log$$//'`; \
+ bases=`echo $$bases`
+RECHECK_LOGS = $(TEST_LOGS)
+TEST_SUITE_LOG = test-suite.log
+TEST_EXTENSIONS = @EXEEXT@ .test
+LOG_DRIVER = $(SHELL) $(top_srcdir)/test-driver
+LOG_COMPILE = $(LOG_COMPILER) $(AM_LOG_FLAGS) $(LOG_FLAGS)
+am__set_b = \
+ case '$@' in \
+ */*) \
+ case '$*' in \
+ */*) b='$*';; \
+ *) b=`echo '$@' | sed 's/\.log$$//'`; \
+ esac;; \
+ *) \
+ b='$*';; \
+ esac
+am__test_logs1 = $(TESTS:=.log)
+am__test_logs2 = $(am__test_logs1:@EXEEXT at .log=.log)
+TEST_LOGS = $(am__test_logs2:.test.log=.log)
+TEST_LOG_DRIVER = $(SHELL) $(top_srcdir)/test-driver
+TEST_LOG_COMPILE = $(TEST_LOG_COMPILER) $(AM_TEST_LOG_FLAGS) \
+ $(TEST_LOG_FLAGS)
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
distdir = $(PACKAGE)-$(VERSION)
top_distdir = $(distdir)
@@ -1745,8 +1977,10 @@ am__remove_distdir = \
&& rm -rf "$(distdir)" \
|| { sleep 5 && rm -rf "$(distdir)"; }; \
else :; fi
+am__post_remove_distdir = $(am__remove_distdir)
DIST_ARCHIVES = $(distdir).tar.gz $(distdir).tar.xz
GZIP_ENV = --best
+DIST_TARGETS = dist-xz dist-gzip
distuninstallcheck_listfiles = find . -type f -print
am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \
| sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$'
@@ -2977,7 +3211,7 @@ all: config.h
$(MAKE) $(AM_MAKEFLAGS) all-am
.SUFFIXES:
-.SUFFIXES: .c .cpp .cxx .o .obj
+.SUFFIXES: .c .cpp .cxx .log .o .obj .test .test$(EXEEXT) .trs
am--refresh: Makefile
@:
$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
@@ -3014,8 +3248,8 @@ $(ACLOCAL_M4): $(am__aclocal_m4_deps)
$(am__aclocal_m4_deps):
config.h: stamp-h1
- @if test ! -f $@; then rm -f stamp-h1; else :; fi
- @if test ! -f $@; then $(MAKE) $(AM_MAKEFLAGS) stamp-h1; else :; fi
+ @test -f $@ || rm -f stamp-h1
+ @test -f $@ || $(MAKE) $(AM_MAKEFLAGS) stamp-h1
stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status
@rm -f stamp-h1
@@ -3073,6 +3307,7 @@ src/archive/libarchive_a-ZzipArchivePlugin.$(OBJEXT): \
src/archive/libarchive_a-Iso9660ArchivePlugin.$(OBJEXT): \
src/archive/$(am__dirstamp) \
src/archive/$(DEPDIR)/$(am__dirstamp)
+
libarchive.a: $(libarchive_a_OBJECTS) $(libarchive_a_DEPENDENCIES) $(EXTRA_libarchive_a_DEPENDENCIES)
$(AM_V_at)-rm -f libarchive.a
$(AM_V_AR)$(libarchive_a_AR) libarchive.a $(libarchive_a_OBJECTS) $(libarchive_a_LIBADD)
@@ -3091,6 +3326,7 @@ src/ConfigTemplates.$(OBJEXT): src/$(am__dirstamp) \
src/$(DEPDIR)/$(am__dirstamp)
src/ConfigError.$(OBJEXT): src/$(am__dirstamp) \
src/$(DEPDIR)/$(am__dirstamp)
+
libconf.a: $(libconf_a_OBJECTS) $(libconf_a_DEPENDENCIES) $(EXTRA_libconf_a_DEPENDENCIES)
$(AM_V_at)-rm -f libconf.a
$(AM_V_AR)$(libconf_a_AR) libconf.a $(libconf_a_OBJECTS) $(libconf_a_LIBADD)
@@ -3109,6 +3345,7 @@ src/db/SimpleDatabasePlugin.$(OBJEXT): src/db/$(am__dirstamp) \
src/db/$(DEPDIR)/$(am__dirstamp)
src/db/ProxyDatabasePlugin.$(OBJEXT): src/db/$(am__dirstamp) \
src/db/$(DEPDIR)/$(am__dirstamp)
+
libdb_plugins.a: $(libdb_plugins_a_OBJECTS) $(libdb_plugins_a_DEPENDENCIES) $(EXTRA_libdb_plugins_a_DEPENDENCIES)
$(AM_V_at)-rm -f libdb_plugins.a
$(AM_V_AR)$(libdb_plugins_a_AR) libdb_plugins.a $(libdb_plugins_a_OBJECTS) $(libdb_plugins_a_LIBADD)
@@ -3236,6 +3473,7 @@ src/decoder/libdecoder_plugins_a-SndfileDecoderPlugin.$(OBJEXT): \
src/decoder/libdecoder_plugins_a-GmeDecoderPlugin.$(OBJEXT): \
src/decoder/$(am__dirstamp) \
src/decoder/$(DEPDIR)/$(am__dirstamp)
+
libdecoder_plugins.a: $(libdecoder_plugins_a_OBJECTS) $(libdecoder_plugins_a_DEPENDENCIES) $(EXTRA_libdecoder_plugins_a_DEPENDENCIES)
$(AM_V_at)-rm -f libdecoder_plugins.a
$(AM_V_AR)$(libdecoder_plugins_a_AR) libdecoder_plugins.a $(libdecoder_plugins_a_OBJECTS) $(libdecoder_plugins_a_LIBADD)
@@ -3272,6 +3510,7 @@ src/encoder/libencoder_plugins_a-TwolameEncoderPlugin.$(OBJEXT): \
src/encoder/libencoder_plugins_a-FlacEncoderPlugin.$(OBJEXT): \
src/encoder/$(am__dirstamp) \
src/encoder/$(DEPDIR)/$(am__dirstamp)
+
libencoder_plugins.a: $(libencoder_plugins_a_OBJECTS) $(libencoder_plugins_a_DEPENDENCIES) $(EXTRA_libencoder_plugins_a_DEPENDENCIES)
$(AM_V_at)-rm -f libencoder_plugins.a
$(AM_V_AR)$(libencoder_plugins_a_AR) libencoder_plugins.a $(libencoder_plugins_a_OBJECTS) $(libencoder_plugins_a_LIBADD)
@@ -3304,6 +3543,7 @@ src/event/Call.$(OBJEXT): src/event/$(am__dirstamp) \
src/event/$(DEPDIR)/$(am__dirstamp)
src/event/Loop.$(OBJEXT): src/event/$(am__dirstamp) \
src/event/$(DEPDIR)/$(am__dirstamp)
+
libevent.a: $(libevent_a_OBJECTS) $(libevent_a_DEPENDENCIES) $(EXTRA_libevent_a_DEPENDENCIES)
$(AM_V_at)-rm -f libevent.a
$(AM_V_AR)$(libevent_a_AR) libevent.a $(libevent_a_OBJECTS) $(libevent_a_LIBADD)
@@ -3333,6 +3573,7 @@ src/filter/ReplayGainFilterPlugin.$(OBJEXT): \
src/filter/$(DEPDIR)/$(am__dirstamp)
src/filter/VolumeFilterPlugin.$(OBJEXT): src/filter/$(am__dirstamp) \
src/filter/$(DEPDIR)/$(am__dirstamp)
+
libfilter_plugins.a: $(libfilter_plugins_a_OBJECTS) $(libfilter_plugins_a_DEPENDENCIES) $(EXTRA_libfilter_plugins_a_DEPENDENCIES)
$(AM_V_at)-rm -f libfilter_plugins.a
$(AM_V_AR)$(libfilter_plugins_a_AR) libfilter_plugins.a $(libfilter_plugins_a_OBJECTS) $(libfilter_plugins_a_LIBADD)
@@ -3357,6 +3598,7 @@ src/fs/AllocatedPath.$(OBJEXT): src/fs/$(am__dirstamp) \
src/fs/$(DEPDIR)/$(am__dirstamp)
src/fs/FileSystem.$(OBJEXT): src/fs/$(am__dirstamp) \
src/fs/$(DEPDIR)/$(am__dirstamp)
+
libfs.a: $(libfs_a_OBJECTS) $(libfs_a_DEPENDENCIES) $(EXTRA_libfs_a_DEPENDENCIES)
$(AM_V_at)-rm -f libfs.a
$(AM_V_AR)$(libfs_a_AR) libfs.a $(libfs_a_OBJECTS) $(libfs_a_LIBADD)
@@ -3383,6 +3625,7 @@ src/input/libinput_a-MmsInputPlugin.$(OBJEXT): \
src/input/$(am__dirstamp) src/input/$(DEPDIR)/$(am__dirstamp)
src/input/libinput_a-DespotifyInputPlugin.$(OBJEXT): \
src/input/$(am__dirstamp) src/input/$(DEPDIR)/$(am__dirstamp)
+
libinput.a: $(libinput_a_OBJECTS) $(libinput_a_DEPENDENCIES) $(EXTRA_libinput_a_DEPENDENCIES)
$(AM_V_at)-rm -f libinput.a
$(AM_V_AR)$(libinput_a_AR) libinput.a $(libinput_a_OBJECTS) $(libinput_a_LIBADD)
@@ -3405,6 +3648,7 @@ src/mixer/libmixer_plugins_a-PulseMixerPlugin.$(OBJEXT): \
src/mixer/$(am__dirstamp) src/mixer/$(DEPDIR)/$(am__dirstamp)
src/mixer/libmixer_plugins_a-WinmmMixerPlugin.$(OBJEXT): \
src/mixer/$(am__dirstamp) src/mixer/$(DEPDIR)/$(am__dirstamp)
+
libmixer_plugins.a: $(libmixer_plugins_a_OBJECTS) $(libmixer_plugins_a_DEPENDENCIES) $(EXTRA_libmixer_plugins_a_DEPENDENCIES)
$(AM_V_at)-rm -f libmixer_plugins.a
$(AM_V_AR)$(libmixer_plugins_a_AR) libmixer_plugins.a $(libmixer_plugins_a_OBJECTS) $(libmixer_plugins_a_LIBADD)
@@ -3412,6 +3656,7 @@ libmixer_plugins.a: $(libmixer_plugins_a_OBJECTS) $(libmixer_plugins_a_DEPENDENC
src/decoder/libmodplug_decoder_plugin_a-ModplugDecoderPlugin.$(OBJEXT): \
src/decoder/$(am__dirstamp) \
src/decoder/$(DEPDIR)/$(am__dirstamp)
+
libmodplug_decoder_plugin.a: $(libmodplug_decoder_plugin_a_OBJECTS) $(libmodplug_decoder_plugin_a_DEPENDENCIES) $(EXTRA_libmodplug_decoder_plugin_a_DEPENDENCIES)
$(AM_V_at)-rm -f libmodplug_decoder_plugin.a
$(AM_V_AR)$(libmodplug_decoder_plugin_a_AR) libmodplug_decoder_plugin.a $(libmodplug_decoder_plugin_a_OBJECTS) $(libmodplug_decoder_plugin_a_LIBADD)
@@ -3475,6 +3720,7 @@ src/output/liboutput_plugins_a-SolarisOutputPlugin.$(OBJEXT): \
src/output/liboutput_plugins_a-WinmmOutputPlugin.$(OBJEXT): \
src/output/$(am__dirstamp) \
src/output/$(DEPDIR)/$(am__dirstamp)
+
liboutput_plugins.a: $(liboutput_plugins_a_OBJECTS) $(liboutput_plugins_a_DEPENDENCIES) $(EXTRA_liboutput_plugins_a_DEPENDENCIES)
$(AM_V_at)-rm -f liboutput_plugins.a
$(AM_V_AR)$(liboutput_plugins_a_AR) liboutput_plugins.a $(liboutput_plugins_a_OBJECTS) $(liboutput_plugins_a_LIBADD)
@@ -3522,6 +3768,7 @@ src/pcm/libpcm_a-PcmDither.$(OBJEXT): src/pcm/$(am__dirstamp) \
src/pcm/$(DEPDIR)/$(am__dirstamp)
src/pcm/libpcm_a-PcmResampleLibsamplerate.$(OBJEXT): \
src/pcm/$(am__dirstamp) src/pcm/$(DEPDIR)/$(am__dirstamp)
+
libpcm.a: $(libpcm_a_OBJECTS) $(libpcm_a_DEPENDENCIES) $(EXTRA_libpcm_a_DEPENDENCIES)
$(AM_V_at)-rm -f libpcm.a
$(AM_V_AR)$(libpcm_a_AR) libpcm.a $(libpcm_a_OBJECTS) $(libpcm_a_LIBADD)
@@ -3566,6 +3813,7 @@ src/playlist/libplaylist_plugins_a-DespotifyPlaylistPlugin.$(OBJEXT): \
src/playlist/libplaylist_plugins_a-SoundCloudPlaylistPlugin.$(OBJEXT): \
src/playlist/$(am__dirstamp) \
src/playlist/$(DEPDIR)/$(am__dirstamp)
+
libplaylist_plugins.a: $(libplaylist_plugins_a_OBJECTS) $(libplaylist_plugins_a_DEPENDENCIES) $(EXTRA_libplaylist_plugins_a_DEPENDENCIES)
$(AM_V_at)-rm -f libplaylist_plugins.a
$(AM_V_AR)$(libplaylist_plugins_a_AR) libplaylist_plugins.a $(libplaylist_plugins_a_OBJECTS) $(libplaylist_plugins_a_LIBADD)
@@ -3596,6 +3844,7 @@ src/system/EPollFD.$(OBJEXT): src/system/$(am__dirstamp) \
src/system/$(DEPDIR)/$(am__dirstamp)
src/system/Clock.$(OBJEXT): src/system/$(am__dirstamp) \
src/system/$(DEPDIR)/$(am__dirstamp)
+
libsystem.a: $(libsystem_a_OBJECTS) $(libsystem_a_DEPENDENCIES) $(EXTRA_libsystem_a_DEPENDENCIES)
$(AM_V_at)-rm -f libsystem.a
$(AM_V_AR)$(libsystem_a_AR) libsystem.a $(libsystem_a_OBJECTS) $(libsystem_a_LIBADD)
@@ -3638,6 +3887,7 @@ src/tag/libtag_a-Riff.$(OBJEXT): src/tag/$(am__dirstamp) \
src/tag/$(DEPDIR)/$(am__dirstamp)
src/tag/libtag_a-Aiff.$(OBJEXT): src/tag/$(am__dirstamp) \
src/tag/$(DEPDIR)/$(am__dirstamp)
+
libtag.a: $(libtag_a_OBJECTS) $(libtag_a_DEPENDENCIES) $(EXTRA_libtag_a_DEPENDENCIES)
$(AM_V_at)-rm -f libtag.a
$(AM_V_AR)$(libtag_a_AR) libtag.a $(libtag_a_OBJECTS) $(libtag_a_LIBADD)
@@ -3650,6 +3900,7 @@ src/thread/$(DEPDIR)/$(am__dirstamp):
@: > src/thread/$(DEPDIR)/$(am__dirstamp)
src/thread/Thread.$(OBJEXT): src/thread/$(am__dirstamp) \
src/thread/$(DEPDIR)/$(am__dirstamp)
+
libthread.a: $(libthread_a_OBJECTS) $(libthread_a_DEPENDENCIES) $(EXTRA_libthread_a_DEPENDENCIES)
$(AM_V_at)-rm -f libthread.a
$(AM_V_AR)$(libthread_a_AR) libthread.a $(libthread_a_OBJECTS) $(libthread_a_LIBADD)
@@ -3686,6 +3937,7 @@ src/util/ByteReverse.$(OBJEXT): src/util/$(am__dirstamp) \
src/util/$(DEPDIR)/$(am__dirstamp)
src/util/bit_reverse.$(OBJEXT): src/util/$(am__dirstamp) \
src/util/$(DEPDIR)/$(am__dirstamp)
+
libutil.a: $(libutil_a_OBJECTS) $(libutil_a_DEPENDENCIES) $(EXTRA_libutil_a_DEPENDENCIES)
$(AM_V_at)-rm -f libutil.a
$(AM_V_AR)$(libutil_a_AR) libutil.a $(libutil_a_OBJECTS) $(libutil_a_LIBADD)
@@ -3699,10 +3951,11 @@ install-binPROGRAMS: $(bin_PROGRAMS)
fi; \
for p in $$list; do echo "$$p $$p"; done | \
sed 's/$(EXEEXT)$$//' | \
- while read p p1; do if test -f $$p; \
- then echo "$$p"; echo "$$p"; else :; fi; \
+ while read p p1; do if test -f $$p \
+ ; then echo "$$p"; echo "$$p"; else :; fi; \
done | \
- sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \
+ sed -e 'p;s,.*/,,;n;h' \
+ -e 's|.*|.|' \
-e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \
sed 'N;N;N;s,\n, ,g' | \
$(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \
@@ -3723,7 +3976,8 @@ uninstall-binPROGRAMS:
@list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
files=`for p in $$list; do echo "$$p"; done | \
sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \
- -e 's/$$/$(EXEEXT)/' `; \
+ -e 's/$$/$(EXEEXT)/' \
+ `; \
test -n "$$list" || exit 0; \
echo " ( cd '$(DESTDIR)$(bindir)' && rm -f" $$files ")"; \
cd "$(DESTDIR)$(bindir)" && rm -f $$files
@@ -4073,6 +4327,7 @@ src/src_mpd-ZeroconfAvahi.$(OBJEXT): src/$(am__dirstamp) \
src/$(DEPDIR)/$(am__dirstamp)
src/src_mpd-ZeroconfBonjour.$(OBJEXT): src/$(am__dirstamp) \
src/$(DEPDIR)/$(am__dirstamp)
+
src/mpd$(EXEEXT): $(src_mpd_OBJECTS) $(src_mpd_DEPENDENCIES) $(EXTRA_src_mpd_DEPENDENCIES) src/$(am__dirstamp)
@rm -f src/mpd$(EXEEXT)
$(AM_V_CXXLD)$(src_mpd_LINK) $(src_mpd_OBJECTS) $(src_mpd_LDADD) $(LIBS)
@@ -4082,6 +4337,7 @@ src/pcm/dsd2pcm/noiseshape.$(OBJEXT): src/pcm/dsd2pcm/$(am__dirstamp) \
src/pcm/dsd2pcm/$(DEPDIR)/$(am__dirstamp)
src/pcm/dsd2pcm/main.$(OBJEXT): src/pcm/dsd2pcm/$(am__dirstamp) \
src/pcm/dsd2pcm/$(DEPDIR)/$(am__dirstamp)
+
src/pcm/dsd2pcm/dsd2pcm$(EXEEXT): $(src_pcm_dsd2pcm_dsd2pcm_OBJECTS) $(src_pcm_dsd2pcm_dsd2pcm_DEPENDENCIES) $(EXTRA_src_pcm_dsd2pcm_dsd2pcm_DEPENDENCIES) src/pcm/dsd2pcm/$(am__dirstamp)
@rm -f src/pcm/dsd2pcm/dsd2pcm$(EXEEXT)
$(AM_V_CXXLD)$(CXXLINK) $(src_pcm_dsd2pcm_dsd2pcm_OBJECTS) $(src_pcm_dsd2pcm_dsd2pcm_LDADD) $(LIBS)
@@ -4123,6 +4379,7 @@ src/SongFilter.$(OBJEXT): src/$(am__dirstamp) \
src/$(DEPDIR)/$(am__dirstamp)
src/TextFile.$(OBJEXT): src/$(am__dirstamp) \
src/$(DEPDIR)/$(am__dirstamp)
+
test/DumpDatabase$(EXEEXT): $(test_DumpDatabase_OBJECTS) $(test_DumpDatabase_DEPENDENCIES) $(EXTRA_test_DumpDatabase_DEPENDENCIES) test/$(am__dirstamp)
@rm -f test/DumpDatabase$(EXEEXT)
$(AM_V_CXXLD)$(CXXLINK) $(test_DumpDatabase_OBJECTS) $(test_DumpDatabase_LDADD) $(LIBS)
@@ -4144,21 +4401,25 @@ src/decoder/FlacMetadata.$(OBJEXT): src/decoder/$(am__dirstamp) \
src/decoder/$(DEPDIR)/$(am__dirstamp)
src/DespotifyUtils.$(OBJEXT): src/$(am__dirstamp) \
src/$(DEPDIR)/$(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)
$(AM_V_CXXLD)$(CXXLINK) $(test_dump_playlist_OBJECTS) $(test_dump_playlist_LDADD) $(LIBS)
test/dump_rva2.$(OBJEXT): test/$(am__dirstamp) \
test/$(DEPDIR)/$(am__dirstamp)
+
test/dump_rva2$(EXEEXT): $(test_dump_rva2_OBJECTS) $(test_dump_rva2_DEPENDENCIES) $(EXTRA_test_dump_rva2_DEPENDENCIES) test/$(am__dirstamp)
@rm -f test/dump_rva2$(EXEEXT)
$(AM_V_CXXLD)$(CXXLINK) $(test_dump_rva2_OBJECTS) $(test_dump_rva2_LDADD) $(LIBS)
test/dump_text_file.$(OBJEXT): test/$(am__dirstamp) \
test/$(DEPDIR)/$(am__dirstamp)
+
test/dump_text_file$(EXEEXT): $(test_dump_text_file_OBJECTS) $(test_dump_text_file_DEPENDENCIES) $(EXTRA_test_dump_text_file_DEPENDENCIES) test/$(am__dirstamp)
@rm -f test/dump_text_file$(EXEEXT)
$(AM_V_CXXLD)$(CXXLINK) $(test_dump_text_file_OBJECTS) $(test_dump_text_file_LDADD) $(LIBS)
test/read_conf.$(OBJEXT): test/$(am__dirstamp) \
test/$(DEPDIR)/$(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)
$(AM_V_CXXLD)$(CXXLINK) $(test_read_conf_OBJECTS) $(test_read_conf_LDADD) $(LIBS)
@@ -4168,11 +4429,13 @@ src/MixerControl.$(OBJEXT): src/$(am__dirstamp) \
src/$(DEPDIR)/$(am__dirstamp)
src/FilterPlugin.$(OBJEXT): src/$(am__dirstamp) \
src/$(DEPDIR)/$(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)
$(AM_V_CXXLD)$(CXXLINK) $(test_read_mixer_OBJECTS) $(test_read_mixer_LDADD) $(LIBS)
test/read_tags.$(OBJEXT): test/$(am__dirstamp) \
test/$(DEPDIR)/$(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)
$(AM_V_CXXLD)$(CXXLINK) $(test_read_tags_OBJECTS) $(test_read_tags_LDADD) $(LIBS)
@@ -4186,6 +4449,7 @@ test/test_run_avahi-ShutdownHandler.$(OBJEXT): test/$(am__dirstamp) \
test/$(DEPDIR)/$(am__dirstamp)
test/test_run_avahi-run_avahi.$(OBJEXT): test/$(am__dirstamp) \
test/$(DEPDIR)/$(am__dirstamp)
+
test/run_avahi$(EXEEXT): $(test_run_avahi_OBJECTS) $(test_run_avahi_DEPENDENCIES) $(EXTRA_test_run_avahi_DEPENDENCIES) test/$(am__dirstamp)
@rm -f test/run_avahi$(EXEEXT)
$(AM_V_CXXLD)$(CXXLINK) $(test_run_avahi_OBJECTS) $(test_run_avahi_LDADD) $(LIBS)
@@ -4195,16 +4459,19 @@ src/AudioFormat.$(OBJEXT): src/$(am__dirstamp) \
src/$(DEPDIR)/$(am__dirstamp)
src/AudioParser.$(OBJEXT): src/$(am__dirstamp) \
src/$(DEPDIR)/$(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)
$(AM_V_CXXLD)$(CXXLINK) $(test_run_convert_OBJECTS) $(test_run_convert_LDADD) $(LIBS)
test/run_decoder.$(OBJEXT): test/$(am__dirstamp) \
test/$(DEPDIR)/$(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)
$(AM_V_CXXLD)$(CXXLINK) $(test_run_decoder_OBJECTS) $(test_run_decoder_LDADD) $(LIBS)
test/run_encoder.$(OBJEXT): test/$(am__dirstamp) \
test/$(DEPDIR)/$(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)
$(AM_V_CXXLD)$(CXXLINK) $(test_run_encoder_OBJECTS) $(test_run_encoder_LDADD) $(LIBS)
@@ -4217,6 +4484,7 @@ src/FilterRegistry.$(OBJEXT): src/$(am__dirstamp) \
src/AudioCompress/compress.$(OBJEXT): \
src/AudioCompress/$(am__dirstamp) \
src/AudioCompress/$(DEPDIR)/$(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)
$(AM_V_CXXLD)$(CXXLINK) $(test_run_filter_OBJECTS) $(test_run_filter_LDADD) $(LIBS)
@@ -4228,16 +4496,19 @@ src/InotifyDomain.$(OBJEXT): src/$(am__dirstamp) \
src/$(DEPDIR)/$(am__dirstamp)
src/InotifySource.$(OBJEXT): src/$(am__dirstamp) \
src/$(DEPDIR)/$(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)
$(AM_V_CXXLD)$(CXXLINK) $(test_run_inotify_OBJECTS) $(test_run_inotify_LDADD) $(LIBS)
test/run_input.$(OBJEXT): test/$(am__dirstamp) \
test/$(DEPDIR)/$(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)
$(AM_V_CXXLD)$(CXXLINK) $(test_run_input_OBJECTS) $(test_run_input_LDADD) $(LIBS)
test/run_normalize.$(OBJEXT): test/$(am__dirstamp) \
test/$(DEPDIR)/$(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)
$(AM_V_CXXLD)$(CXXLINK) $(test_run_normalize_OBJECTS) $(test_run_normalize_LDADD) $(LIBS)
@@ -4259,16 +4530,19 @@ src/MixerType.$(OBJEXT): src/$(am__dirstamp) \
src/$(DEPDIR)/$(am__dirstamp)
src/FilterConfig.$(OBJEXT): src/$(am__dirstamp) \
src/$(DEPDIR)/$(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)
$(AM_V_CXXLD)$(CXXLINK) $(test_run_output_OBJECTS) $(test_run_output_LDADD) $(LIBS)
test/run_resolver.$(OBJEXT): test/$(am__dirstamp) \
test/$(DEPDIR)/$(am__dirstamp)
+
test/run_resolver$(EXEEXT): $(test_run_resolver_OBJECTS) $(test_run_resolver_DEPENDENCIES) $(EXTRA_test_run_resolver_DEPENDENCIES) test/$(am__dirstamp)
@rm -f test/run_resolver$(EXEEXT)
$(AM_V_CXXLD)$(CXXLINK) $(test_run_resolver_OBJECTS) $(test_run_resolver_LDADD) $(LIBS)
test/software_volume.$(OBJEXT): test/$(am__dirstamp) \
test/$(DEPDIR)/$(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)
$(AM_V_CXXLD)$(CXXLINK) $(test_software_volume_OBJECTS) $(test_software_volume_LDADD) $(LIBS)
@@ -4276,11 +4550,13 @@ src/test_test_archive-Log.$(OBJEXT): src/$(am__dirstamp) \
src/$(DEPDIR)/$(am__dirstamp)
test/test_test_archive-test_archive.$(OBJEXT): test/$(am__dirstamp) \
test/$(DEPDIR)/$(am__dirstamp)
+
test/test_archive$(EXEEXT): $(test_test_archive_OBJECTS) $(test_test_archive_DEPENDENCIES) $(EXTRA_test_test_archive_DEPENDENCIES) test/$(am__dirstamp)
@rm -f test/test_archive$(EXEEXT)
$(AM_V_CXXLD)$(test_test_archive_LINK) $(test_test_archive_OBJECTS) $(test_test_archive_LDADD) $(LIBS)
test/test_test_byte_reverse-test_byte_reverse.$(OBJEXT): \
test/$(am__dirstamp) test/$(DEPDIR)/$(am__dirstamp)
+
test/test_byte_reverse$(EXEEXT): $(test_test_byte_reverse_OBJECTS) $(test_test_byte_reverse_DEPENDENCIES) $(EXTRA_test_test_byte_reverse_DEPENDENCIES) test/$(am__dirstamp)
@rm -f test/test_byte_reverse$(EXEEXT)
$(AM_V_CXXLD)$(test_test_byte_reverse_LINK) $(test_test_byte_reverse_OBJECTS) $(test_test_byte_reverse_LDADD) $(LIBS)
@@ -4288,6 +4564,7 @@ src/test_test_mixramp-Log.$(OBJEXT): src/$(am__dirstamp) \
src/$(DEPDIR)/$(am__dirstamp)
test/test_test_mixramp-test_mixramp.$(OBJEXT): test/$(am__dirstamp) \
test/$(DEPDIR)/$(am__dirstamp)
+
test/test_mixramp$(EXEEXT): $(test_test_mixramp_OBJECTS) $(test_test_mixramp_DEPENDENCIES) $(EXTRA_test_test_mixramp_DEPENDENCIES) test/$(am__dirstamp)
@rm -f test/test_mixramp$(EXEEXT)
$(AM_V_CXXLD)$(test_test_mixramp_LINK) $(test_test_mixramp_OBJECTS) $(test_test_mixramp_LDADD) $(LIBS)
@@ -4305,6 +4582,7 @@ test/test_test_pcm-test_pcm_mix.$(OBJEXT): test/$(am__dirstamp) \
test/$(DEPDIR)/$(am__dirstamp)
test/test_test_pcm-test_pcm_main.$(OBJEXT): test/$(am__dirstamp) \
test/$(DEPDIR)/$(am__dirstamp)
+
test/test_pcm$(EXEEXT): $(test_test_pcm_OBJECTS) $(test_test_pcm_DEPENDENCIES) $(EXTRA_test_test_pcm_DEPENDENCIES) test/$(am__dirstamp)
@rm -f test/test_pcm$(EXEEXT)
$(AM_V_CXXLD)$(test_test_pcm_LINK) $(test_test_pcm_OBJECTS) $(test_test_pcm_LDADD) $(LIBS)
@@ -4312,11 +4590,13 @@ src/test_test_queue_priority-Queue.$(OBJEXT): src/$(am__dirstamp) \
src/$(DEPDIR)/$(am__dirstamp)
test/test_test_queue_priority-test_queue_priority.$(OBJEXT): \
test/$(am__dirstamp) test/$(DEPDIR)/$(am__dirstamp)
+
test/test_queue_priority$(EXEEXT): $(test_test_queue_priority_OBJECTS) $(test_test_queue_priority_DEPENDENCIES) $(EXTRA_test_test_queue_priority_DEPENDENCIES) test/$(am__dirstamp)
@rm -f test/test_queue_priority$(EXEEXT)
$(AM_V_CXXLD)$(test_test_queue_priority_LINK) $(test_test_queue_priority_OBJECTS) $(test_test_queue_priority_LDADD) $(LIBS)
test/test_test_util-test_util.$(OBJEXT): test/$(am__dirstamp) \
test/$(DEPDIR)/$(am__dirstamp)
+
test/test_util$(EXEEXT): $(test_test_util_OBJECTS) $(test_test_util_DEPENDENCIES) $(EXTRA_test_test_util_DEPENDENCIES) test/$(am__dirstamp)
@rm -f test/test_util$(EXEEXT)
$(AM_V_CXXLD)$(test_test_util_LINK) $(test_test_util_OBJECTS) $(test_test_util_LDADD) $(LIBS)
@@ -4330,6 +4610,7 @@ src/test_test_vorbis_encoder-AudioFormat.$(OBJEXT): \
src/$(am__dirstamp) src/$(DEPDIR)/$(am__dirstamp)
src/test_test_vorbis_encoder-AudioParser.$(OBJEXT): \
src/$(am__dirstamp) src/$(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)
$(AM_V_CXXLD)$(CXXLINK) $(test_test_vorbis_encoder_OBJECTS) $(test_test_vorbis_encoder_LDADD) $(LIBS)
@@ -4337,450 +4618,36 @@ test/visit_archive.$(OBJEXT): test/$(am__dirstamp) \
test/$(DEPDIR)/$(am__dirstamp)
src/InputStream.$(OBJEXT): src/$(am__dirstamp) \
src/$(DEPDIR)/$(am__dirstamp)
+
test/visit_archive$(EXEEXT): $(test_visit_archive_OBJECTS) $(test_visit_archive_DEPENDENCIES) $(EXTRA_test_visit_archive_DEPENDENCIES) test/$(am__dirstamp)
@rm -f test/visit_archive$(EXEEXT)
$(AM_V_CXXLD)$(CXXLINK) $(test_visit_archive_OBJECTS) $(test_visit_archive_LDADD) $(LIBS)
mostlyclean-compile:
-rm -f *.$(OBJEXT)
- -rm -f src/AudioCompress/compress.$(OBJEXT)
- -rm -f src/AudioCompress/src_mpd-compress.$(OBJEXT)
- -rm -f src/AudioFormat.$(OBJEXT)
- -rm -f src/AudioParser.$(OBJEXT)
- -rm -f src/CheckAudioFormat.$(OBJEXT)
- -rm -f src/ConfigData.$(OBJEXT)
- -rm -f src/ConfigError.$(OBJEXT)
- -rm -f src/ConfigFile.$(OBJEXT)
- -rm -f src/ConfigGlobal.$(OBJEXT)
- -rm -f src/ConfigParser.$(OBJEXT)
- -rm -f src/ConfigPath.$(OBJEXT)
- -rm -f src/ConfigTemplates.$(OBJEXT)
- -rm -f src/DatabaseError.$(OBJEXT)
- -rm -f src/DatabaseHelpers.$(OBJEXT)
- -rm -f src/DatabaseLock.$(OBJEXT)
- -rm -f src/DatabaseRegistry.$(OBJEXT)
- -rm -f src/DatabaseSave.$(OBJEXT)
- -rm -f src/DatabaseSelection.$(OBJEXT)
- -rm -f src/DespotifyUtils.$(OBJEXT)
- -rm -f src/Directory.$(OBJEXT)
- -rm -f src/DirectorySave.$(OBJEXT)
- -rm -f src/FilterConfig.$(OBJEXT)
- -rm -f src/FilterPlugin.$(OBJEXT)
- -rm -f src/FilterRegistry.$(OBJEXT)
- -rm -f src/IOThread.$(OBJEXT)
- -rm -f src/InotifyDomain.$(OBJEXT)
- -rm -f src/InotifySource.$(OBJEXT)
- -rm -f src/InputStream.$(OBJEXT)
- -rm -f src/Log.$(OBJEXT)
- -rm -f src/MixerControl.$(OBJEXT)
- -rm -f src/MixerType.$(OBJEXT)
- -rm -f src/OutputError.$(OBJEXT)
- -rm -f src/OutputFinish.$(OBJEXT)
- -rm -f src/OutputInit.$(OBJEXT)
- -rm -f src/OutputList.$(OBJEXT)
- -rm -f src/OutputPlugin.$(OBJEXT)
- -rm -f src/Page.$(OBJEXT)
- -rm -f src/PlaylistDatabase.$(OBJEXT)
- -rm -f src/PlaylistVector.$(OBJEXT)
- -rm -f src/ReplayGainInfo.$(OBJEXT)
- -rm -f src/Song.$(OBJEXT)
- -rm -f src/SongFilter.$(OBJEXT)
- -rm -f src/SongSave.$(OBJEXT)
- -rm -f src/SongSort.$(OBJEXT)
- -rm -f src/TagFile.$(OBJEXT)
- -rm -f src/TagSave.$(OBJEXT)
- -rm -f src/TextFile.$(OBJEXT)
- -rm -f src/TextInputStream.$(OBJEXT)
- -rm -f src/Timer.$(OBJEXT)
- -rm -f src/archive/libarchive_a-Bzip2ArchivePlugin.$(OBJEXT)
- -rm -f src/archive/libarchive_a-Iso9660ArchivePlugin.$(OBJEXT)
- -rm -f src/archive/libarchive_a-ZzipArchivePlugin.$(OBJEXT)
- -rm -f src/command/src_mpd-AllCommands.$(OBJEXT)
- -rm -f src/command/src_mpd-CommandError.$(OBJEXT)
- -rm -f src/command/src_mpd-CommandListBuilder.$(OBJEXT)
- -rm -f src/command/src_mpd-DatabaseCommands.$(OBJEXT)
- -rm -f src/command/src_mpd-FileCommands.$(OBJEXT)
- -rm -f src/command/src_mpd-MessageCommands.$(OBJEXT)
- -rm -f src/command/src_mpd-OtherCommands.$(OBJEXT)
- -rm -f src/command/src_mpd-OutputCommands.$(OBJEXT)
- -rm -f src/command/src_mpd-PlayerCommands.$(OBJEXT)
- -rm -f src/command/src_mpd-PlaylistCommands.$(OBJEXT)
- -rm -f src/command/src_mpd-QueueCommands.$(OBJEXT)
- -rm -f src/command/src_mpd-StickerCommands.$(OBJEXT)
- -rm -f src/cue/CueParser.$(OBJEXT)
- -rm -f src/cue/src_mpd-CueParser.$(OBJEXT)
- -rm -f src/db/ProxyDatabasePlugin.$(OBJEXT)
- -rm -f src/db/SimpleDatabasePlugin.$(OBJEXT)
- -rm -f src/decoder/FlacMetadata.$(OBJEXT)
- -rm -f src/decoder/libdecoder_plugins_a-AdPlugDecoderPlugin.$(OBJEXT)
- -rm -f src/decoder/libdecoder_plugins_a-AudiofileDecoderPlugin.$(OBJEXT)
- -rm -f src/decoder/libdecoder_plugins_a-DsdLib.$(OBJEXT)
- -rm -f src/decoder/libdecoder_plugins_a-DsdiffDecoderPlugin.$(OBJEXT)
- -rm -f src/decoder/libdecoder_plugins_a-DsfDecoderPlugin.$(OBJEXT)
- -rm -f src/decoder/libdecoder_plugins_a-FaadDecoderPlugin.$(OBJEXT)
- -rm -f src/decoder/libdecoder_plugins_a-FfmpegDecoderPlugin.$(OBJEXT)
- -rm -f src/decoder/libdecoder_plugins_a-FfmpegMetaData.$(OBJEXT)
- -rm -f src/decoder/libdecoder_plugins_a-FlacCommon.$(OBJEXT)
- -rm -f src/decoder/libdecoder_plugins_a-FlacDecoderPlugin.$(OBJEXT)
- -rm -f src/decoder/libdecoder_plugins_a-FlacDomain.$(OBJEXT)
- -rm -f src/decoder/libdecoder_plugins_a-FlacIOHandle.$(OBJEXT)
- -rm -f src/decoder/libdecoder_plugins_a-FlacInput.$(OBJEXT)
- -rm -f src/decoder/libdecoder_plugins_a-FlacMetadata.$(OBJEXT)
- -rm -f src/decoder/libdecoder_plugins_a-FlacPcm.$(OBJEXT)
- -rm -f src/decoder/libdecoder_plugins_a-FluidsynthDecoderPlugin.$(OBJEXT)
- -rm -f src/decoder/libdecoder_plugins_a-GmeDecoderPlugin.$(OBJEXT)
- -rm -f src/decoder/libdecoder_plugins_a-MadDecoderPlugin.$(OBJEXT)
- -rm -f src/decoder/libdecoder_plugins_a-MikmodDecoderPlugin.$(OBJEXT)
- -rm -f src/decoder/libdecoder_plugins_a-MpcdecDecoderPlugin.$(OBJEXT)
- -rm -f src/decoder/libdecoder_plugins_a-Mpg123DecoderPlugin.$(OBJEXT)
- -rm -f src/decoder/libdecoder_plugins_a-OggCodec.$(OBJEXT)
- -rm -f src/decoder/libdecoder_plugins_a-OggFind.$(OBJEXT)
- -rm -f src/decoder/libdecoder_plugins_a-OggUtil.$(OBJEXT)
- -rm -f src/decoder/libdecoder_plugins_a-OpusDecoderPlugin.$(OBJEXT)
- -rm -f src/decoder/libdecoder_plugins_a-OpusDomain.$(OBJEXT)
- -rm -f src/decoder/libdecoder_plugins_a-OpusHead.$(OBJEXT)
- -rm -f src/decoder/libdecoder_plugins_a-OpusTags.$(OBJEXT)
- -rm -f src/decoder/libdecoder_plugins_a-PcmDecoderPlugin.$(OBJEXT)
- -rm -f src/decoder/libdecoder_plugins_a-SidplayDecoderPlugin.$(OBJEXT)
- -rm -f src/decoder/libdecoder_plugins_a-SndfileDecoderPlugin.$(OBJEXT)
- -rm -f src/decoder/libdecoder_plugins_a-VorbisComments.$(OBJEXT)
- -rm -f src/decoder/libdecoder_plugins_a-VorbisDecoderPlugin.$(OBJEXT)
- -rm -f src/decoder/libdecoder_plugins_a-VorbisDomain.$(OBJEXT)
- -rm -f src/decoder/libdecoder_plugins_a-WavpackDecoderPlugin.$(OBJEXT)
- -rm -f src/decoder/libdecoder_plugins_a-WildmidiDecoderPlugin.$(OBJEXT)
- -rm -f src/decoder/libdecoder_plugins_a-XiphTags.$(OBJEXT)
- -rm -f src/decoder/libmodplug_decoder_plugin_a-ModplugDecoderPlugin.$(OBJEXT)
- -rm -f src/encoder/libencoder_plugins_a-FlacEncoderPlugin.$(OBJEXT)
- -rm -f src/encoder/libencoder_plugins_a-LameEncoderPlugin.$(OBJEXT)
- -rm -f src/encoder/libencoder_plugins_a-NullEncoderPlugin.$(OBJEXT)
- -rm -f src/encoder/libencoder_plugins_a-OggSerial.$(OBJEXT)
- -rm -f src/encoder/libencoder_plugins_a-OpusEncoderPlugin.$(OBJEXT)
- -rm -f src/encoder/libencoder_plugins_a-TwolameEncoderPlugin.$(OBJEXT)
- -rm -f src/encoder/libencoder_plugins_a-VorbisEncoderPlugin.$(OBJEXT)
- -rm -f src/encoder/libencoder_plugins_a-WaveEncoderPlugin.$(OBJEXT)
- -rm -f src/event/BufferedSocket.$(OBJEXT)
- -rm -f src/event/Call.$(OBJEXT)
- -rm -f src/event/DeferredMonitor.$(OBJEXT)
- -rm -f src/event/FullyBufferedSocket.$(OBJEXT)
- -rm -f src/event/IdleMonitor.$(OBJEXT)
- -rm -f src/event/Loop.$(OBJEXT)
- -rm -f src/event/MultiSocketMonitor.$(OBJEXT)
- -rm -f src/event/ServerSocket.$(OBJEXT)
- -rm -f src/event/SignalMonitor.$(OBJEXT)
- -rm -f src/event/SocketMonitor.$(OBJEXT)
- -rm -f src/event/TimeoutMonitor.$(OBJEXT)
- -rm -f src/filter/AutoConvertFilterPlugin.$(OBJEXT)
- -rm -f src/filter/ChainFilterPlugin.$(OBJEXT)
- -rm -f src/filter/ConvertFilterPlugin.$(OBJEXT)
- -rm -f src/filter/NormalizeFilterPlugin.$(OBJEXT)
- -rm -f src/filter/NullFilterPlugin.$(OBJEXT)
- -rm -f src/filter/ReplayGainFilterPlugin.$(OBJEXT)
- -rm -f src/filter/RouteFilterPlugin.$(OBJEXT)
- -rm -f src/filter/VolumeFilterPlugin.$(OBJEXT)
- -rm -f src/fs/AllocatedPath.$(OBJEXT)
- -rm -f src/fs/Charset.$(OBJEXT)
- -rm -f src/fs/Config.$(OBJEXT)
- -rm -f src/fs/Domain.$(OBJEXT)
- -rm -f src/fs/FileSystem.$(OBJEXT)
- -rm -f src/fs/Path.$(OBJEXT)
- -rm -f src/fs/Traits.$(OBJEXT)
- -rm -f src/input/libarchive_a-ArchiveInputPlugin.$(OBJEXT)
- -rm -f src/input/libinput_a-CdioParanoiaInputPlugin.$(OBJEXT)
- -rm -f src/input/libinput_a-CurlInputPlugin.$(OBJEXT)
- -rm -f src/input/libinput_a-DespotifyInputPlugin.$(OBJEXT)
- -rm -f src/input/libinput_a-FfmpegInputPlugin.$(OBJEXT)
- -rm -f src/input/libinput_a-FileInputPlugin.$(OBJEXT)
- -rm -f src/input/libinput_a-MmsInputPlugin.$(OBJEXT)
- -rm -f src/input/libinput_a-RewindInputPlugin.$(OBJEXT)
- -rm -f src/libarchive_a-ArchiveDomain.$(OBJEXT)
- -rm -f src/libarchive_a-ArchiveList.$(OBJEXT)
- -rm -f src/libarchive_a-ArchiveLookup.$(OBJEXT)
- -rm -f src/libarchive_a-ArchivePlugin.$(OBJEXT)
- -rm -f src/libdecoder_plugins_a-DecoderBuffer.$(OBJEXT)
- -rm -f src/libdecoder_plugins_a-DecoderList.$(OBJEXT)
- -rm -f src/libdecoder_plugins_a-DecoderPlugin.$(OBJEXT)
- -rm -f src/libencoder_plugins_a-EncoderList.$(OBJEXT)
- -rm -f src/libinput_a-IcyMetaDataParser.$(OBJEXT)
- -rm -f src/libinput_a-InputInit.$(OBJEXT)
- -rm -f src/libinput_a-InputRegistry.$(OBJEXT)
- -rm -f src/libinput_a-InputStream.$(OBJEXT)
- -rm -f src/liboutput_plugins_a-IcyMetaDataServer.$(OBJEXT)
- -rm -f src/libplaylist_plugins_a-MemorySongEnumerator.$(OBJEXT)
- -rm -f src/libplaylist_plugins_a-PlaylistRegistry.$(OBJEXT)
- -rm -f src/mixer/libmixer_plugins_a-AlsaMixerPlugin.$(OBJEXT)
- -rm -f src/mixer/libmixer_plugins_a-OssMixerPlugin.$(OBJEXT)
- -rm -f src/mixer/libmixer_plugins_a-PulseMixerPlugin.$(OBJEXT)
- -rm -f src/mixer/libmixer_plugins_a-RoarMixerPlugin.$(OBJEXT)
- -rm -f src/mixer/libmixer_plugins_a-SoftwareMixerPlugin.$(OBJEXT)
- -rm -f src/mixer/libmixer_plugins_a-WinmmMixerPlugin.$(OBJEXT)
- -rm -f src/output/liboutput_plugins_a-AlsaOutputPlugin.$(OBJEXT)
- -rm -f src/output/liboutput_plugins_a-AoOutputPlugin.$(OBJEXT)
- -rm -f src/output/liboutput_plugins_a-FifoOutputPlugin.$(OBJEXT)
- -rm -f src/output/liboutput_plugins_a-HttpdClient.$(OBJEXT)
- -rm -f src/output/liboutput_plugins_a-HttpdOutputPlugin.$(OBJEXT)
- -rm -f src/output/liboutput_plugins_a-JackOutputPlugin.$(OBJEXT)
- -rm -f src/output/liboutput_plugins_a-NullOutputPlugin.$(OBJEXT)
- -rm -f src/output/liboutput_plugins_a-OSXOutputPlugin.$(OBJEXT)
- -rm -f src/output/liboutput_plugins_a-OpenALOutputPlugin.$(OBJEXT)
- -rm -f src/output/liboutput_plugins_a-OssOutputPlugin.$(OBJEXT)
- -rm -f src/output/liboutput_plugins_a-PipeOutputPlugin.$(OBJEXT)
- -rm -f src/output/liboutput_plugins_a-PulseOutputPlugin.$(OBJEXT)
- -rm -f src/output/liboutput_plugins_a-RecorderOutputPlugin.$(OBJEXT)
- -rm -f src/output/liboutput_plugins_a-RoarOutputPlugin.$(OBJEXT)
- -rm -f src/output/liboutput_plugins_a-ShoutOutputPlugin.$(OBJEXT)
- -rm -f src/output/liboutput_plugins_a-SolarisOutputPlugin.$(OBJEXT)
- -rm -f src/output/liboutput_plugins_a-WinmmOutputPlugin.$(OBJEXT)
- -rm -f src/pcm/dsd2pcm/dsd2pcm.$(OBJEXT)
- -rm -f src/pcm/dsd2pcm/libpcm_a-dsd2pcm.$(OBJEXT)
- -rm -f src/pcm/dsd2pcm/main.$(OBJEXT)
- -rm -f src/pcm/dsd2pcm/noiseshape.$(OBJEXT)
- -rm -f src/pcm/libpcm_a-PcmBuffer.$(OBJEXT)
- -rm -f src/pcm/libpcm_a-PcmChannels.$(OBJEXT)
- -rm -f src/pcm/libpcm_a-PcmConvert.$(OBJEXT)
- -rm -f src/pcm/libpcm_a-PcmDither.$(OBJEXT)
- -rm -f src/pcm/libpcm_a-PcmDsd.$(OBJEXT)
- -rm -f src/pcm/libpcm_a-PcmDsdUsb.$(OBJEXT)
- -rm -f src/pcm/libpcm_a-PcmExport.$(OBJEXT)
- -rm -f src/pcm/libpcm_a-PcmFormat.$(OBJEXT)
- -rm -f src/pcm/libpcm_a-PcmMix.$(OBJEXT)
- -rm -f src/pcm/libpcm_a-PcmPack.$(OBJEXT)
- -rm -f src/pcm/libpcm_a-PcmResample.$(OBJEXT)
- -rm -f src/pcm/libpcm_a-PcmResampleFallback.$(OBJEXT)
- -rm -f src/pcm/libpcm_a-PcmResampleLibsamplerate.$(OBJEXT)
- -rm -f src/pcm/libpcm_a-PcmVolume.$(OBJEXT)
- -rm -f src/playlist/libplaylist_plugins_a-AsxPlaylistPlugin.$(OBJEXT)
- -rm -f src/playlist/libplaylist_plugins_a-CuePlaylistPlugin.$(OBJEXT)
- -rm -f src/playlist/libplaylist_plugins_a-DespotifyPlaylistPlugin.$(OBJEXT)
- -rm -f src/playlist/libplaylist_plugins_a-EmbeddedCuePlaylistPlugin.$(OBJEXT)
- -rm -f src/playlist/libplaylist_plugins_a-ExtM3uPlaylistPlugin.$(OBJEXT)
- -rm -f src/playlist/libplaylist_plugins_a-M3uPlaylistPlugin.$(OBJEXT)
- -rm -f src/playlist/libplaylist_plugins_a-PlsPlaylistPlugin.$(OBJEXT)
- -rm -f src/playlist/libplaylist_plugins_a-RssPlaylistPlugin.$(OBJEXT)
- -rm -f src/playlist/libplaylist_plugins_a-SoundCloudPlaylistPlugin.$(OBJEXT)
- -rm -f src/playlist/libplaylist_plugins_a-XspfPlaylistPlugin.$(OBJEXT)
- -rm -f src/protocol/Ack.$(OBJEXT)
- -rm -f src/protocol/src_mpd-Ack.$(OBJEXT)
- -rm -f src/protocol/src_mpd-ArgParser.$(OBJEXT)
- -rm -f src/protocol/src_mpd-Result.$(OBJEXT)
- -rm -f src/src_mpd-AudioConfig.$(OBJEXT)
- -rm -f src/src_mpd-AudioFormat.$(OBJEXT)
- -rm -f src/src_mpd-AudioParser.$(OBJEXT)
- -rm -f src/src_mpd-AvahiPoll.$(OBJEXT)
- -rm -f src/src_mpd-CheckAudioFormat.$(OBJEXT)
- -rm -f src/src_mpd-Client.$(OBJEXT)
- -rm -f src/src_mpd-ClientEvent.$(OBJEXT)
- -rm -f src/src_mpd-ClientExpire.$(OBJEXT)
- -rm -f src/src_mpd-ClientFile.$(OBJEXT)
- -rm -f src/src_mpd-ClientGlobal.$(OBJEXT)
- -rm -f src/src_mpd-ClientIdle.$(OBJEXT)
- -rm -f src/src_mpd-ClientList.$(OBJEXT)
- -rm -f src/src_mpd-ClientMessage.$(OBJEXT)
- -rm -f src/src_mpd-ClientNew.$(OBJEXT)
- -rm -f src/src_mpd-ClientProcess.$(OBJEXT)
- -rm -f src/src_mpd-ClientRead.$(OBJEXT)
- -rm -f src/src_mpd-ClientSubscribe.$(OBJEXT)
- -rm -f src/src_mpd-ClientWrite.$(OBJEXT)
- -rm -f src/src_mpd-CommandLine.$(OBJEXT)
- -rm -f src/src_mpd-CrossFade.$(OBJEXT)
- -rm -f src/src_mpd-Daemon.$(OBJEXT)
- -rm -f src/src_mpd-DatabaseError.$(OBJEXT)
- -rm -f src/src_mpd-DatabaseGlue.$(OBJEXT)
- -rm -f src/src_mpd-DatabaseLock.$(OBJEXT)
- -rm -f src/src_mpd-DatabasePlaylist.$(OBJEXT)
- -rm -f src/src_mpd-DatabasePrint.$(OBJEXT)
- -rm -f src/src_mpd-DatabaseQueue.$(OBJEXT)
- -rm -f src/src_mpd-DatabaseSave.$(OBJEXT)
- -rm -f src/src_mpd-DatabaseSelection.$(OBJEXT)
- -rm -f src/src_mpd-DecoderAPI.$(OBJEXT)
- -rm -f src/src_mpd-DecoderControl.$(OBJEXT)
- -rm -f src/src_mpd-DecoderError.$(OBJEXT)
- -rm -f src/src_mpd-DecoderInternal.$(OBJEXT)
- -rm -f src/src_mpd-DecoderPrint.$(OBJEXT)
- -rm -f src/src_mpd-DecoderThread.$(OBJEXT)
- -rm -f src/src_mpd-DespotifyUtils.$(OBJEXT)
- -rm -f src/src_mpd-Directory.$(OBJEXT)
- -rm -f src/src_mpd-DirectorySave.$(OBJEXT)
- -rm -f src/src_mpd-ExcludeList.$(OBJEXT)
- -rm -f src/src_mpd-FilterConfig.$(OBJEXT)
- -rm -f src/src_mpd-FilterPlugin.$(OBJEXT)
- -rm -f src/src_mpd-FilterRegistry.$(OBJEXT)
- -rm -f src/src_mpd-GlobalEvents.$(OBJEXT)
- -rm -f src/src_mpd-IOThread.$(OBJEXT)
- -rm -f src/src_mpd-Idle.$(OBJEXT)
- -rm -f src/src_mpd-InotifyDomain.$(OBJEXT)
- -rm -f src/src_mpd-InotifyQueue.$(OBJEXT)
- -rm -f src/src_mpd-InotifySource.$(OBJEXT)
- -rm -f src/src_mpd-InotifyUpdate.$(OBJEXT)
- -rm -f src/src_mpd-Instance.$(OBJEXT)
- -rm -f src/src_mpd-Listen.$(OBJEXT)
- -rm -f src/src_mpd-Log.$(OBJEXT)
- -rm -f src/src_mpd-LogInit.$(OBJEXT)
- -rm -f src/src_mpd-Main.$(OBJEXT)
- -rm -f src/src_mpd-Mapper.$(OBJEXT)
- -rm -f src/src_mpd-MixerAll.$(OBJEXT)
- -rm -f src/src_mpd-MixerControl.$(OBJEXT)
- -rm -f src/src_mpd-MixerType.$(OBJEXT)
- -rm -f src/src_mpd-MusicBuffer.$(OBJEXT)
- -rm -f src/src_mpd-MusicChunk.$(OBJEXT)
- -rm -f src/src_mpd-MusicPipe.$(OBJEXT)
- -rm -f src/src_mpd-OutputAll.$(OBJEXT)
- -rm -f src/src_mpd-OutputCommand.$(OBJEXT)
- -rm -f src/src_mpd-OutputControl.$(OBJEXT)
- -rm -f src/src_mpd-OutputError.$(OBJEXT)
- -rm -f src/src_mpd-OutputFinish.$(OBJEXT)
- -rm -f src/src_mpd-OutputInit.$(OBJEXT)
- -rm -f src/src_mpd-OutputList.$(OBJEXT)
- -rm -f src/src_mpd-OutputPlugin.$(OBJEXT)
- -rm -f src/src_mpd-OutputPrint.$(OBJEXT)
- -rm -f src/src_mpd-OutputState.$(OBJEXT)
- -rm -f src/src_mpd-OutputThread.$(OBJEXT)
- -rm -f src/src_mpd-Page.$(OBJEXT)
- -rm -f src/src_mpd-Partition.$(OBJEXT)
- -rm -f src/src_mpd-Permission.$(OBJEXT)
- -rm -f src/src_mpd-PlayerControl.$(OBJEXT)
- -rm -f src/src_mpd-PlayerThread.$(OBJEXT)
- -rm -f src/src_mpd-Playlist.$(OBJEXT)
- -rm -f src/src_mpd-PlaylistAny.$(OBJEXT)
- -rm -f src/src_mpd-PlaylistControl.$(OBJEXT)
- -rm -f src/src_mpd-PlaylistDatabase.$(OBJEXT)
- -rm -f src/src_mpd-PlaylistEdit.$(OBJEXT)
- -rm -f src/src_mpd-PlaylistError.$(OBJEXT)
- -rm -f src/src_mpd-PlaylistFile.$(OBJEXT)
- -rm -f src/src_mpd-PlaylistGlobal.$(OBJEXT)
- -rm -f src/src_mpd-PlaylistMapper.$(OBJEXT)
- -rm -f src/src_mpd-PlaylistPrint.$(OBJEXT)
- -rm -f src/src_mpd-PlaylistQueue.$(OBJEXT)
- -rm -f src/src_mpd-PlaylistSave.$(OBJEXT)
- -rm -f src/src_mpd-PlaylistSong.$(OBJEXT)
- -rm -f src/src_mpd-PlaylistState.$(OBJEXT)
- -rm -f src/src_mpd-PlaylistUpdate.$(OBJEXT)
- -rm -f src/src_mpd-PlaylistVector.$(OBJEXT)
- -rm -f src/src_mpd-Queue.$(OBJEXT)
- -rm -f src/src_mpd-QueuePrint.$(OBJEXT)
- -rm -f src/src_mpd-QueueSave.$(OBJEXT)
- -rm -f src/src_mpd-ReplayGainConfig.$(OBJEXT)
- -rm -f src/src_mpd-ReplayGainInfo.$(OBJEXT)
- -rm -f src/src_mpd-SignalHandlers.$(OBJEXT)
- -rm -f src/src_mpd-Song.$(OBJEXT)
- -rm -f src/src_mpd-SongFilter.$(OBJEXT)
- -rm -f src/src_mpd-SongPrint.$(OBJEXT)
- -rm -f src/src_mpd-SongSave.$(OBJEXT)
- -rm -f src/src_mpd-SongSort.$(OBJEXT)
- -rm -f src/src_mpd-SongSticker.$(OBJEXT)
- -rm -f src/src_mpd-SongUpdate.$(OBJEXT)
- -rm -f src/src_mpd-StateFile.$(OBJEXT)
- -rm -f src/src_mpd-Stats.$(OBJEXT)
- -rm -f src/src_mpd-StickerDatabase.$(OBJEXT)
- -rm -f src/src_mpd-StickerPrint.$(OBJEXT)
- -rm -f src/src_mpd-TagFile.$(OBJEXT)
- -rm -f src/src_mpd-TagPrint.$(OBJEXT)
- -rm -f src/src_mpd-TagSave.$(OBJEXT)
- -rm -f src/src_mpd-TextFile.$(OBJEXT)
- -rm -f src/src_mpd-TextInputStream.$(OBJEXT)
- -rm -f src/src_mpd-TimePrint.$(OBJEXT)
- -rm -f src/src_mpd-Timer.$(OBJEXT)
- -rm -f src/src_mpd-UpdateArchive.$(OBJEXT)
- -rm -f src/src_mpd-UpdateContainer.$(OBJEXT)
- -rm -f src/src_mpd-UpdateDatabase.$(OBJEXT)
- -rm -f src/src_mpd-UpdateDomain.$(OBJEXT)
- -rm -f src/src_mpd-UpdateGlue.$(OBJEXT)
- -rm -f src/src_mpd-UpdateIO.$(OBJEXT)
- -rm -f src/src_mpd-UpdateQueue.$(OBJEXT)
- -rm -f src/src_mpd-UpdateRemove.$(OBJEXT)
- -rm -f src/src_mpd-UpdateSong.$(OBJEXT)
- -rm -f src/src_mpd-UpdateWalk.$(OBJEXT)
- -rm -f src/src_mpd-Volume.$(OBJEXT)
- -rm -f src/src_mpd-Win32Main.$(OBJEXT)
- -rm -f src/src_mpd-ZeroconfAvahi.$(OBJEXT)
- -rm -f src/src_mpd-ZeroconfBonjour.$(OBJEXT)
- -rm -f src/src_mpd-ZeroconfGlue.$(OBJEXT)
- -rm -f src/src_mpd-ls.$(OBJEXT)
- -rm -f src/src_mpd-notify.$(OBJEXT)
- -rm -f src/system/Clock.$(OBJEXT)
- -rm -f src/system/EPollFD.$(OBJEXT)
- -rm -f src/system/EventFD.$(OBJEXT)
- -rm -f src/system/EventPipe.$(OBJEXT)
- -rm -f src/system/FatalError.$(OBJEXT)
- -rm -f src/system/Resolver.$(OBJEXT)
- -rm -f src/system/SignalFD.$(OBJEXT)
- -rm -f src/system/SocketError.$(OBJEXT)
- -rm -f src/system/SocketUtil.$(OBJEXT)
- -rm -f src/system/fd_util.$(OBJEXT)
- -rm -f src/tag/libtag_a-Aiff.$(OBJEXT)
- -rm -f src/tag/libtag_a-ApeLoader.$(OBJEXT)
- -rm -f src/tag/libtag_a-ApeReplayGain.$(OBJEXT)
- -rm -f src/tag/libtag_a-ApeTag.$(OBJEXT)
- -rm -f src/tag/libtag_a-Riff.$(OBJEXT)
- -rm -f src/tag/libtag_a-Tag.$(OBJEXT)
- -rm -f src/tag/libtag_a-TagBuilder.$(OBJEXT)
- -rm -f src/tag/libtag_a-TagConfig.$(OBJEXT)
- -rm -f src/tag/libtag_a-TagHandler.$(OBJEXT)
- -rm -f src/tag/libtag_a-TagId3.$(OBJEXT)
- -rm -f src/tag/libtag_a-TagNames.$(OBJEXT)
- -rm -f src/tag/libtag_a-TagPool.$(OBJEXT)
- -rm -f src/tag/libtag_a-TagRva2.$(OBJEXT)
- -rm -f src/tag/libtag_a-TagSettings.$(OBJEXT)
- -rm -f src/tag/libtag_a-TagString.$(OBJEXT)
- -rm -f src/tag/libtag_a-TagTable.$(OBJEXT)
- -rm -f src/test_run_avahi-AvahiPoll.$(OBJEXT)
- -rm -f src/test_run_avahi-Log.$(OBJEXT)
- -rm -f src/test_run_avahi-ZeroconfAvahi.$(OBJEXT)
- -rm -f src/test_test_archive-Log.$(OBJEXT)
- -rm -f src/test_test_mixramp-Log.$(OBJEXT)
- -rm -f src/test_test_queue_priority-Queue.$(OBJEXT)
- -rm -f src/test_test_vorbis_encoder-AudioFormat.$(OBJEXT)
- -rm -f src/test_test_vorbis_encoder-AudioParser.$(OBJEXT)
- -rm -f src/test_test_vorbis_encoder-CheckAudioFormat.$(OBJEXT)
- -rm -f src/test_test_vorbis_encoder-Log.$(OBJEXT)
- -rm -f src/thread/Thread.$(OBJEXT)
- -rm -f src/util/ByteReverse.$(OBJEXT)
- -rm -f src/util/Error.$(OBJEXT)
- -rm -f src/util/FormatString.$(OBJEXT)
- -rm -f src/util/HugeAllocator.$(OBJEXT)
- -rm -f src/util/LazyRandomEngine.$(OBJEXT)
- -rm -f src/util/PeakBuffer.$(OBJEXT)
- -rm -f src/util/StringUtil.$(OBJEXT)
- -rm -f src/util/Tokenizer.$(OBJEXT)
- -rm -f src/util/UriUtil.$(OBJEXT)
- -rm -f src/util/bit_reverse.$(OBJEXT)
- -rm -f src/util/fifo_buffer.$(OBJEXT)
- -rm -f src/util/growing_fifo.$(OBJEXT)
- -rm -f src/util/list_sort.$(OBJEXT)
- -rm -f test/DumpDatabase.$(OBJEXT)
- -rm -f test/FakeReplayGainConfig.$(OBJEXT)
- -rm -f test/ShutdownHandler.$(OBJEXT)
- -rm -f test/dump_playlist.$(OBJEXT)
- -rm -f test/dump_rva2.$(OBJEXT)
- -rm -f test/dump_text_file.$(OBJEXT)
- -rm -f test/read_conf.$(OBJEXT)
- -rm -f test/read_mixer.$(OBJEXT)
- -rm -f test/read_tags.$(OBJEXT)
- -rm -f test/run_convert.$(OBJEXT)
- -rm -f test/run_decoder.$(OBJEXT)
- -rm -f test/run_encoder.$(OBJEXT)
- -rm -f test/run_filter.$(OBJEXT)
- -rm -f test/run_inotify.$(OBJEXT)
- -rm -f test/run_input.$(OBJEXT)
- -rm -f test/run_normalize.$(OBJEXT)
- -rm -f test/run_output.$(OBJEXT)
- -rm -f test/run_resolver.$(OBJEXT)
- -rm -f test/software_volume.$(OBJEXT)
- -rm -f test/test_run_avahi-ShutdownHandler.$(OBJEXT)
- -rm -f test/test_run_avahi-run_avahi.$(OBJEXT)
- -rm -f test/test_test_archive-test_archive.$(OBJEXT)
- -rm -f test/test_test_byte_reverse-test_byte_reverse.$(OBJEXT)
- -rm -f test/test_test_mixramp-test_mixramp.$(OBJEXT)
- -rm -f test/test_test_pcm-test_pcm_channels.$(OBJEXT)
- -rm -f test/test_test_pcm-test_pcm_dither.$(OBJEXT)
- -rm -f test/test_test_pcm-test_pcm_format.$(OBJEXT)
- -rm -f test/test_test_pcm-test_pcm_main.$(OBJEXT)
- -rm -f test/test_test_pcm-test_pcm_mix.$(OBJEXT)
- -rm -f test/test_test_pcm-test_pcm_pack.$(OBJEXT)
- -rm -f test/test_test_pcm-test_pcm_volume.$(OBJEXT)
- -rm -f test/test_test_queue_priority-test_queue_priority.$(OBJEXT)
- -rm -f test/test_test_util-test_util.$(OBJEXT)
- -rm -f test/test_test_vorbis_encoder-test_vorbis_encoder.$(OBJEXT)
- -rm -f test/visit_archive.$(OBJEXT)
+ -rm -f src/*.$(OBJEXT)
+ -rm -f src/AudioCompress/*.$(OBJEXT)
+ -rm -f src/archive/*.$(OBJEXT)
+ -rm -f src/command/*.$(OBJEXT)
+ -rm -f src/cue/*.$(OBJEXT)
+ -rm -f src/db/*.$(OBJEXT)
+ -rm -f src/decoder/*.$(OBJEXT)
+ -rm -f src/encoder/*.$(OBJEXT)
+ -rm -f src/event/*.$(OBJEXT)
+ -rm -f src/filter/*.$(OBJEXT)
+ -rm -f src/fs/*.$(OBJEXT)
+ -rm -f src/input/*.$(OBJEXT)
+ -rm -f src/mixer/*.$(OBJEXT)
+ -rm -f src/output/*.$(OBJEXT)
+ -rm -f src/pcm/*.$(OBJEXT)
+ -rm -f src/pcm/dsd2pcm/*.$(OBJEXT)
+ -rm -f src/playlist/*.$(OBJEXT)
+ -rm -f src/protocol/*.$(OBJEXT)
+ -rm -f src/system/*.$(OBJEXT)
+ -rm -f src/tag/*.$(OBJEXT)
+ -rm -f src/thread/*.$(OBJEXT)
+ -rm -f src/util/*.$(OBJEXT)
+ -rm -f test/*.$(OBJEXT)
distclean-compile:
-rm -f *.tab.c
@@ -9831,26 +9698,15 @@ uninstall-userDATA:
files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
dir='$(DESTDIR)$(userdir)'; $(am__uninstall_files_from_dir)
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
- mkid -fID $$unique
-tags: TAGS
-
-TAGS: $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
+ID: $(am__tagged_files)
+ $(am__define_uniq_tagged_files); mkid -fID $$unique
+tags: tags-am
+TAGS: tags
+
+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
set x; \
here=`pwd`; \
- list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(am__define_uniq_tagged_files); \
shift; \
if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
@@ -9862,15 +9718,11 @@ TAGS: $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
$$unique; \
fi; \
fi
-ctags: CTAGS
-CTAGS: $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
- list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ctags: ctags-am
+
+CTAGS: ctags
+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+ $(am__define_uniq_tagged_files); \
test -z "$(CTAGS_ARGS)$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$unique
@@ -9879,117 +9731,252 @@ GTAGS:
here=`$(am__cd) $(top_builddir) && pwd` \
&& $(am__cd) $(top_srcdir) \
&& gtags -i $(GTAGS_ARGS) "$$here"
+cscope: cscope.files
+ test ! -s cscope.files \
+ || $(CSCOPE) -b -q $(AM_CSCOPEFLAGS) $(CSCOPEFLAGS) -i cscope.files $(CSCOPE_ARGS)
+clean-cscope:
+ -rm -f cscope.files
+cscope.files: clean-cscope cscopelist
+cscopelist: cscopelist-am
+
+cscopelist-am: $(am__tagged_files)
+ list='$(am__tagged_files)'; \
+ case "$(srcdir)" in \
+ [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+ *) sdir=$(subdir)/$(srcdir) ;; \
+ esac; \
+ for i in $$list; do \
+ if test -f "$$i"; then \
+ echo "$(subdir)/$$i"; \
+ else \
+ echo "$$sdir/$$i"; \
+ fi; \
+ done >> $(top_builddir)/cscope.files
distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+ -rm -f cscope.out cscope.in.out cscope.po.out cscope.files
+
+# Recover from deleted '.trs' file; this should ensure that
+# "rm -f foo.log; make foo.trs" re-run 'foo.test', and re-create
+# both 'foo.log' and 'foo.trs'. Break the recipe in two subshells
+# to avoid problems with "make -n".
+.log.trs:
+ rm -f $< $@
+ $(MAKE) $(AM_MAKEFLAGS) $<
+
+# Leading 'am--fnord' is there to ensure the list of targets does not
+# expand to empty, as could happen e.g. with make check TESTS=''.
+am--fnord $(TEST_LOGS) $(TEST_LOGS:.log=.trs): $(am__force_recheck)
+am--force-recheck:
+ @:
-check-TESTS: $(TESTS)
- @failed=0; all=0; xfail=0; xpass=0; skip=0; \
- srcdir=$(srcdir); export srcdir; \
- list=' $(TESTS) '; \
- $(am__tty_colors); \
- if test -n "$$list"; then \
- for tst in $$list; do \
- if test -f ./$$tst; then dir=./; \
- elif test -f $$tst; then dir=; \
- else dir="$(srcdir)/"; fi; \
- if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \
- all=`expr $$all + 1`; \
- case " $(XFAIL_TESTS) " in \
- *[\ \ ]$$tst[\ \ ]*) \
- xpass=`expr $$xpass + 1`; \
- failed=`expr $$failed + 1`; \
- col=$$red; res=XPASS; \
- ;; \
- *) \
- col=$$grn; res=PASS; \
- ;; \
- esac; \
- elif test $$? -ne 77; then \
- all=`expr $$all + 1`; \
- case " $(XFAIL_TESTS) " in \
- *[\ \ ]$$tst[\ \ ]*) \
- xfail=`expr $$xfail + 1`; \
- col=$$lgn; res=XFAIL; \
- ;; \
- *) \
- failed=`expr $$failed + 1`; \
- col=$$red; res=FAIL; \
- ;; \
- esac; \
- else \
- skip=`expr $$skip + 1`; \
- col=$$blu; res=SKIP; \
- fi; \
- echo "$${col}$$res$${std}: $$tst"; \
- done; \
- if test "$$all" -eq 1; then \
- tests="test"; \
- All=""; \
- else \
- tests="tests"; \
- All="All "; \
+$(TEST_SUITE_LOG): $(TEST_LOGS)
+ @$(am__set_TESTS_bases); \
+ am__f_ok () { test -f "$$1" && test -r "$$1"; }; \
+ redo_bases=`for i in $$bases; do \
+ am__f_ok $$i.trs && am__f_ok $$i.log || echo $$i; \
+ done`; \
+ if test -n "$$redo_bases"; then \
+ redo_logs=`for i in $$redo_bases; do echo $$i.log; done`; \
+ redo_results=`for i in $$redo_bases; do echo $$i.trs; done`; \
+ if $(am__make_dryrun); then :; else \
+ rm -f $$redo_logs && rm -f $$redo_results || exit 1; \
fi; \
- if test "$$failed" -eq 0; then \
- if test "$$xfail" -eq 0; then \
- banner="$$All$$all $$tests passed"; \
- else \
- if test "$$xfail" -eq 1; then failures=failure; else failures=failures; fi; \
- banner="$$All$$all $$tests behaved as expected ($$xfail expected $$failures)"; \
- fi; \
- else \
- if test "$$xpass" -eq 0; then \
- banner="$$failed of $$all $$tests failed"; \
+ fi; \
+ if test -n "$$am__remaking_logs"; then \
+ echo "fatal: making $(TEST_SUITE_LOG): possible infinite" \
+ "recursion detected" >&2; \
+ else \
+ am__remaking_logs=yes $(MAKE) $(AM_MAKEFLAGS) $$redo_logs; \
+ fi; \
+ if $(am__make_dryrun); then :; else \
+ st=0; \
+ errmsg="fatal: making $(TEST_SUITE_LOG): failed to create"; \
+ for i in $$redo_bases; do \
+ test -f $$i.trs && test -r $$i.trs \
+ || { echo "$$errmsg $$i.trs" >&2; st=1; }; \
+ test -f $$i.log && test -r $$i.log \
+ || { echo "$$errmsg $$i.log" >&2; st=1; }; \
+ done; \
+ test $$st -eq 0 || exit 1; \
+ fi
+ @$(am__sh_e_setup); $(am__tty_colors); $(am__set_TESTS_bases); \
+ ws='[ ]'; \
+ results=`for b in $$bases; do echo $$b.trs; done`; \
+ test -n "$$results" || results=/dev/null; \
+ all=` grep "^$$ws*:test-result:" $$results | wc -l`; \
+ pass=` grep "^$$ws*:test-result:$$ws*PASS" $$results | wc -l`; \
+ fail=` grep "^$$ws*:test-result:$$ws*FAIL" $$results | wc -l`; \
+ skip=` grep "^$$ws*:test-result:$$ws*SKIP" $$results | wc -l`; \
+ xfail=`grep "^$$ws*:test-result:$$ws*XFAIL" $$results | wc -l`; \
+ xpass=`grep "^$$ws*:test-result:$$ws*XPASS" $$results | wc -l`; \
+ error=`grep "^$$ws*:test-result:$$ws*ERROR" $$results | wc -l`; \
+ if test `expr $$fail + $$xpass + $$error` -eq 0; then \
+ success=true; \
+ else \
+ success=false; \
+ fi; \
+ br='==================='; br=$$br$$br$$br$$br; \
+ result_count () \
+ { \
+ if test x"$$1" = x"--maybe-color"; then \
+ maybe_colorize=yes; \
+ elif test x"$$1" = x"--no-color"; then \
+ maybe_colorize=no; \
else \
- if test "$$xpass" -eq 1; then passes=pass; else passes=passes; fi; \
- banner="$$failed of $$all $$tests did not behave as expected ($$xpass unexpected $$passes)"; \
+ echo "$@: invalid 'result_count' usage" >&2; exit 4; \
fi; \
- fi; \
- dashes="$$banner"; \
- skipped=""; \
- if test "$$skip" -ne 0; then \
- if test "$$skip" -eq 1; then \
- skipped="($$skip test was not run)"; \
+ shift; \
+ desc=$$1 count=$$2; \
+ if test $$maybe_colorize = yes && test $$count -gt 0; then \
+ color_start=$$3 color_end=$$std; \
else \
- skipped="($$skip tests were not run)"; \
+ color_start= color_end=; \
fi; \
- test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \
- dashes="$$skipped"; \
- fi; \
- report=""; \
- if test "$$failed" -ne 0 && test -n "$(PACKAGE_BUGREPORT)"; then \
- report="Please report to $(PACKAGE_BUGREPORT)"; \
- test `echo "$$report" | wc -c` -le `echo "$$banner" | wc -c` || \
- dashes="$$report"; \
- fi; \
- dashes=`echo "$$dashes" | sed s/./=/g`; \
- if test "$$failed" -eq 0; then \
- col="$$grn"; \
- else \
- col="$$red"; \
- fi; \
- 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
+ echo "$${color_start}# $$desc $$count$${color_end}"; \
+ }; \
+ create_testsuite_report () \
+ { \
+ result_count $$1 "TOTAL:" $$all "$$brg"; \
+ result_count $$1 "PASS: " $$pass "$$grn"; \
+ result_count $$1 "SKIP: " $$skip "$$blu"; \
+ result_count $$1 "XFAIL:" $$xfail "$$lgn"; \
+ result_count $$1 "FAIL: " $$fail "$$red"; \
+ result_count $$1 "XPASS:" $$xpass "$$red"; \
+ result_count $$1 "ERROR:" $$error "$$mgn"; \
+ }; \
+ { \
+ echo "$(PACKAGE_STRING): $(subdir)/$(TEST_SUITE_LOG)" | \
+ $(am__rst_title); \
+ create_testsuite_report --no-color; \
+ echo; \
+ echo ".. contents:: :depth: 2"; \
+ echo; \
+ for b in $$bases; do echo $$b; done \
+ | $(am__create_global_log); \
+ } >$(TEST_SUITE_LOG).tmp || exit 1; \
+ mv $(TEST_SUITE_LOG).tmp $(TEST_SUITE_LOG); \
+ if $$success; then \
+ col="$$grn"; \
+ else \
+ col="$$red"; \
+ test x"$$VERBOSE" = x || cat $(TEST_SUITE_LOG); \
+ fi; \
+ echo "$${col}$$br$${std}"; \
+ echo "$${col}Testsuite summary for $(PACKAGE_STRING)$${std}"; \
+ echo "$${col}$$br$${std}"; \
+ create_testsuite_report --maybe-color; \
+ echo "$$col$$br$$std"; \
+ if $$success; then :; else \
+ echo "$${col}See $(subdir)/$(TEST_SUITE_LOG)$${std}"; \
+ if test -n "$(PACKAGE_BUGREPORT)"; then \
+ echo "$${col}Please report to $(PACKAGE_BUGREPORT)$${std}"; \
+ fi; \
+ echo "$$col$$br$$std"; \
+ fi; \
+ $$success || exit 1
+
+check-TESTS:
+ @list='$(RECHECK_LOGS)'; test -z "$$list" || rm -f $$list
+ @list='$(RECHECK_LOGS:.log=.trs)'; test -z "$$list" || rm -f $$list
+ @test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG)
+ @set +e; $(am__set_TESTS_bases); \
+ log_list=`for i in $$bases; do echo $$i.log; done`; \
+ trs_list=`for i in $$bases; do echo $$i.trs; done`; \
+ log_list=`echo $$log_list`; trs_list=`echo $$trs_list`; \
+ $(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) TEST_LOGS="$$log_list"; \
+ exit $$?;
+recheck: all
+ @test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG)
+ @set +e; $(am__set_TESTS_bases); \
+ bases=`for i in $$bases; do echo $$i; done \
+ | $(am__list_recheck_tests)` || exit 1; \
+ log_list=`for i in $$bases; do echo $$i.log; done`; \
+ log_list=`echo $$log_list`; \
+ $(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) \
+ am__force_recheck=am--force-recheck \
+ TEST_LOGS="$$log_list"; \
+ exit $$?
+test/test_util.log: test/test_util$(EXEEXT)
+ @p='test/test_util$(EXEEXT)'; \
+ b='test/test_util'; \
+ $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+ --log-file $$b.log --trs-file $$b.trs \
+ $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+ "$$tst" $(AM_TESTS_FD_REDIRECT)
+test/test_byte_reverse.log: test/test_byte_reverse$(EXEEXT)
+ @p='test/test_byte_reverse$(EXEEXT)'; \
+ b='test/test_byte_reverse'; \
+ $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+ --log-file $$b.log --trs-file $$b.trs \
+ $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+ "$$tst" $(AM_TESTS_FD_REDIRECT)
+test/test_mixramp.log: test/test_mixramp$(EXEEXT)
+ @p='test/test_mixramp$(EXEEXT)'; \
+ b='test/test_mixramp'; \
+ $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+ --log-file $$b.log --trs-file $$b.trs \
+ $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+ "$$tst" $(AM_TESTS_FD_REDIRECT)
+test/test_pcm.log: test/test_pcm$(EXEEXT)
+ @p='test/test_pcm$(EXEEXT)'; \
+ b='test/test_pcm'; \
+ $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+ --log-file $$b.log --trs-file $$b.trs \
+ $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+ "$$tst" $(AM_TESTS_FD_REDIRECT)
+test/test_queue_priority.log: test/test_queue_priority$(EXEEXT)
+ @p='test/test_queue_priority$(EXEEXT)'; \
+ b='test/test_queue_priority'; \
+ $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+ --log-file $$b.log --trs-file $$b.trs \
+ $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+ "$$tst" $(AM_TESTS_FD_REDIRECT)
+test/test_archive.log: test/test_archive$(EXEEXT)
+ @p='test/test_archive$(EXEEXT)'; \
+ b='test/test_archive'; \
+ $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+ --log-file $$b.log --trs-file $$b.trs \
+ $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+ "$$tst" $(AM_TESTS_FD_REDIRECT)
+test/test_archive_bzip2.sh.log: test/test_archive_bzip2.sh
+ @p='test/test_archive_bzip2.sh'; \
+ b='test/test_archive_bzip2.sh'; \
+ $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+ --log-file $$b.log --trs-file $$b.trs \
+ $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+ "$$tst" $(AM_TESTS_FD_REDIRECT)
+test/test_archive_zzip.sh.log: test/test_archive_zzip.sh
+ @p='test/test_archive_zzip.sh'; \
+ b='test/test_archive_zzip.sh'; \
+ $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+ --log-file $$b.log --trs-file $$b.trs \
+ $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+ "$$tst" $(AM_TESTS_FD_REDIRECT)
+test/test_archive_iso9660.sh.log: test/test_archive_iso9660.sh
+ @p='test/test_archive_iso9660.sh'; \
+ b='test/test_archive_iso9660.sh'; \
+ $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+ --log-file $$b.log --trs-file $$b.trs \
+ $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+ "$$tst" $(AM_TESTS_FD_REDIRECT)
+.test.log:
+ @p='$<'; \
+ $(am__set_b); \
+ $(am__check_pre) $(TEST_LOG_DRIVER) --test-name "$$f" \
+ --log-file $$b.log --trs-file $$b.trs \
+ $(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) -- $(TEST_LOG_COMPILE) \
+ "$$tst" $(AM_TESTS_FD_REDIRECT)
+ at am__EXEEXT_TRUE@.test$(EXEEXT).log:
+ at am__EXEEXT_TRUE@ @p='$<'; \
+ at am__EXEEXT_TRUE@ $(am__set_b); \
+ at am__EXEEXT_TRUE@ $(am__check_pre) $(TEST_LOG_DRIVER) --test-name "$$f" \
+ at am__EXEEXT_TRUE@ --log-file $$b.log --trs-file $$b.trs \
+ at am__EXEEXT_TRUE@ $(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) -- $(TEST_LOG_COMPILE) \
+ at am__EXEEXT_TRUE@ "$$tst" $(AM_TESTS_FD_REDIRECT)
distdir: $(DISTFILES)
- @list='$(MANS)'; if test -n "$$list"; then \
- list=`for p in $$list; do \
- if test -f $$p; then d=; else d="$(srcdir)/"; fi; \
- if test -f "$$d$$p"; then echo "$$d$$p"; else :; fi; done`; \
- if test -n "$$list" && \
- grep 'ab help2man is required to generate this page' $$list >/dev/null; then \
- echo "error: found man pages containing the \`missing help2man' replacement text:" >&2; \
- grep -l 'ab help2man is required to generate this page' $$list | sed 's/^/ /' >&2; \
- echo " to fix them, install help2man, remove and regenerate the man pages;" >&2; \
- echo " typically \`make maintainer-clean' will remove them" >&2; \
- exit 1; \
- else :; fi; \
- else :; fi
$(am__remove_distdir)
test -d "$(distdir)" || mkdir "$(distdir)"
@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
@@ -10030,40 +10017,41 @@ distdir: $(DISTFILES)
|| chmod -R a+r "$(distdir)"
dist-gzip: distdir
tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
- $(am__remove_distdir)
+ $(am__post_remove_distdir)
dist-bzip2: distdir
tardir=$(distdir) && $(am__tar) | BZIP2=$${BZIP2--9} bzip2 -c >$(distdir).tar.bz2
- $(am__remove_distdir)
+ $(am__post_remove_distdir)
dist-lzip: distdir
tardir=$(distdir) && $(am__tar) | lzip -c $${LZIP_OPT--9} >$(distdir).tar.lz
- $(am__remove_distdir)
-
-dist-lzma: distdir
- tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma
- $(am__remove_distdir)
+ $(am__post_remove_distdir)
dist-xz: distdir
tardir=$(distdir) && $(am__tar) | XZ_OPT=$${XZ_OPT--e} xz -c >$(distdir).tar.xz
- $(am__remove_distdir)
+ $(am__post_remove_distdir)
dist-tarZ: distdir
+ @echo WARNING: "Support for shar distribution archives is" \
+ "deprecated." >&2
+ @echo WARNING: "It will be removed altogether in Automake 2.0" >&2
tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
- $(am__remove_distdir)
+ $(am__post_remove_distdir)
dist-shar: distdir
+ @echo WARNING: "Support for distribution archives compressed with" \
+ "legacy program 'compress' is deprecated." >&2
+ @echo WARNING: "It will be removed altogether in Automake 2.0" >&2
shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz
- $(am__remove_distdir)
+ $(am__post_remove_distdir)
dist-zip: distdir
-rm -f $(distdir).zip
zip -rq $(distdir).zip $(distdir)
- $(am__remove_distdir)
+ $(am__post_remove_distdir)
-dist dist-all: distdir
- tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
- tardir=$(distdir) && $(am__tar) | XZ_OPT=$${XZ_OPT--e} xz -c >$(distdir).tar.xz
- $(am__remove_distdir)
+dist dist-all:
+ $(MAKE) $(AM_MAKEFLAGS) $(DIST_TARGETS) am__post_remove_distdir='@:'
+ $(am__post_remove_distdir)
# This target untars the dist file and tries a VPATH configuration. Then
# it guarantees that the distribution is self-contained by making another
@@ -10074,8 +10062,6 @@ distcheck: dist
GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\
*.tar.bz2*) \
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*) \
@@ -10087,9 +10073,9 @@ distcheck: dist
*.zip*) \
unzip $(distdir).zip ;;\
esac
- chmod -R a-w $(distdir); chmod u+w $(distdir)
- mkdir $(distdir)/_build
- mkdir $(distdir)/_inst
+ chmod -R a-w $(distdir)
+ chmod u+w $(distdir)
+ mkdir $(distdir)/_build $(distdir)/_inst
chmod a-w $(distdir)
test -d $(distdir)/_build || exit 0; \
dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \
@@ -10121,7 +10107,7 @@ distcheck: dist
&& $(MAKE) $(AM_MAKEFLAGS) distcleancheck \
&& cd "$$am__cwd" \
|| exit 1
- $(am__remove_distdir)
+ $(am__post_remove_distdir)
@(echo "$(distdir) archives ready for distribution: "; \
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'
@@ -10181,6 +10167,9 @@ install-strip:
"INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
fi
mostlyclean-generic:
+ -test -z "$(TEST_LOGS)" || rm -f $(TEST_LOGS)
+ -test -z "$(TEST_LOGS:.log=.trs)" || rm -f $(TEST_LOGS:.log=.trs)
+ -test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG)
clean-generic:
@@ -10237,9 +10226,9 @@ distclean-generic:
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
@echo "it deletes files that may require special tools to rebuild."
- at ENABLE_DOCUMENTATION_FALSE@uninstall-local:
- at ENABLE_DOCUMENTATION_FALSE@install-data-local:
@ENABLE_DOCUMENTATION_FALSE at clean-local:
+ at ENABLE_DOCUMENTATION_FALSE@install-data-local:
+ at ENABLE_DOCUMENTATION_FALSE@uninstall-local:
clean: clean-am
clean-am: clean-binPROGRAMS clean-generic clean-local \
@@ -10322,10 +10311,11 @@ uninstall-man: uninstall-man1 uninstall-man5
.MAKE: all check-am install-am install-strip
-.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-lzip dist-lzma dist-shar dist-tarZ \
+.PHONY: CTAGS GTAGS TAGS all all-am all-local am--refresh check \
+ check-TESTS check-am clean clean-binPROGRAMS clean-cscope \
+ clean-generic clean-local clean-noinstLIBRARIES \
+ clean-noinstPROGRAMS cscope cscopelist-am ctags ctags-am dist \
+ dist-all dist-bzip2 dist-gzip dist-lzip 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 \
@@ -10339,11 +10329,11 @@ uninstall-man: uninstall-man1 uninstall-man5
install-userDATA installcheck installcheck-am installdirs \
maintainer-clean maintainer-clean-generic mostlyclean \
mostlyclean-compile mostlyclean-generic pdf pdf-am ps ps-am \
- tags uninstall uninstall-am uninstall-binPROGRAMS \
- uninstall-developerDATA uninstall-docDATA uninstall-local \
- uninstall-man uninstall-man1 uninstall-man5 \
- uninstall-protocolDATA uninstall-systemdsystemunitDATA \
- uninstall-userDATA
+ recheck tags tags-am uninstall uninstall-am \
+ uninstall-binPROGRAMS uninstall-developerDATA \
+ uninstall-docDATA uninstall-local uninstall-man uninstall-man1 \
+ uninstall-man5 uninstall-protocolDATA \
+ uninstall-systemdsystemunitDATA uninstall-userDATA
#
diff --git a/NEWS b/NEWS
index 9301f1d..1ddad94 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,18 @@
+ver 0.18.6 (2013/12/24)
+* input
+ - cdio_paranoia: support libcdio-paranoia 0.90
+* tags
+ - riff: recognize upper-case "ID3" chunk name
+* decoder
+ - ffmpeg: use relative timestamps
+* output
+ - openal: fix build failure on Mac OS X
+ - osx: fix build failure
+* mixer
+ - alsa: fix build failure with uClibc
+* fix replay gain during cross-fade
+* accept files without metadata
+
ver 0.18.5 (2013/11/23)
* configuration
- fix crash when db_file is configured without music_directory
diff --git a/aclocal.m4 b/aclocal.m4
index 0f13de0..ec12584 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -1,8 +1,7 @@
-# generated automatically by aclocal 1.11.6 -*- Autoconf -*-
+# generated automatically by aclocal 1.14 -*- Autoconf -*-
+
+# Copyright (C) 1996-2013 Free Software Foundation, Inc.
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-# 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.
@@ -12,33 +11,31 @@
# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
# PARTICULAR PURPOSE.
+m4_ifndef([AC_CONFIG_MACRO_DIRS], [m4_defun([_AM_CONFIG_MACRO_DIRS], [])m4_defun([AC_CONFIG_MACRO_DIRS], [_AM_CONFIG_MACRO_DIRS($@)])])
m4_ifndef([AC_AUTOCONF_VERSION],
[m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.69],,
[m4_warning([this file was generated for autoconf 2.69.
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'.])])
+To do so, use the procedure documented by the package, typically 'autoreconf'.])])
-# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008, 2011 Free Software
-# Foundation, Inc.
+# Copyright (C) 2002-2013 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
# generated from the m4 files accompanying Automake X.Y.
# (This private macro should not be called outside this file.)
AC_DEFUN([AM_AUTOMAKE_VERSION],
-[am__api_version='1.11'
+[am__api_version='1.14'
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.6], [],
+m4_if([$1], [1.14], [],
[AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
])
@@ -54,24 +51,22 @@ 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.6])dnl
+[AM_AUTOMAKE_VERSION([1.14])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, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2001-2013 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/../..'.
+# $ac_aux_dir to '$srcdir/foo'. In other projects, it is set to
+# '$srcdir', '$srcdir/..', or '$srcdir/../..'.
#
# Of course, Automake must honor this variable whenever it calls a
# tool from the auxiliary directory. The problem is that $srcdir (and
@@ -90,7 +85,7 @@ _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
#
# The reason of the latter failure is that $top_srcdir and $ac_aux_dir
# are both prefixed by $srcdir. In an in-source build this is usually
-# harmless because $srcdir is `.', but things will broke when you
+# harmless because $srcdir is '.', but things will broke when you
# start a VPATH build or use an absolute $srcdir.
#
# So we could use something similar to $top_srcdir/$ac_aux_dir/missing,
@@ -116,22 +111,19 @@ am_aux_dir=`cd $ac_aux_dir && pwd`
# AM_CONDITIONAL -*- Autoconf -*-
-# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005, 2006, 2008
-# Free Software Foundation, Inc.
+# Copyright (C) 1997-2013 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 9
-
# AM_CONDITIONAL(NAME, SHELL-CONDITION)
# -------------------------------------
# Define a conditional.
AC_DEFUN([AM_CONDITIONAL],
-[AC_PREREQ(2.52)dnl
- ifelse([$1], [TRUE], [AC_FATAL([$0: invalid condition: $1])],
- [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl
+[AC_PREREQ([2.52])dnl
+ m4_if([$1], [TRUE], [AC_FATAL([$0: invalid condition: $1])],
+ [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl
AC_SUBST([$1_TRUE])dnl
AC_SUBST([$1_FALSE])dnl
_AM_SUBST_NOTMAKE([$1_TRUE])dnl
@@ -150,16 +142,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,
-# 2010, 2011 Free Software Foundation, Inc.
+# Copyright (C) 1999-2013 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 12
-# There are a few dirty hacks below to avoid letting `AC_PROG_CC' be
+# 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,
# will think it sees a *use*, and therefore will trigger all it's
# C support machinery. Also note that it means that autoscan, seeing
@@ -169,7 +159,7 @@ fi])])
# _AM_DEPENDENCIES(NAME)
# ----------------------
# See how the compiler implements dependency checking.
-# NAME is "CC", "CXX", "GCJ", or "OBJC".
+# NAME is "CC", "CXX", "OBJC", "OBJCXX", "UPC", or "GJC".
# We try a few techniques and use that to set a single cache variable.
#
# We don't AC_REQUIRE the corresponding AC_PROG_CC since the latter was
@@ -182,12 +172,13 @@ AC_REQUIRE([AM_OUTPUT_DEPENDENCY_COMMANDS])dnl
AC_REQUIRE([AM_MAKE_INCLUDE])dnl
AC_REQUIRE([AM_DEP_TRACK])dnl
-ifelse([$1], CC, [depcc="$CC" am_compiler_list=],
- [$1], CXX, [depcc="$CXX" am_compiler_list=],
- [$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc'],
- [$1], UPC, [depcc="$UPC" am_compiler_list=],
- [$1], GCJ, [depcc="$GCJ" am_compiler_list='gcc3 gcc'],
- [depcc="$$1" am_compiler_list=])
+m4_if([$1], [CC], [depcc="$CC" am_compiler_list=],
+ [$1], [CXX], [depcc="$CXX" am_compiler_list=],
+ [$1], [OBJC], [depcc="$OBJC" am_compiler_list='gcc3 gcc'],
+ [$1], [OBJCXX], [depcc="$OBJCXX" am_compiler_list='gcc3 gcc'],
+ [$1], [UPC], [depcc="$UPC" am_compiler_list=],
+ [$1], [GCJ], [depcc="$GCJ" am_compiler_list='gcc3 gcc'],
+ [depcc="$$1" am_compiler_list=])
AC_CACHE_CHECK([dependency style of $depcc],
[am_cv_$1_dependencies_compiler_type],
@@ -195,8 +186,8 @@ AC_CACHE_CHECK([dependency style of $depcc],
# We make a subdir and do the tests there. Otherwise we can end up
# making bogus files that we don't know about and never remove. For
# 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'.
+ # 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
@@ -236,16 +227,16 @@ AC_CACHE_CHECK([dependency style of $depcc],
: > sub/conftest.c
for i in 1 2 3 4 5 6; do
echo '#include "conftst'$i'.h"' >> sub/conftest.c
- # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
- # Solaris 8's {/usr,}/bin/sh.
- touch sub/conftst$i.h
+ # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with
+ # Solaris 10 /bin/sh.
+ echo '/* dummy */' > sub/conftst$i.h
done
echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
- # We check with `-c' and `-o' for the sake of the "dashmstdout"
+ # We check with '-c' and '-o' for the sake of the "dashmstdout"
# mode. It turns out that the SunPro C++ compiler does not properly
- # handle `-M -o', and we need to detect this. Also, some Intel
- # versions had trouble with output in subdirs
+ # handle '-M -o', and we need to detect this. Also, some Intel
+ # versions had trouble with output in subdirs.
am__obj=sub/conftest.${OBJEXT-o}
am__minus_obj="-o $am__obj"
case $depmode in
@@ -254,8 +245,8 @@ AC_CACHE_CHECK([dependency style of $depcc],
test "$am__universal" = false || continue
;;
nosideeffect)
- # after this tag, mechanisms are not by side-effect, so they'll
- # only be used when explicitly requested
+ # After this tag, mechanisms are not by side-effect, so they'll
+ # only be used when explicitly requested.
if test "x$enable_dependency_tracking" = xyes; then
continue
else
@@ -263,7 +254,7 @@ AC_CACHE_CHECK([dependency style of $depcc],
fi
;;
msvc7 | msvc7msys | msvisualcpp | msvcmsys)
- # This compiler won't grok `-c -o', but also, the minuso test has
+ # 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.
am__obj=conftest.${OBJEXT-o}
@@ -311,7 +302,7 @@ AM_CONDITIONAL([am__fastdep$1], [
# AM_SET_DEPDIR
# -------------
# Choose a directory name for dependency files.
-# This macro is AC_REQUIREd in _AM_DEPENDENCIES
+# This macro is AC_REQUIREd in _AM_DEPENDENCIES.
AC_DEFUN([AM_SET_DEPDIR],
[AC_REQUIRE([AM_SET_LEADING_DOT])dnl
AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl
@@ -321,9 +312,13 @@ AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl
# AM_DEP_TRACK
# ------------
AC_DEFUN([AM_DEP_TRACK],
-[AC_ARG_ENABLE(dependency-tracking,
-[ --disable-dependency-tracking speeds up one-time build
- --enable-dependency-tracking do not reject slow dependency extractors])
+[AC_ARG_ENABLE([dependency-tracking], [dnl
+AS_HELP_STRING(
+ [--enable-dependency-tracking],
+ [do not reject slow dependency extractors])
+AS_HELP_STRING(
+ [--disable-dependency-tracking],
+ [speeds up one-time build])])
if test "x$enable_dependency_tracking" != xno; then
am_depcomp="$ac_aux_dir/depcomp"
AMDEPBACKSLASH='\'
@@ -338,20 +333,18 @@ _AM_SUBST_NOTMAKE([am__nodep])dnl
# Generate code to set up dependency tracking. -*- Autoconf -*-
-# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2008
-# Free Software Foundation, Inc.
+# Copyright (C) 1999-2013 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 5
# _AM_OUTPUT_DEPENDENCY_COMMANDS
# ------------------------------
AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
[{
- # Autoconf 2.62 quotes --file arguments for eval, but not when files
+ # Older Autoconf quotes --file arguments for eval, but not when files
# are listed without --file. Let's play safe and only enable the eval
# if we detect the quoting.
case $CONFIG_FILES in
@@ -364,7 +357,7 @@ AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
# Strip MF so we end up with the name of the file.
mf=`echo "$mf" | sed -e 's/:.*$//'`
# Check whether this is an Automake generated Makefile or not.
- # We used to match only the files named `Makefile.in', but
+ # We used to match only the files named 'Makefile.in', but
# some people rename them; so instead we look at the file content.
# Grep'ing the first line is not enough: some people post-process
# each Makefile.in and add a new line on top of each file to say so.
@@ -376,21 +369,19 @@ AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
continue
fi
# Extract the definition of DEPDIR, am__include, and am__quote
- # from the Makefile without running `make'.
+ # from the Makefile without running 'make'.
DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
test -z "$DEPDIR" && continue
am__include=`sed -n 's/^am__include = //p' < "$mf"`
- test -z "am__include" && continue
+ test -z "$am__include" && continue
am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
- # When using ansi2knr, U may be empty or an underscore; expand it
- U=`sed -n 's/^U = //p' < "$mf"`
# Find all dependency output files, they are included files with
# $(DEPDIR) in their names. We invoke sed twice because it is the
# simplest approach to changing $(DEPDIR) to its actual value in the
# expansion.
for file in `sed -n "
s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
- sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
+ sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g'`; do
# Make sure the directory exists.
test -f "$dirpart/$file" && continue
fdir=`AS_DIRNAME(["$file"])`
@@ -408,7 +399,7 @@ AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
# This macro should only be invoked once -- use via AC_REQUIRE.
#
# This code is only required when automatic dependency tracking
-# is enabled. FIXME. This creates each `.P' file that we will
+# is enabled. FIXME. This creates each '.P' file that we will
# need in order to bootstrap the dependency handling code.
AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
[AC_CONFIG_COMMANDS([depfiles],
@@ -418,18 +409,21 @@ AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
# Do all the work for Automake. -*- Autoconf -*-
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-# 2005, 2006, 2008, 2009 Free Software Foundation, Inc.
+# Copyright (C) 1996-2013 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 16
-
# This macro actually does too much. Some checks are only needed if
# your package does certain things. But this isn't really a big deal.
+dnl Redefine AC_PROG_CC to automatically invoke _AM_PROG_CC_C_O.
+m4_define([AC_PROG_CC],
+m4_defn([AC_PROG_CC])
+[_AM_PROG_CC_C_O
+])
+
# AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE])
# AM_INIT_AUTOMAKE([OPTIONS])
# -----------------------------------------------
@@ -442,7 +436,7 @@ AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
# arguments mandatory, and then we can depend on a new Autoconf
# release and drop the old call support.
AC_DEFUN([AM_INIT_AUTOMAKE],
-[AC_PREREQ([2.62])dnl
+[AC_PREREQ([2.65])dnl
dnl Autoconf wants to disallow AM_ names. We explicitly allow
dnl the ones we care about.
m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl
@@ -471,31 +465,40 @@ AC_SUBST([CYGPATH_W])
# Define the identity of the package.
dnl Distinguish between old-style and new-style calls.
m4_ifval([$2],
-[m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl
+[AC_DIAGNOSE([obsolete],
+ [$0: two- and three-arguments forms are deprecated.])
+m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl
AC_SUBST([PACKAGE], [$1])dnl
AC_SUBST([VERSION], [$2])],
[_AM_SET_OPTIONS([$1])dnl
dnl Diagnose old-style AC_INIT with new-style AM_AUTOMAKE_INIT.
-m4_if(m4_ifdef([AC_PACKAGE_NAME], 1)m4_ifdef([AC_PACKAGE_VERSION], 1), 11,,
+m4_if(
+ m4_ifdef([AC_PACKAGE_NAME], [ok]):m4_ifdef([AC_PACKAGE_VERSION], [ok]),
+ [ok:ok],,
[m4_fatal([AC_INIT should be called with package and version arguments])])dnl
AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl
AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl
_AM_IF_OPTION([no-define],,
-[AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package])
- AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])])dnl
+[AC_DEFINE_UNQUOTED([PACKAGE], ["$PACKAGE"], [Name of package])
+ AC_DEFINE_UNQUOTED([VERSION], ["$VERSION"], [Version number of package])])dnl
# Some tools Automake needs.
AC_REQUIRE([AM_SANITY_CHECK])dnl
AC_REQUIRE([AC_ARG_PROGRAM])dnl
-AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version})
-AM_MISSING_PROG(AUTOCONF, autoconf)
-AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version})
-AM_MISSING_PROG(AUTOHEADER, autoheader)
-AM_MISSING_PROG(MAKEINFO, makeinfo)
+AM_MISSING_PROG([ACLOCAL], [aclocal-${am__api_version}])
+AM_MISSING_PROG([AUTOCONF], [autoconf])
+AM_MISSING_PROG([AUTOMAKE], [automake-${am__api_version}])
+AM_MISSING_PROG([AUTOHEADER], [autoheader])
+AM_MISSING_PROG([MAKEINFO], [makeinfo])
AC_REQUIRE([AM_PROG_INSTALL_SH])dnl
AC_REQUIRE([AM_PROG_INSTALL_STRIP])dnl
-AC_REQUIRE([AM_PROG_MKDIR_P])dnl
+AC_REQUIRE([AC_PROG_MKDIR_P])dnl
+# For better backward compatibility. To be removed once Automake 1.9.x
+# dies out for good. For more background, see:
+# <http://lists.gnu.org/archive/html/automake/2012-07/msg00001.html>
+# <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
+AC_SUBST([mkdir_p], ['$(MKDIR_P)'])
# We need awk for the "check" target. The system "awk" is bad on
# some platforms.
AC_REQUIRE([AC_PROG_AWK])dnl
@@ -506,34 +509,78 @@ _AM_IF_OPTION([tar-ustar], [_AM_PROG_TAR([ustar])],
[_AM_PROG_TAR([v7])])])
_AM_IF_OPTION([no-dependencies],,
[AC_PROVIDE_IFELSE([AC_PROG_CC],
- [_AM_DEPENDENCIES(CC)],
- [define([AC_PROG_CC],
- defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl
+ [_AM_DEPENDENCIES([CC])],
+ [m4_define([AC_PROG_CC],
+ m4_defn([AC_PROG_CC])[_AM_DEPENDENCIES([CC])])])dnl
AC_PROVIDE_IFELSE([AC_PROG_CXX],
- [_AM_DEPENDENCIES(CXX)],
- [define([AC_PROG_CXX],
- defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl
+ [_AM_DEPENDENCIES([CXX])],
+ [m4_define([AC_PROG_CXX],
+ m4_defn([AC_PROG_CXX])[_AM_DEPENDENCIES([CXX])])])dnl
AC_PROVIDE_IFELSE([AC_PROG_OBJC],
- [_AM_DEPENDENCIES(OBJC)],
- [define([AC_PROG_OBJC],
- defn([AC_PROG_OBJC])[_AM_DEPENDENCIES(OBJC)])])dnl
+ [_AM_DEPENDENCIES([OBJC])],
+ [m4_define([AC_PROG_OBJC],
+ m4_defn([AC_PROG_OBJC])[_AM_DEPENDENCIES([OBJC])])])dnl
+AC_PROVIDE_IFELSE([AC_PROG_OBJCXX],
+ [_AM_DEPENDENCIES([OBJCXX])],
+ [m4_define([AC_PROG_OBJCXX],
+ m4_defn([AC_PROG_OBJCXX])[_AM_DEPENDENCIES([OBJCXX])])])dnl
])
-_AM_IF_OPTION([silent-rules], [AC_REQUIRE([AM_SILENT_RULES])])dnl
-dnl The `parallel-tests' driver may need to know about EXEEXT, so add the
-dnl `am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen. This macro
-dnl is hooked onto _AC_COMPILER_EXEEXT early, see below.
+AC_REQUIRE([AM_SILENT_RULES])dnl
+dnl The testsuite driver may need to know about EXEEXT, so add the
+dnl 'am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen. This
+dnl macro is hooked onto _AC_COMPILER_EXEEXT early, see below.
AC_CONFIG_COMMANDS_PRE(dnl
[m4_provide_if([_AM_COMPILER_EXEEXT],
[AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])])])dnl
-])
-dnl Hook into `_AC_COMPILER_EXEEXT' early to learn its expansion. Do not
+# POSIX will say in a future version that running "rm -f" with no argument
+# is OK; and we want to be able to make that assumption in our Makefile
+# recipes. So use an aggressive probe to check that the usage we want is
+# actually supported "in the wild" to an acceptable degree.
+# See automake bug#10828.
+# To make any issue more visible, cause the running configure to be aborted
+# by default if the 'rm' program in use doesn't match our expectations; the
+# user can still override this though.
+if rm -f && rm -fr && rm -rf; then : OK; else
+ cat >&2 <<'END'
+Oops!
+
+Your 'rm' program seems unable to run without file operands specified
+on the command line, even when the '-f' option is present. This is contrary
+to the behaviour of most rm programs out there, and not conforming with
+the upcoming POSIX standard: <http://austingroupbugs.net/view.php?id=542>
+
+Please tell bug-automake at gnu.org about your system, including the value
+of your $PATH and any error possibly output before this message. This
+can help us improve future automake versions.
+
+END
+ if test x"$ACCEPT_INFERIOR_RM_PROGRAM" = x"yes"; then
+ echo 'Configuration will proceed anyway, since you have set the' >&2
+ echo 'ACCEPT_INFERIOR_RM_PROGRAM variable to "yes"' >&2
+ echo >&2
+ else
+ cat >&2 <<'END'
+Aborting the configuration process, to ensure you take notice of the issue.
+
+You can download and install GNU coreutils to get an 'rm' implementation
+that behaves properly: <http://www.gnu.org/software/coreutils/>.
+
+If you want to complete the configuration process using your problematic
+'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM
+to "yes", and re-run configure.
+
+END
+ AC_MSG_ERROR([Your 'rm' program is bad, sorry.])
+ fi
+fi])
+
+dnl Hook into '_AC_COMPILER_EXEEXT' early to learn its expansion. Do not
dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further
dnl mangled by Autoconf and run in a shell conditional statement.
m4_define([_AC_COMPILER_EXEEXT],
m4_defn([_AC_COMPILER_EXEEXT])[m4_provide([_AM_COMPILER_EXEEXT])])
-
# When config.status generates a header, we must update the stamp-h file.
# This file resides in the same directory as the config header
# that is generated. The stamp files are numbered to have different names.
@@ -555,15 +602,12 @@ 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, 2011 Free Software Foundation,
-# Inc.
+# Copyright (C) 2001-2013 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.
@@ -577,16 +621,14 @@ if test x"${install_sh}" != xset; then
install_sh="\${SHELL} $am_aux_dir/install-sh"
esac
fi
-AC_SUBST(install_sh)])
+AC_SUBST([install_sh])])
-# Copyright (C) 2003, 2005 Free Software Foundation, Inc.
+# Copyright (C) 2003-2013 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
-
# Check whether the underlying file-system supports filenames
# with a leading dot. For instance MS-DOS doesn't.
AC_DEFUN([AM_SET_LEADING_DOT],
@@ -602,14 +644,12 @@ AC_SUBST([am__leading_dot])])
# Check to see how 'make' treats includes. -*- Autoconf -*-
-# Copyright (C) 2001, 2002, 2003, 2005, 2009 Free Software Foundation, Inc.
+# Copyright (C) 2001-2013 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
-
# AM_MAKE_INCLUDE()
# -----------------
# Check to see how make treats includes.
@@ -627,7 +667,7 @@ am__quote=
_am_result=none
# First try GNU make style include.
echo "include confinc" > confmf
-# Ignore all kinds of additional output from `make'.
+# Ignore all kinds of additional output from 'make'.
case `$am_make -s -f confmf 2> /dev/null` in #(
*the\ am__doit\ target*)
am__include=include
@@ -654,15 +694,12 @@ rm -f confinc confmf
# Fake the existence of programs that GNU maintainers use. -*- Autoconf -*-
-# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2004, 2005, 2008
-# Free Software Foundation, Inc.
+# Copyright (C) 1997-2013 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 6
-
# AM_MISSING_PROG(NAME, PROGRAM)
# ------------------------------
AC_DEFUN([AM_MISSING_PROG],
@@ -670,11 +707,10 @@ AC_DEFUN([AM_MISSING_PROG],
$1=${$1-"${am_missing_run}$2"}
AC_SUBST($1)])
-
# AM_MISSING_HAS_RUN
# ------------------
-# Define MISSING if not defined so far and test if it supports --run.
-# If it does, set am_missing_run to use it, otherwise, to nothing.
+# Define MISSING if not defined so far and test if it is modern enough.
+# If it is, set am_missing_run to use it, otherwise, to nothing.
AC_DEFUN([AM_MISSING_HAS_RUN],
[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
AC_REQUIRE_AUX_FILE([missing])dnl
@@ -687,54 +723,22 @@ if test x"${MISSING+set}" != xset; then
esac
fi
# Use eval to expand $SHELL
-if eval "$MISSING --run true"; then
- am_missing_run="$MISSING --run "
+if eval "$MISSING --is-lightweight"; then
+ am_missing_run="$MISSING "
else
am_missing_run=
- AC_MSG_WARN([`missing' script is too old or missing])
+ AC_MSG_WARN(['missing' script is too old or missing])
fi
])
-# 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'.
-AC_DEFUN([AM_PROG_MKDIR_P],
-[AC_PREREQ([2.60])dnl
-AC_REQUIRE([AC_PROG_MKDIR_P])dnl
-dnl Automake 1.8 to 1.9.6 used to define mkdir_p. We now use MKDIR_P,
-dnl while keeping a definition of mkdir_p for backward compatibility.
-dnl @MKDIR_P@ is magic: AC_OUTPUT adjusts its value for each Makefile.
-dnl However we cannot define mkdir_p as $(MKDIR_P) for the sake of
-dnl Makefile.ins that do not define MKDIR_P, so we do our own
-dnl adjustment using top_builddir (which is defined more often than
-dnl MKDIR_P).
-AC_SUBST([mkdir_p], ["$MKDIR_P"])dnl
-case $mkdir_p in
- [[\\/$]]* | ?:[[\\/]]*) ;;
- */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;;
-esac
-])
-
# Helper functions for option handling. -*- Autoconf -*-
-# Copyright (C) 2001, 2002, 2003, 2005, 2008, 2010 Free Software
-# Foundation, Inc.
+# Copyright (C) 2001-2013 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 5
-
# _AM_MANGLE_OPTION(NAME)
# -----------------------
AC_DEFUN([_AM_MANGLE_OPTION],
@@ -744,7 +748,7 @@ AC_DEFUN([_AM_MANGLE_OPTION],
# --------------------
# 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)])
+[m4_define(_AM_MANGLE_OPTION([$1]), [1])])
# _AM_SET_OPTIONS(OPTIONS)
# ------------------------
@@ -758,24 +762,82 @@ AC_DEFUN([_AM_SET_OPTIONS],
AC_DEFUN([_AM_IF_OPTION],
[m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
-# Check to make sure that the build environment is sane. -*- Autoconf -*-
+# Copyright (C) 1999-2013 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.
-# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005, 2008
-# Free Software Foundation, Inc.
+# _AM_PROG_CC_C_O
+# ---------------
+# Like AC_PROG_CC_C_O, but changed for automake. We rewrite AC_PROG_CC
+# to automatically call this.
+AC_DEFUN([_AM_PROG_CC_C_O],
+[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
+AC_REQUIRE_AUX_FILE([compile])dnl
+AC_LANG_PUSH([C])dnl
+AC_CACHE_CHECK(
+ [whether $CC understands -c and -o together],
+ [am_cv_prog_cc_c_o],
+ [AC_LANG_CONFTEST([AC_LANG_PROGRAM([])])
+ # Make sure it works both with $CC and with simple cc.
+ # Following AC_PROG_CC_C_O, we do the test twice because some
+ # compilers refuse to overwrite an existing .o file with -o,
+ # though they will create one.
+ am_cv_prog_cc_c_o=yes
+ for am_i in 1 2; do
+ if AM_RUN_LOG([$CC -c conftest.$ac_ext -o conftest2.$ac_objext]) \
+ && test -f conftest2.$ac_objext; then
+ : OK
+ else
+ am_cv_prog_cc_c_o=no
+ break
+ fi
+ done
+ rm -f core conftest*
+ unset am_i])
+if test "$am_cv_prog_cc_c_o" != yes; then
+ # Losing compiler, so override with the script.
+ # FIXME: It is wrong to rewrite CC.
+ # But if we don't then we get into trouble of one sort or another.
+ # A longer-term fix would be to have automake use am__CC in this case,
+ # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)"
+ CC="$am_aux_dir/compile $CC"
+fi
+AC_LANG_POP([C])])
+
+# For backward compatibility.
+AC_DEFUN_ONCE([AM_PROG_CC_C_O], [AC_REQUIRE([AC_PROG_CC])])
+
+# Copyright (C) 2001-2013 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 5
+# AM_RUN_LOG(COMMAND)
+# -------------------
+# Run COMMAND, save the exit status in ac_status, and log it.
+# (This has been adapted from Autoconf's _AC_RUN_LOG macro.)
+AC_DEFUN([AM_RUN_LOG],
+[{ echo "$as_me:$LINENO: $1" >&AS_MESSAGE_LOG_FD
+ ($1) >&AS_MESSAGE_LOG_FD 2>&AS_MESSAGE_LOG_FD
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
+ (exit $ac_status); }])
+
+# Check to make sure that the build environment is sane. -*- Autoconf -*-
+
+# Copyright (C) 1996-2013 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.
# AM_SANITY_CHECK
# ---------------
AC_DEFUN([AM_SANITY_CHECK],
[AC_MSG_CHECKING([whether build environment is sane])
-# Just in case
-sleep 1
-echo timestamp > conftest.file
# Reject unsafe characters in $srcdir or the absolute working directory
# name. Accept space and tab only in the latter.
am_lf='
@@ -786,32 +848,40 @@ case `pwd` in
esac
case $srcdir in
*[[\\\"\#\$\&\'\`$am_lf\ \ ]]*)
- AC_MSG_ERROR([unsafe srcdir value: `$srcdir']);;
+ AC_MSG_ERROR([unsafe srcdir value: '$srcdir']);;
esac
-# Do `set' in a subshell so we don't clobber the current shell's
+# Do 'set' in a subshell so we don't clobber the current shell's
# arguments. Must try -L first in case configure is actually a
# symlink; some systems play weird games with the mod time of symlinks
# (eg FreeBSD returns the mod time of the symlink's containing
# directory).
if (
- set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
- if test "$[*]" = "X"; then
- # -L didn't work.
- set X `ls -t "$srcdir/configure" conftest.file`
- fi
- rm -f conftest.file
- if test "$[*]" != "X $srcdir/configure conftest.file" \
- && test "$[*]" != "X conftest.file $srcdir/configure"; then
-
- # If neither matched, then we have a broken ls. This can happen
- # if, for instance, CONFIG_SHELL is bash and it inherits a
- # broken ls alias from the environment. This has actually
- # happened. Such a system could not be considered "sane".
- AC_MSG_ERROR([ls -t appears to fail. Make sure there is not a broken
-alias in your environment])
- fi
-
+ am_has_slept=no
+ for am_try in 1 2; do
+ echo "timestamp, slept: $am_has_slept" > conftest.file
+ set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
+ if test "$[*]" = "X"; then
+ # -L didn't work.
+ set X `ls -t "$srcdir/configure" conftest.file`
+ fi
+ if test "$[*]" != "X $srcdir/configure conftest.file" \
+ && test "$[*]" != "X conftest.file $srcdir/configure"; then
+
+ # If neither matched, then we have a broken ls. This can happen
+ # if, for instance, CONFIG_SHELL is bash and it inherits a
+ # broken ls alias from the environment. This has actually
+ # happened. Such a system could not be considered "sane".
+ AC_MSG_ERROR([ls -t appears to fail. Make sure there is not a broken
+ alias in your environment])
+ fi
+ if test "$[2]" = conftest.file || test $am_try -eq 2; then
+ break
+ fi
+ # Just in case.
+ sleep 1
+ am_has_slept=yes
+ done
test "$[2]" = conftest.file
)
then
@@ -821,31 +891,50 @@ else
AC_MSG_ERROR([newly created file is older than distributed files!
Check your system clock])
fi
-AC_MSG_RESULT(yes)])
+AC_MSG_RESULT([yes])
+# If we didn't sleep, we still need to ensure time stamps of config.status and
+# generated files are strictly newer.
+am_sleep_pid=
+if grep 'slept: no' conftest.file >/dev/null 2>&1; then
+ ( sleep 1 ) &
+ am_sleep_pid=$!
+fi
+AC_CONFIG_COMMANDS_PRE(
+ [AC_MSG_CHECKING([that generated files are newer than configure])
+ if test -n "$am_sleep_pid"; then
+ # Hide warnings about reused PIDs.
+ wait $am_sleep_pid 2>/dev/null
+ fi
+ AC_MSG_RESULT([done])])
+rm -f conftest.file
+])
-# Copyright (C) 2009, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2009-2013 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
-
# AM_SILENT_RULES([DEFAULT])
# --------------------------
# Enable less verbose build rules; with the default set to DEFAULT
-# (`yes' being less verbose, `no' or empty being verbose).
+# ("yes" being less verbose, "no" or empty being verbose).
AC_DEFUN([AM_SILENT_RULES],
-[AC_ARG_ENABLE([silent-rules],
-[ --enable-silent-rules less verbose build output (undo: `make V=1')
- --disable-silent-rules verbose build output (undo: `make V=0')])
-case $enable_silent_rules in
-yes) AM_DEFAULT_VERBOSITY=0;;
-no) AM_DEFAULT_VERBOSITY=1;;
-*) AM_DEFAULT_VERBOSITY=m4_if([$1], [yes], [0], [1]);;
+[AC_ARG_ENABLE([silent-rules], [dnl
+AS_HELP_STRING(
+ [--enable-silent-rules],
+ [less verbose build output (undo: "make V=1")])
+AS_HELP_STRING(
+ [--disable-silent-rules],
+ [verbose build output (undo: "make V=0")])dnl
+])
+case $enable_silent_rules in @%:@ (((
+ yes) AM_DEFAULT_VERBOSITY=0;;
+ no) AM_DEFAULT_VERBOSITY=1;;
+ *) AM_DEFAULT_VERBOSITY=m4_if([$1], [yes], [0], [1]);;
esac
dnl
-dnl A few `make' implementations (e.g., NonStop OS and NextStep)
+dnl A few 'make' implementations (e.g., NonStop OS and NextStep)
dnl do not support nested variable expansions.
dnl See automake bug#9928 and bug#10237.
am_make=${MAKE-make}
@@ -863,7 +952,7 @@ else
am_cv_make_support_nested_variables=no
fi])
if test $am_cv_make_support_nested_variables = yes; then
- dnl Using `$V' instead of `$(V)' breaks IRIX make.
+ dnl Using '$V' instead of '$(V)' breaks IRIX make.
AM_V='$(V)'
AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)'
else
@@ -880,44 +969,40 @@ AC_SUBST([AM_BACKSLASH])dnl
_AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl
])
-# Copyright (C) 2001, 2003, 2005, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2001-2013 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
+# One issue with vendor 'install' (even GNU) is that you can't
# specify the program used to strip binaries. This is especially
# annoying in cross-compiling environments, where the build's strip
# is unlikely to handle the host's binaries.
# Fortunately install-sh will honor a STRIPPROG variable, so we
-# always use install-sh in `make install-strip', and initialize
+# always use install-sh in "make install-strip", and initialize
# STRIPPROG with the value of the STRIP variable (set by the user).
AC_DEFUN([AM_PROG_INSTALL_STRIP],
[AC_REQUIRE([AM_PROG_INSTALL_SH])dnl
-# Installed binaries are usually stripped using `strip' when the user
-# run `make install-strip'. However `strip' might not be the right
+# Installed binaries are usually stripped using 'strip' when the user
+# run "make install-strip". However 'strip' might not be the right
# tool to use in cross-compilation environments, therefore Automake
-# will honor the `STRIP' environment variable to overrule this program.
-dnl Don't test for $cross_compiling = yes, because it might be `maybe'.
+# will honor the 'STRIP' environment variable to overrule this program.
+dnl Don't test for $cross_compiling = yes, because it might be 'maybe'.
if test "$cross_compiling" != no; then
AC_CHECK_TOOL([STRIP], [strip], :)
fi
INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
AC_SUBST([INSTALL_STRIP_PROGRAM])])
-# Copyright (C) 2006, 2008, 2010 Free Software Foundation, Inc.
+# Copyright (C) 2006-2013 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 3
-
# _AM_SUBST_NOTMAKE(VARIABLE)
# ---------------------------
# Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in.
@@ -931,18 +1016,16 @@ AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])
# Check how to create a tarball. -*- Autoconf -*-
-# Copyright (C) 2004, 2005, 2012 Free Software Foundation, Inc.
+# Copyright (C) 2004-2013 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
-
# _AM_PROG_TAR(FORMAT)
# --------------------
# Check how to create a tarball in format FORMAT.
-# FORMAT should be one of `v7', `ustar', or `pax'.
+# FORMAT should be one of 'v7', 'ustar', or 'pax'.
#
# Substitute a variable $(am__tar) that is a command
# writing to stdout a FORMAT-tarball containing the directory
@@ -952,76 +1035,114 @@ AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])
# Substitute a variable $(am__untar) that extract such
# a tarball read from stdin.
# $(am__untar) < result.tar
+#
AC_DEFUN([_AM_PROG_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='$${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])
-# Loop over all known methods to create a tar archive until one works.
+
+# We'll loop over all known methods to create a tar archive until one works.
_am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none'
-_am_tools=${am_cv_prog_tar_$1-$_am_tools}
-# Do not fold the above two line into one, because Tru64 sh and
-# Solaris sh will not grok spaces in the rhs of `-'.
-for _am_tool in $_am_tools
-do
- case $_am_tool in
- gnutar)
- for _am_tar in tar gnutar gtar;
- do
- AM_RUN_LOG([$_am_tar --version]) && break
- done
- am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"'
- am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"'
- am__untar="$_am_tar -xf -"
- ;;
- plaintar)
- # Must skip GNU tar: if it does not support --format= it doesn't create
- # ustar tarball either.
- (tar --version) >/dev/null 2>&1 && continue
- am__tar='tar chf - "$$tardir"'
- am__tar_='tar chf - "$tardir"'
- am__untar='tar xf -'
- ;;
- pax)
- am__tar='pax -L -x $1 -w "$$tardir"'
- am__tar_='pax -L -x $1 -w "$tardir"'
- am__untar='pax -r'
- ;;
- cpio)
- am__tar='find "$$tardir" -print | cpio -o -H $1 -L'
- am__tar_='find "$tardir" -print | cpio -o -H $1 -L'
- am__untar='cpio -i -H $1 -d'
- ;;
- none)
- am__tar=false
- am__tar_=false
- am__untar=false
- ;;
- esac
- # If the value was cached, stop now. We just wanted to have am__tar
- # and am__untar set.
- test -n "${am_cv_prog_tar_$1}" && break
+m4_if([$1], [v7],
+ [am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'],
+
+ [m4_case([$1],
+ [ustar],
+ [# The POSIX 1988 'ustar' format is defined with fixed-size fields.
+ # There is notably a 21 bits limit for the UID and the GID. In fact,
+ # the 'pax' utility can hang on bigger UID/GID (see automake bug#8343
+ # and bug#13588).
+ am_max_uid=2097151 # 2^21 - 1
+ am_max_gid=$am_max_uid
+ # The $UID and $GID variables are not portable, so we need to resort
+ # to the POSIX-mandated id(1) utility. Errors in the 'id' calls
+ # below are definitely unexpected, so allow the users to see them
+ # (that is, avoid stderr redirection).
+ am_uid=`id -u || echo unknown`
+ am_gid=`id -g || echo unknown`
+ AC_MSG_CHECKING([whether UID '$am_uid' is supported by ustar format])
+ if test $am_uid -le $am_max_uid; then
+ AC_MSG_RESULT([yes])
+ else
+ AC_MSG_RESULT([no])
+ _am_tools=none
+ fi
+ AC_MSG_CHECKING([whether GID '$am_gid' is supported by ustar format])
+ if test $am_gid -le $am_max_gid; then
+ AC_MSG_RESULT([yes])
+ else
+ AC_MSG_RESULT([no])
+ _am_tools=none
+ fi],
+
+ [pax],
+ [],
+
+ [m4_fatal([Unknown tar format])])
+
+ AC_MSG_CHECKING([how to create a $1 tar archive])
+
+ # Go ahead even if we have the value already cached. We do so because we
+ # need to set the values for the 'am__tar' and 'am__untar' variables.
+ _am_tools=${am_cv_prog_tar_$1-$_am_tools}
+
+ for _am_tool in $_am_tools; do
+ case $_am_tool in
+ gnutar)
+ for _am_tar in tar gnutar gtar; do
+ AM_RUN_LOG([$_am_tar --version]) && break
+ done
+ am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"'
+ am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"'
+ am__untar="$_am_tar -xf -"
+ ;;
+ plaintar)
+ # Must skip GNU tar: if it does not support --format= it doesn't create
+ # ustar tarball either.
+ (tar --version) >/dev/null 2>&1 && continue
+ am__tar='tar chf - "$$tardir"'
+ am__tar_='tar chf - "$tardir"'
+ am__untar='tar xf -'
+ ;;
+ pax)
+ am__tar='pax -L -x $1 -w "$$tardir"'
+ am__tar_='pax -L -x $1 -w "$tardir"'
+ am__untar='pax -r'
+ ;;
+ cpio)
+ am__tar='find "$$tardir" -print | cpio -o -H $1 -L'
+ am__tar_='find "$tardir" -print | cpio -o -H $1 -L'
+ am__untar='cpio -i -H $1 -d'
+ ;;
+ none)
+ am__tar=false
+ am__tar_=false
+ am__untar=false
+ ;;
+ esac
- # tar/untar a dummy directory, and stop if the command works
- rm -rf conftest.dir
- mkdir conftest.dir
- echo GrepMe > conftest.dir/file
- AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar])
+ # If the value was cached, stop now. We just wanted to have am__tar
+ # and am__untar set.
+ test -n "${am_cv_prog_tar_$1}" && break
+
+ # tar/untar a dummy directory, and stop if the command works.
+ rm -rf conftest.dir
+ mkdir conftest.dir
+ echo GrepMe > conftest.dir/file
+ AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar])
+ rm -rf conftest.dir
+ if test -s conftest.tar; then
+ AM_RUN_LOG([$am__untar <conftest.tar])
+ AM_RUN_LOG([cat conftest.dir/file])
+ grep GrepMe conftest.dir/file >/dev/null 2>&1 && break
+ fi
+ done
rm -rf conftest.dir
- if test -s conftest.tar; then
- AM_RUN_LOG([$am__untar <conftest.tar])
- grep GrepMe conftest.dir/file >/dev/null 2>&1 && break
- fi
-done
-rm -rf conftest.dir
-AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool])
-AC_MSG_RESULT([$am_cv_prog_tar_$1])])
+ AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool])
+ AC_MSG_RESULT([$am_cv_prog_tar_$1])])
+
AC_SUBST([am__tar])
AC_SUBST([am__untar])
]) # _AM_PROG_TAR
diff --git a/compile b/compile
new file mode 100755
index 0000000..531136b
--- /dev/null
+++ b/compile
@@ -0,0 +1,347 @@
+#! /bin/sh
+# Wrapper for compilers which do not understand '-c -o'.
+
+scriptversion=2012-10-14.11; # UTC
+
+# Copyright (C) 1999-2013 Free Software Foundation, Inc.
+# Written by Tom Tromey <tromey at cygnus.com>.
+#
+# 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, 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, 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
+# configuration script generated by Autoconf, you may include it under
+# the same distribution terms that you use for the rest of that program.
+
+# This file is maintained in Automake, please report
+# bugs to <bug-automake at gnu.org> or send patches to
+# <automake-patches at gnu.org>.
+
+nl='
+'
+
+# We need space, tab and new line, in precisely that order. Quoting is
+# there to prevent tools from complaining about whitespace usage.
+IFS=" "" $nl"
+
+file_conv=
+
+# func_file_conv build_file lazy
+# Convert a $build file to $host form and store it in $file
+# Currently only supports Windows hosts. If the determined conversion
+# type is listed in (the comma separated) LAZY, no conversion will
+# take place.
+func_file_conv ()
+{
+ file=$1
+ case $file in
+ / | /[!/]*) # absolute file, and not a UNC file
+ if test -z "$file_conv"; then
+ # lazily determine how to convert abs files
+ case `uname -s` in
+ MINGW*)
+ file_conv=mingw
+ ;;
+ CYGWIN*)
+ file_conv=cygwin
+ ;;
+ *)
+ file_conv=wine
+ ;;
+ esac
+ fi
+ case $file_conv/,$2, in
+ *,$file_conv,*)
+ ;;
+ mingw/*)
+ file=`cmd //C echo "$file " | sed -e 's/"\(.*\) " *$/\1/'`
+ ;;
+ cygwin/*)
+ file=`cygpath -m "$file" || echo "$file"`
+ ;;
+ wine/*)
+ file=`winepath -w "$file" || echo "$file"`
+ ;;
+ esac
+ ;;
+ esac
+}
+
+# func_cl_dashL linkdir
+# Make cl look for libraries in LINKDIR
+func_cl_dashL ()
+{
+ func_file_conv "$1"
+ if test -z "$lib_path"; then
+ lib_path=$file
+ else
+ lib_path="$lib_path;$file"
+ fi
+ linker_opts="$linker_opts -LIBPATH:$file"
+}
+
+# func_cl_dashl library
+# Do a library search-path lookup for cl
+func_cl_dashl ()
+{
+ lib=$1
+ found=no
+ save_IFS=$IFS
+ IFS=';'
+ for dir in $lib_path $LIB
+ do
+ IFS=$save_IFS
+ if $shared && test -f "$dir/$lib.dll.lib"; then
+ found=yes
+ lib=$dir/$lib.dll.lib
+ break
+ fi
+ if test -f "$dir/$lib.lib"; then
+ found=yes
+ lib=$dir/$lib.lib
+ break
+ fi
+ if test -f "$dir/lib$lib.a"; then
+ found=yes
+ lib=$dir/lib$lib.a
+ break
+ fi
+ done
+ IFS=$save_IFS
+
+ if test "$found" != yes; then
+ lib=$lib.lib
+ fi
+}
+
+# func_cl_wrapper cl arg...
+# Adjust compile command to suit cl
+func_cl_wrapper ()
+{
+ # Assume a capable shell
+ lib_path=
+ shared=:
+ linker_opts=
+ for arg
+ do
+ if test -n "$eat"; then
+ eat=
+ else
+ case $1 in
+ -o)
+ # configure might choose to run compile as 'compile cc -o foo foo.c'.
+ eat=1
+ case $2 in
+ *.o | *.[oO][bB][jJ])
+ func_file_conv "$2"
+ set x "$@" -Fo"$file"
+ shift
+ ;;
+ *)
+ func_file_conv "$2"
+ set x "$@" -Fe"$file"
+ shift
+ ;;
+ esac
+ ;;
+ -I)
+ eat=1
+ func_file_conv "$2" mingw
+ set x "$@" -I"$file"
+ shift
+ ;;
+ -I*)
+ func_file_conv "${1#-I}" mingw
+ set x "$@" -I"$file"
+ shift
+ ;;
+ -l)
+ eat=1
+ func_cl_dashl "$2"
+ set x "$@" "$lib"
+ shift
+ ;;
+ -l*)
+ func_cl_dashl "${1#-l}"
+ set x "$@" "$lib"
+ shift
+ ;;
+ -L)
+ eat=1
+ func_cl_dashL "$2"
+ ;;
+ -L*)
+ func_cl_dashL "${1#-L}"
+ ;;
+ -static)
+ shared=false
+ ;;
+ -Wl,*)
+ arg=${1#-Wl,}
+ save_ifs="$IFS"; IFS=','
+ for flag in $arg; do
+ IFS="$save_ifs"
+ linker_opts="$linker_opts $flag"
+ done
+ IFS="$save_ifs"
+ ;;
+ -Xlinker)
+ eat=1
+ linker_opts="$linker_opts $2"
+ ;;
+ -*)
+ set x "$@" "$1"
+ shift
+ ;;
+ *.cc | *.CC | *.cxx | *.CXX | *.[cC]++)
+ func_file_conv "$1"
+ set x "$@" -Tp"$file"
+ shift
+ ;;
+ *.c | *.cpp | *.CPP | *.lib | *.LIB | *.Lib | *.OBJ | *.obj | *.[oO])
+ func_file_conv "$1" mingw
+ set x "$@" "$file"
+ shift
+ ;;
+ *)
+ set x "$@" "$1"
+ shift
+ ;;
+ esac
+ fi
+ shift
+ done
+ if test -n "$linker_opts"; then
+ linker_opts="-link$linker_opts"
+ fi
+ exec "$@" $linker_opts
+ exit 1
+}
+
+eat=
+
+case $1 in
+ '')
+ echo "$0: No command. Try '$0 --help' for more information." 1>&2
+ exit 1;
+ ;;
+ -h | --h*)
+ cat <<\EOF
+Usage: compile [--help] [--version] PROGRAM [ARGS]
+
+Wrapper for compilers which do not understand '-c -o'.
+Remove '-o dest.o' from ARGS, run PROGRAM with the remaining
+arguments, and rename the output as expected.
+
+If you are trying to build a whole package this is not the
+right script to run: please start by reading the file 'INSTALL'.
+
+Report bugs to <bug-automake at gnu.org>.
+EOF
+ exit $?
+ ;;
+ -v | --v*)
+ echo "compile $scriptversion"
+ exit $?
+ ;;
+ cl | *[/\\]cl | cl.exe | *[/\\]cl.exe )
+ func_cl_wrapper "$@" # Doesn't return...
+ ;;
+esac
+
+ofile=
+cfile=
+
+for arg
+do
+ if test -n "$eat"; then
+ eat=
+ else
+ case $1 in
+ -o)
+ # configure might choose to run compile as 'compile cc -o foo foo.c'.
+ # So we strip '-o arg' only if arg is an object.
+ eat=1
+ case $2 in
+ *.o | *.obj)
+ ofile=$2
+ ;;
+ *)
+ set x "$@" -o "$2"
+ shift
+ ;;
+ esac
+ ;;
+ *.c)
+ cfile=$1
+ set x "$@" "$1"
+ shift
+ ;;
+ *)
+ set x "$@" "$1"
+ shift
+ ;;
+ esac
+ fi
+ shift
+done
+
+if test -z "$ofile" || test -z "$cfile"; then
+ # If no '-o' option was seen then we might have been invoked from a
+ # pattern rule where we don't need one. That is ok -- this is a
+ # normal compilation that the losing compiler can handle. If no
+ # '.c' file was seen then we are probably linking. That is also
+ # ok.
+ exec "$@"
+fi
+
+# Name of file we expect compiler to create.
+cofile=`echo "$cfile" | sed 's|^.*[\\/]||; s|^[a-zA-Z]:||; s/\.c$/.o/'`
+
+# Create the lock directory.
+# Note: use '[/\\:.-]' here to ensure that we don't use the same name
+# that we are using for the .o file. Also, base the name on the expected
+# object file name, since that is what matters with a parallel build.
+lockdir=`echo "$cofile" | sed -e 's|[/\\:.-]|_|g'`.d
+while true; do
+ if mkdir "$lockdir" >/dev/null 2>&1; then
+ break
+ fi
+ sleep 1
+done
+# FIXME: race condition here if user kills between mkdir and trap.
+trap "rmdir '$lockdir'; exit 1" 1 2 15
+
+# Run the compile.
+"$@"
+ret=$?
+
+if test -f "$cofile"; then
+ test "$cofile" = "$ofile" || mv "$cofile" "$ofile"
+elif test -f "${cofile}bj"; then
+ test "${cofile}bj" = "$ofile" || mv "${cofile}bj" "$ofile"
+fi
+
+rmdir "$lockdir"
+exit $ret
+
+# Local Variables:
+# mode: shell-script
+# sh-indentation: 2
+# eval: (add-hook 'write-file-hooks 'time-stamp)
+# time-stamp-start: "scriptversion="
+# time-stamp-format: "%:y-%02m-%02d.%02H"
+# time-stamp-time-zone: "UTC"
+# time-stamp-end: "; # UTC"
+# End:
diff --git a/config.h.in b/config.h.in
index 4bf725a..61c1155 100644
--- a/config.h.in
+++ b/config.h.in
@@ -105,6 +105,9 @@
/* Define to have bz2 archive support */
#undef HAVE_BZ2
+/* Define to 1 if you have the <cdio/paranoia/paranoia.h> header file. */
+#undef HAVE_CDIO_PARANOIA_PARANOIA_H
+
/* Define to 1 if you have the `daemon' function. */
#undef HAVE_DAEMON
diff --git a/configure b/configure
index ff42a46..cadd22a 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.69 for mpd 0.18.5.
+# Generated by GNU Autoconf 2.69 for mpd 0.18.6.
#
# Report bugs to <musicpd-dev-team at lists.sourceforge.net>.
#
@@ -580,8 +580,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='mpd'
PACKAGE_TARNAME='mpd'
-PACKAGE_VERSION='0.18.5'
-PACKAGE_STRING='mpd 0.18.5'
+PACKAGE_VERSION='0.18.6'
+PACKAGE_STRING='mpd 0.18.6'
PACKAGE_BUGREPORT='musicpd-dev-team at lists.sourceforge.net'
PACKAGE_URL=''
@@ -1673,7 +1673,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.18.5 to adapt to many kinds of systems.
+\`configure' configures mpd 0.18.6 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1743,7 +1743,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of mpd 0.18.5:";;
+ short | recursive ) echo "Configuration of mpd 0.18.6:";;
esac
cat <<\_ACEOF
@@ -1751,10 +1751,12 @@ Optional Features:
--disable-option-checking ignore unrecognized --enable/--with options
--disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no)
--enable-FEATURE[=ARG] include FEATURE [ARG=yes]
- --enable-silent-rules less verbose build output (undo: `make V=1')
- --disable-silent-rules verbose build output (undo: `make V=0')
- --disable-dependency-tracking speeds up one-time build
- --enable-dependency-tracking do not reject slow dependency extractors
+ --enable-silent-rules less verbose build output (undo: "make V=1")
+ --disable-silent-rules verbose build output (undo: "make V=0")
+ --enable-dependency-tracking
+ do not reject slow dependency extractors
+ --disable-dependency-tracking
+ speeds up one-time build
--enable-eventfd use the function "eventfd" (default: auto)
--enable-signalfd use the function "signalfd" (default: auto)
--enable-epoll use the function "epoll" (default: auto)
@@ -2039,7 +2041,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-mpd configure 0.18.5
+mpd configure 0.18.6
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2492,7 +2494,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.18.5, which was
+It was created by mpd $as_me 0.18.6, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -2847,7 +2849,7 @@ VERSION_REVISION=0
VERSION_EXTRA=0
-am__api_version='1.11'
+am__api_version='1.14'
ac_aux_dir=
for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
@@ -2973,9 +2975,6 @@ test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether build environment is sane" >&5
$as_echo_n "checking whether build environment is sane... " >&6; }
-# Just in case
-sleep 1
-echo timestamp > conftest.file
# Reject unsafe characters in $srcdir or the absolute working directory
# name. Accept space and tab only in the latter.
am_lf='
@@ -2986,32 +2985,40 @@ case `pwd` in
esac
case $srcdir in
*[\\\"\#\$\&\'\`$am_lf\ \ ]*)
- as_fn_error $? "unsafe srcdir value: \`$srcdir'" "$LINENO" 5;;
+ as_fn_error $? "unsafe srcdir value: '$srcdir'" "$LINENO" 5;;
esac
-# Do `set' in a subshell so we don't clobber the current shell's
+# Do 'set' in a subshell so we don't clobber the current shell's
# arguments. Must try -L first in case configure is actually a
# symlink; some systems play weird games with the mod time of symlinks
# (eg FreeBSD returns the mod time of the symlink's containing
# directory).
if (
- set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
- if test "$*" = "X"; then
- # -L didn't work.
- set X `ls -t "$srcdir/configure" conftest.file`
- fi
- rm -f conftest.file
- if test "$*" != "X $srcdir/configure conftest.file" \
- && test "$*" != "X conftest.file $srcdir/configure"; then
-
- # If neither matched, then we have a broken ls. This can happen
- # if, for instance, CONFIG_SHELL is bash and it inherits a
- # broken ls alias from the environment. This has actually
- # happened. Such a system could not be considered "sane".
- as_fn_error $? "ls -t appears to fail. Make sure there is not a broken
-alias in your environment" "$LINENO" 5
- fi
-
+ am_has_slept=no
+ for am_try in 1 2; do
+ echo "timestamp, slept: $am_has_slept" > conftest.file
+ set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
+ if test "$*" = "X"; then
+ # -L didn't work.
+ set X `ls -t "$srcdir/configure" conftest.file`
+ fi
+ if test "$*" != "X $srcdir/configure conftest.file" \
+ && test "$*" != "X conftest.file $srcdir/configure"; then
+
+ # If neither matched, then we have a broken ls. This can happen
+ # if, for instance, CONFIG_SHELL is bash and it inherits a
+ # broken ls alias from the environment. This has actually
+ # happened. Such a system could not be considered "sane".
+ as_fn_error $? "ls -t appears to fail. Make sure there is not a broken
+ alias in your environment" "$LINENO" 5
+ fi
+ if test "$2" = conftest.file || test $am_try -eq 2; then
+ break
+ fi
+ # Just in case.
+ sleep 1
+ am_has_slept=yes
+ done
test "$2" = conftest.file
)
then
@@ -3023,6 +3030,16 @@ Check your system clock" "$LINENO" 5
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
+# If we didn't sleep, we still need to ensure time stamps of config.status and
+# generated files are strictly newer.
+am_sleep_pid=
+if grep 'slept: no' conftest.file >/dev/null 2>&1; then
+ ( sleep 1 ) &
+ am_sleep_pid=$!
+fi
+
+rm -f conftest.file
+
test "$program_prefix" != NONE &&
program_transform_name="s&^&$program_prefix&;$program_transform_name"
# Use a double $ so make ignores it.
@@ -3045,12 +3062,12 @@ if test x"${MISSING+set}" != xset; then
esac
fi
# Use eval to expand $SHELL
-if eval "$MISSING --run true"; then
- am_missing_run="$MISSING --run "
+if eval "$MISSING --is-lightweight"; then
+ am_missing_run="$MISSING "
else
am_missing_run=
- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \`missing' script is too old or missing" >&5
-$as_echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;}
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: 'missing' script is too old or missing" >&5
+$as_echo "$as_me: WARNING: 'missing' script is too old or missing" >&2;}
fi
if test x"${install_sh}" != xset; then
@@ -3062,10 +3079,10 @@ if test x"${install_sh}" != xset; then
esac
fi
-# Installed binaries are usually stripped using `strip' when the user
-# run `make install-strip'. However `strip' might not be the right
+# Installed binaries are usually stripped using 'strip' when the user
+# run "make install-strip". However 'strip' might not be the right
# tool to use in cross-compilation environments, therefore Automake
-# will honor the `STRIP' environment variable to overrule this program.
+# will honor the 'STRIP' environment variable to overrule this program.
if test "$cross_compiling" != no; then
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
@@ -3204,12 +3221,6 @@ fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $MKDIR_P" >&5
$as_echo "$MKDIR_P" >&6; }
-mkdir_p="$MKDIR_P"
-case $mkdir_p in
- [\\/$]* | ?:[\\/]*) ;;
- */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;;
-esac
-
for ac_prog in gawk mawk nawk awk
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
@@ -3292,6 +3303,45 @@ else
fi
rmdir .tst 2>/dev/null
+# Check whether --enable-silent-rules was given.
+if test "${enable_silent_rules+set}" = set; then :
+ enableval=$enable_silent_rules;
+fi
+
+case $enable_silent_rules in # (((
+ yes) AM_DEFAULT_VERBOSITY=0;;
+ no) AM_DEFAULT_VERBOSITY=1;;
+ *) AM_DEFAULT_VERBOSITY=1;;
+esac
+am_make=${MAKE-make}
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $am_make supports nested variables" >&5
+$as_echo_n "checking whether $am_make supports nested variables... " >&6; }
+if ${am_cv_make_support_nested_variables+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ if $as_echo 'TRUE=$(BAR$(V))
+BAR0=false
+BAR1=true
+V=1
+am__doit:
+ @$(TRUE)
+.PHONY: am__doit' | $am_make -f - >/dev/null 2>&1; then
+ am_cv_make_support_nested_variables=yes
+else
+ am_cv_make_support_nested_variables=no
+fi
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_make_support_nested_variables" >&5
+$as_echo "$am_cv_make_support_nested_variables" >&6; }
+if test $am_cv_make_support_nested_variables = yes; then
+ AM_V='$(V)'
+ AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)'
+else
+ AM_V=$AM_DEFAULT_VERBOSITY
+ AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY
+fi
+AM_BACKSLASH='\'
+
if test "`cd $srcdir && pwd`" != "`pwd`"; then
# Use -I$(srcdir) only when $(srcdir) != ., so that make's output
# is not polluted with repeated "-I."
@@ -3314,7 +3364,7 @@ fi
# Define the identity of the package.
PACKAGE='mpd'
- VERSION='0.18.5'
+ VERSION='0.18.6'
cat >>confdefs.h <<_ACEOF
@@ -3342,27 +3392,79 @@ AUTOHEADER=${AUTOHEADER-"${am_missing_run}autoheader"}
MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"}
+# For better backward compatibility. To be removed once Automake 1.9.x
+# dies out for good. For more background, see:
+# <http://lists.gnu.org/archive/html/automake/2012-07/msg00001.html>
+# <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
+mkdir_p='$(MKDIR_P)'
+
# We need awk for the "check" target. The system "awk" is bad on
# some platforms.
# 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}'
+
+# We'll loop over all known methods to create a tar archive until one works.
+_am_tools='gnutar pax cpio none'
+
am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'
+
+# POSIX will say in a future version that running "rm -f" with no argument
+# is OK; and we want to be able to make that assumption in our Makefile
+# recipes. So use an aggressive probe to check that the usage we want is
+# actually supported "in the wild" to an acceptable degree.
+# See automake bug#10828.
+# To make any issue more visible, cause the running configure to be aborted
+# by default if the 'rm' program in use doesn't match our expectations; the
+# user can still override this though.
+if rm -f && rm -fr && rm -rf; then : OK; else
+ cat >&2 <<'END'
+Oops!
+
+Your 'rm' program seems unable to run without file operands specified
+on the command line, even when the '-f' option is present. This is contrary
+to the behaviour of most rm programs out there, and not conforming with
+the upcoming POSIX standard: <http://austingroupbugs.net/view.php?id=542>
+
+Please tell bug-automake at gnu.org about your system, including the value
+of your $PATH and any error possibly output before this message. This
+can help us improve future automake versions.
+
+END
+ if test x"$ACCEPT_INFERIOR_RM_PROGRAM" = x"yes"; then
+ echo 'Configuration will proceed anyway, since you have set the' >&2
+ echo 'ACCEPT_INFERIOR_RM_PROGRAM variable to "yes"' >&2
+ echo >&2
+ else
+ cat >&2 <<'END'
+Aborting the configuration process, to ensure you take notice of the issue.
+
+You can download and install GNU coreutils to get an 'rm' implementation
+that behaves properly: <http://www.gnu.org/software/coreutils/>.
+
+If you want to complete the configuration process using your problematic
+'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM
+to "yes", and re-run configure.
+
+END
+ as_fn_error $? "Your 'rm' program is bad, sorry." "$LINENO" 5
+ fi
+fi
# Check whether --enable-silent-rules was given.
if test "${enable_silent_rules+set}" = set; then :
enableval=$enable_silent_rules;
fi
-case $enable_silent_rules in
-yes) AM_DEFAULT_VERBOSITY=0;;
-no) AM_DEFAULT_VERBOSITY=1;;
-*) AM_DEFAULT_VERBOSITY=1;;
+case $enable_silent_rules in # (((
+ yes) AM_DEFAULT_VERBOSITY=0;;
+ no) AM_DEFAULT_VERBOSITY=1;;
+ *) AM_DEFAULT_VERBOSITY=1;;
esac
am_make=${MAKE-make}
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $am_make supports nested variables" >&5
@@ -3421,7 +3523,7 @@ am__quote=
_am_result=none
# First try GNU make style include.
echo "include confinc" > confmf
-# Ignore all kinds of additional output from `make'.
+# Ignore all kinds of additional output from 'make'.
case `$am_make -s -f confmf 2> /dev/null` in #(
*the\ am__doit\ target*)
am__include=include
@@ -4254,6 +4356,65 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
ac_compiler_gnu=$ac_cv_c_compiler_gnu
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC understands -c and -o together" >&5
+$as_echo_n "checking whether $CC understands -c and -o together... " >&6; }
+if ${am_cv_prog_cc_c_o+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
+int
+main ()
+{
+
+ ;
+ return 0;
+}
+_ACEOF
+ # Make sure it works both with $CC and with simple cc.
+ # Following AC_PROG_CC_C_O, we do the test twice because some
+ # compilers refuse to overwrite an existing .o file with -o,
+ # though they will create one.
+ am_cv_prog_cc_c_o=yes
+ for am_i in 1 2; do
+ if { echo "$as_me:$LINENO: $CC -c conftest.$ac_ext -o conftest2.$ac_objext" >&5
+ ($CC -c conftest.$ac_ext -o conftest2.$ac_objext) >&5 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } \
+ && test -f conftest2.$ac_objext; then
+ : OK
+ else
+ am_cv_prog_cc_c_o=no
+ break
+ fi
+ done
+ rm -f core conftest*
+ unset am_i
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_prog_cc_c_o" >&5
+$as_echo "$am_cv_prog_cc_c_o" >&6; }
+if test "$am_cv_prog_cc_c_o" != yes; then
+ # Losing compiler, so override with the script.
+ # FIXME: It is wrong to rewrite CC.
+ # But if we don't then we get into trouble of one sort or another.
+ # A longer-term fix would be to have automake use am__CC in this case,
+ # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)"
+ CC="$am_aux_dir/compile $CC"
+fi
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+
depcc="$CC" am_compiler_list=
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5
@@ -4265,8 +4426,8 @@ else
# We make a subdir and do the tests there. Otherwise we can end up
# making bogus files that we don't know about and never remove. For
# 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'.
+ # 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
@@ -4301,16 +4462,16 @@ else
: > sub/conftest.c
for i in 1 2 3 4 5 6; do
echo '#include "conftst'$i'.h"' >> sub/conftest.c
- # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
- # Solaris 8's {/usr,}/bin/sh.
- touch sub/conftst$i.h
+ # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with
+ # Solaris 10 /bin/sh.
+ echo '/* dummy */' > sub/conftst$i.h
done
echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
- # We check with `-c' and `-o' for the sake of the "dashmstdout"
+ # We check with '-c' and '-o' for the sake of the "dashmstdout"
# mode. It turns out that the SunPro C++ compiler does not properly
- # handle `-M -o', and we need to detect this. Also, some Intel
- # versions had trouble with output in subdirs
+ # handle '-M -o', and we need to detect this. Also, some Intel
+ # versions had trouble with output in subdirs.
am__obj=sub/conftest.${OBJEXT-o}
am__minus_obj="-o $am__obj"
case $depmode in
@@ -4319,8 +4480,8 @@ else
test "$am__universal" = false || continue
;;
nosideeffect)
- # after this tag, mechanisms are not by side-effect, so they'll
- # only be used when explicitly requested
+ # After this tag, mechanisms are not by side-effect, so they'll
+ # only be used when explicitly requested.
if test "x$enable_dependency_tracking" = xyes; then
continue
else
@@ -4328,7 +4489,7 @@ else
fi
;;
msvc7 | msvc7msys | msvisualcpp | msvcmsys)
- # This compiler won't grok `-c -o', but also, the minuso test has
+ # 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.
am__obj=conftest.${OBJEXT-o}
@@ -4827,8 +4988,8 @@ else
# We make a subdir and do the tests there. Otherwise we can end up
# making bogus files that we don't know about and never remove. For
# 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'.
+ # 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
@@ -4863,16 +5024,16 @@ else
: > sub/conftest.c
for i in 1 2 3 4 5 6; do
echo '#include "conftst'$i'.h"' >> sub/conftest.c
- # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
- # Solaris 8's {/usr,}/bin/sh.
- touch sub/conftst$i.h
+ # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with
+ # Solaris 10 /bin/sh.
+ echo '/* dummy */' > sub/conftst$i.h
done
echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
- # We check with `-c' and `-o' for the sake of the "dashmstdout"
+ # We check with '-c' and '-o' for the sake of the "dashmstdout"
# mode. It turns out that the SunPro C++ compiler does not properly
- # handle `-M -o', and we need to detect this. Also, some Intel
- # versions had trouble with output in subdirs
+ # handle '-M -o', and we need to detect this. Also, some Intel
+ # versions had trouble with output in subdirs.
am__obj=sub/conftest.${OBJEXT-o}
am__minus_obj="-o $am__obj"
case $depmode in
@@ -4881,8 +5042,8 @@ else
test "$am__universal" = false || continue
;;
nosideeffect)
- # after this tag, mechanisms are not by side-effect, so they'll
- # only be used when explicitly requested
+ # After this tag, mechanisms are not by side-effect, so they'll
+ # only be used when explicitly requested.
if test "x$enable_dependency_tracking" = xyes; then
continue
else
@@ -4890,7 +5051,7 @@ else
fi
;;
msvc7 | msvc7msys | msvisualcpp | msvcmsys)
- # This compiler won't grok `-c -o', but also, the minuso test has
+ # 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.
am__obj=conftest.${OBJEXT-o}
@@ -9195,6 +9356,18 @@ if test x$enable_cdio_paranoia = xyes; then
$as_echo "#define ENABLE_CDIO_PARANOIA 1" >>confdefs.h
+ for ac_header in cdio/paranoia/paranoia.h
+do :
+ ac_fn_c_check_header_mongrel "$LINENO" "cdio/paranoia/paranoia.h" "ac_cv_header_cdio_paranoia_paranoia_h" "$ac_includes_default"
+if test "x$ac_cv_header_cdio_paranoia_paranoia_h" = xyes; then :
+ cat >>confdefs.h <<_ACEOF
+#define HAVE_CDIO_PARANOIA_PARANOIA_H 1
+_ACEOF
+
+fi
+
+done
+
fi
if test x$enable_cdio_paranoia = xyes; then
@@ -17584,6 +17757,14 @@ LIBOBJS=$ac_libobjs
LTLIBOBJS=$ac_ltlibobjs
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking that generated files are newer than configure" >&5
+$as_echo_n "checking that generated files are newer than configure... " >&6; }
+ if test -n "$am_sleep_pid"; then
+ # Hide warnings about reused PIDs.
+ wait $am_sleep_pid 2>/dev/null
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: done" >&5
+$as_echo "done" >&6; }
if test -n "$EXEEXT"; then
am__EXEEXT_TRUE=
am__EXEEXT_FALSE='#'
@@ -18273,7 +18454,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.18.5, which was
+This file was extended by mpd $as_me 0.18.6, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -18339,7 +18520,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.18.5
+mpd config.status 0.18.6
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
@@ -19070,7 +19251,7 @@ $as_echo "$as_me: executing $ac_file commands" >&6;}
case $ac_file$ac_mode in
"depfiles":C) test x"$AMDEP_TRUE" != x"" || {
- # Autoconf 2.62 quotes --file arguments for eval, but not when files
+ # Older Autoconf quotes --file arguments for eval, but not when files
# are listed without --file. Let's play safe and only enable the eval
# if we detect the quoting.
case $CONFIG_FILES in
@@ -19083,7 +19264,7 @@ $as_echo "$as_me: executing $ac_file commands" >&6;}
# Strip MF so we end up with the name of the file.
mf=`echo "$mf" | sed -e 's/:.*$//'`
# Check whether this is an Automake generated Makefile or not.
- # We used to match only the files named `Makefile.in', but
+ # We used to match only the files named 'Makefile.in', but
# some people rename them; so instead we look at the file content.
# Grep'ing the first line is not enough: some people post-process
# each Makefile.in and add a new line on top of each file to say so.
@@ -19117,21 +19298,19 @@ $as_echo X"$mf" |
continue
fi
# Extract the definition of DEPDIR, am__include, and am__quote
- # from the Makefile without running `make'.
+ # from the Makefile without running 'make'.
DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
test -z "$DEPDIR" && continue
am__include=`sed -n 's/^am__include = //p' < "$mf"`
- test -z "am__include" && continue
+ test -z "$am__include" && continue
am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
- # When using ansi2knr, U may be empty or an underscore; expand it
- U=`sed -n 's/^U = //p' < "$mf"`
# Find all dependency output files, they are included files with
# $(DEPDIR) in their names. We invoke sed twice because it is the
# simplest approach to changing $(DEPDIR) to its actual value in the
# expansion.
for file in `sed -n "
s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
- sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
+ sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g'`; do
# Make sure the directory exists.
test -f "$dirpart/$file" && continue
fdir=`$as_dirname -- "$file" ||
diff --git a/configure.ac b/configure.ac
index b55c19e..a487e4a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,6 @@
AC_PREREQ(2.60)
-AC_INIT(mpd, 0.18.5, musicpd-dev-team at lists.sourceforge.net)
+AC_INIT(mpd, 0.18.6, musicpd-dev-team at lists.sourceforge.net)
VERSION_MAJOR=0
VERSION_MINOR=18
@@ -749,6 +749,7 @@ MPD_AUTO_PKG(cdio_paranoia, CDIO_PARANOIA, [libcdio_paranoia],
if test x$enable_cdio_paranoia = xyes; then
AC_DEFINE([ENABLE_CDIO_PARANOIA], 1,
[Define to enable libcdio_paranoia support])
+ AC_CHECK_HEADERS(cdio/paranoia/paranoia.h)
fi
AM_CONDITIONAL(ENABLE_CDIO_PARANOIA, test x$enable_cdio_paranoia = xyes)
diff --git a/doc/doxygen.conf b/doc/doxygen.conf
index e56193b..f84cb83 100644
--- a/doc/doxygen.conf
+++ b/doc/doxygen.conf
@@ -31,7 +31,7 @@ PROJECT_NAME = MPD
# This could be handy for archiving the generated documentation or
# if some version control system is used.
-PROJECT_NUMBER = 0.18.5
+PROJECT_NUMBER = 0.18.6
# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute)
# base path where the generated documentation will be put.
diff --git a/doc/mpd.conf.5 b/doc/mpd.conf.5
index 3c48b5f..6431613 100644
--- a/doc/mpd.conf.5
+++ b/doc/mpd.conf.5
@@ -363,137 +363,6 @@ errors on bandwidth-limited devices. Some users have reported good results
with this set to 50000, but not all devices support values this high. Most
users do not need to change this. The default is 256000000 / sample_rate(kHz),
or 5804 microseconds for CD-quality audio.
-.SH OPTIONAL OSS OUTPUT PARAMETERS
-.TP
-.B device <dev>
-This specifies the device to use for audio output. The default is "/dev/dsp".
-.TP
-.B mixer_device <mixer dev>
-This specifies which mixer to use. The default is "/dev/mixer".
-.TP
-.B mixer_control <mixer ctrl>
-This specifies which mixer control to use (sometimes referred to as the
-"device"). The default is to use the main PCM mixer. An example is "Pcm".
-.SH OPTIONAL PULSE OUTPUT PARAMETERS
-.TP
-.B server <server list>
-A space separated list of servers to try to connect to. See
-<\fBhttp://www.pulseaudio.org/wiki/ServerStrings\fP> for more details. The
-default is to let PulseAudio choose a server.
-If you specify more than one server name, MPD tries to connect to one
-after another until it successfully establishes a connection.
-.TP
-.B sink <sink>
-The sink to output to. The default is to let PulseAudio choose a sink.
-.SH OPTIONAL JACK OUTPUT PARAMETERS
-.TP
-.B client_name <name>
-The client name to use when connecting to JACK. The output ports <name>:left
-and <name>:right will also be created for the left and right channels,
-respectively.
-.TP
-.B ports <left_port,right_port>
-This specifies the left and right ports to connect to for the left and right
-channels, respectively. The default is to let JACK choose a pair of ports.
-.TP
-.B ringbuffer_size <size in bytes>
-This specifies the size of the ringbuffer in bytes. The default is 32768.
-.SH OPTIONAL AO OUTPUT PARAMETERS
-.TP
-.B driver <driver>
-This specifies the libao driver to use for audio output. Possible values
-depend on what libao drivers are available. See
-<\fBhttp://www.xiph.org/ao/doc/drivers.html\fP> for information on some
-commonly used drivers. Typical values for Linux include "oss" and "alsa09".
-The default is "default", which causes libao to select an appropriate plugin.
-.TP
-.B options <opts>
-This specifies the options to use for the selected libao driver. For oss, the
-only option available is "dsp". For alsa09, the available options are: "dev",
-"buf_size", and "periods". See <\fBhttp://www.xiph.org/ao/doc/drivers.html\fP>
-for available options for some commonly used drivers. Options are assigned
-using "=", and ";" is used to separate options. An example for oss:
-"dsp=/dev/dsp". An example for alsa09: "dev=hw:0,0;buf_size=4096". The
-default is "".
-.TP
-.B write_size <size in bytes>
-This specifies how many bytes to write to the audio device at once. This
-parameter is to work around a bug in older versions of libao on sound cards
-with very small buffers. The default is 1024.
-.SH REQUIRED FIFO OUTPUT PARAMETERS
-.TP
-.B path <path>
-This specifies the path of the FIFO to output to. Must be an absolute path.
-If the path does not exist it will be created when mpd is started, and removed
-when mpd is stopped. The FIFO will be created with the same user and group as
-mpd is running as. Default permissions can be modified by using the builtin
-shell command "umask". If a FIFO already exists at the specified path it will
-be reused, and will \fBnot\fP be removed when mpd is stopped. You can use the
-"mkfifo" command to create this, and then you may modify the permissions to
-your liking.
-.SH REQUIRED SHOUT OUTPUT PARAMETERS
-.TP
-.B name <name>
-This specifies not only the unique audio output name, but also the stream
-title.
-.TP
-.B host <hostname>
-This specifies the hostname of the icecast server to connect to.
-.TP
-.B port <port>
-This specifies the port of the icecast server to connect to.
-.TP
-.B mount <mountpoint>
-This specifies the icecast mountpoint to use.
-.TP
-.B password <password>
-This specifies the password to use when logging in to the icecast server.
-.TP
-.B quality <quality>
-This specifies the encoding quality to use. The value must be between 0
-and 10. Fractional values, such as 2.5, are permitted. Either the quality or
-the bitrate parameter must be specified, but not both. For Ogg, a
-higher quality number produces higher quality output. For MP3, it's
-just the opposite, with lower numbers producing higher quality output.
-.TP
-.B bitrate <kbps>
-This specifies the bitrate to use for encoding. Either the quality or the
-bitrate parameter must be specified, but not both.
-.TP
-.B format <sample_rate:bits:channels>
-This specifies the sample rate, bits per sample, and number of channels to use
-for encoding.
-.SH OPTIONAL SHOUT OUTPUT PARAMETERS
-.TP
-.B encoding <encoding>
-This specifies which output encoding to use. Should be either "ogg"
-or "mp3", "mp3" is needed for shoutcast streaming. The default is "ogg".
-.TP
-.B protocol <protocol>
-This specifies the protocol that wil be used to connect to the
-icecast/shoutcast server. The options are "shoutcast", "icecast1" and
-"icecast2". The default is "icecast2".
-.TP
-.B user <username>
-This specifies the username to use when logging in to the icecast server. The
-default is "source".
-.TP
-.B public <yes or no>
-This specifies whether to request that the stream be listed in all public
-stream directories that the icecast server knows about. The default is no.
-.TP
-.B timeout <seconds>
-This specifies the number of seconds to wait before giving up on trying to
-connect to the icecast server. The default is 2 seconds.
-.TP
-.B description <description>
-This specifies a description of the stream.
-.TP
-.B url <url>
-This specifies a URL associated with the stream.
-.TP
-.B genre <genre>
-This specifies the genre(s) of the stream.
.SH FILES
.TP
.BI ~/.mpdconf
diff --git a/doc/user.xml b/doc/user.xml
index 7728051..99278a6 100644
--- a/doc/user.xml
+++ b/doc/user.xml
@@ -1398,6 +1398,59 @@ systemctl start mpd.socket</programlisting>
The <varname>ao</varname> plugin uses the portable
<filename>libao</filename> library.
</para>
+
+ <informaltable>
+ <tgroup cols="2">
+ <thead>
+ <row>
+ <entry>Setting</entry>
+ <entry>Description</entry>
+ </row>
+ </thead>
+ <tbody>
+ <row>
+ <entry>
+ <varname>driver</varname>
+ <parameter>D</parameter>
+ </entry>
+ <entry>
+ The <filename>libao</filename> driver to use for
+ audio output. Possible values depend on what libao
+ drivers are available. See <ulink
+ url="http://www.xiph.org/ao/doc/drivers.html">http://www.xiph.org/ao/doc/drivers.html</ulink>
+ for information on some commonly used drivers.
+ Typical values for Linux include "oss" and "alsa09".
+ The default is "default", which causes libao to
+ select an appropriate plugin.
+ </entry>
+ </row>
+
+ <row>
+ <entry>
+ <varname>options</varname>
+ <parameter>O</parameter>
+ </entry>
+ <entry>
+ Options to pass to the selected
+ <filename>libao</filename> driver.
+ </entry>
+ </row>
+
+ <row>
+ <entry>
+ <varname>write_size</varname>
+ <parameter>O</parameter>
+ </entry>
+ <entry>
+ This specifies how many bytes to write to the audio
+ device at once. This parameter is to work around a
+ bug in older versions of libao on sound cards with
+ very small buffers. The default is 1024.
+ </entry>
+ </row>
+ </tbody>
+ </tgroup>
+ </informaltable>
</section>
<section>
@@ -1408,6 +1461,38 @@ systemctl start mpd.socket</programlisting>
FIFO (First In, First Out) file. The data can be read by
another program.
</para>
+
+ <informaltable>
+ <tgroup cols="2">
+ <thead>
+ <row>
+ <entry>Setting</entry>
+ <entry>Description</entry>
+ </row>
+ </thead>
+ <tbody>
+ <row>
+ <entry>
+ <varname>path</varname>
+ <parameter>P</parameter>
+ </entry>
+ <entry>
+ This specifies the path of the FIFO to write to.
+ Must be an absolute path. If the path does not
+ exist, it will be created when MPD is started, and
+ removed when MPD is stopped. The FIFO will be
+ created with the same user and group as MPD is
+ running as. Default permissions can be modified by
+ using the builtin shell command "umask". If a FIFO
+ already exists at the specified path it will be
+ reused, and will not be removed when MPD is stopped.
+ You can use the "mkfifo" command to create this, and
+ then you may modify the permissions to your liking.
+ </entry>
+ </row>
+ </tbody>
+ </tgroup>
+ </informaltable>
</section>
<section>
@@ -1885,6 +1970,18 @@ systemctl start mpd.socket</programlisting>
</row>
<row>
<entry>
+ <varname>protocol</varname>
+ <parameter>icecast2|icecast1|shoutcast</parameter>
+ </entry>
+ <entry>
+ Specifies the protocol that wil be used to connect
+ to the icecast/shoutcast server. The default
+ is "<parameter>icecast2</parameter>".
+
+ </entry>
+ </row>
+ <row>
+ <entry>
<varname>mount</varname>
<parameter>URI</parameter>
</entry>
diff --git a/src/OutputControl.cxx b/src/OutputControl.cxx
index 553507a..27f2802 100644
--- a/src/OutputControl.cxx
+++ b/src/OutputControl.cxx
@@ -101,6 +101,8 @@ audio_output_set_replay_gain_mode(struct audio_output *ao,
{
if (ao->replay_gain_filter != nullptr)
replay_gain_filter_set_mode(ao->replay_gain_filter, mode);
+ if (ao->other_replay_gain_filter != nullptr)
+ replay_gain_filter_set_mode(ao->other_replay_gain_filter, mode);
}
void
diff --git a/src/PlayerThread.cxx b/src/PlayerThread.cxx
index 6fb41bf..356559e 100644
--- a/src/PlayerThread.cxx
+++ b/src/PlayerThread.cxx
@@ -1081,8 +1081,11 @@ Player::Run()
delete cross_fade_tag;
- if (song != nullptr)
+ if (song != nullptr) {
+ const auto uri = song->GetURI();
+ FormatDefault(player_domain, "played \"%s\"", uri.c_str());
song->Free();
+ }
pc.Lock();
diff --git a/src/SongUpdate.cxx b/src/SongUpdate.cxx
index a347342..1a873fe 100644
--- a/src/SongUpdate.cxx
+++ b/src/SongUpdate.cxx
@@ -95,8 +95,7 @@ Song::UpdateFile()
TagBuilder tag_builder;
if (!tag_file_scan(path_fs,
- &full_tag_handler, &tag_builder) ||
- !tag_builder.IsDefined())
+ &full_tag_handler, &tag_builder))
return false;
if (tag_builder.IsEmpty())
diff --git a/src/TagFile.hxx b/src/TagFile.hxx
index 3a49a04..078abeb 100644
--- a/src/TagFile.hxx
+++ b/src/TagFile.hxx
@@ -28,6 +28,9 @@ struct tag_handler;
/**
* Scan the tags of a song file. Invokes matching decoder plugins,
* but does not invoke the special "APE" and "ID3" scanners.
+ *
+ * @return true if the file was recognized (even if no metadata was
+ * found)
*/
bool
tag_file_scan(Path path,
diff --git a/src/decoder/FfmpegDecoderPlugin.cxx b/src/decoder/FfmpegDecoderPlugin.cxx
index 1b62eae..47e1a33 100644
--- a/src/decoder/FfmpegDecoderPlugin.cxx
+++ b/src/decoder/FfmpegDecoderPlugin.cxx
@@ -120,8 +120,7 @@ mpd_ffmpeg_stream_seek(void *opaque, int64_t pos, int whence)
if (whence == AVSEEK_SIZE)
return stream->input.size;
- Error error;
- if (!stream->input.LockSeek(pos, whence, error))
+ if (!stream->input.LockSeek(pos, whence, IgnoreError()))
return -1;
return stream->input.offset;
@@ -252,13 +251,14 @@ static DecoderCommand
ffmpeg_send_packet(Decoder &decoder, InputStream &is,
const AVPacket *packet,
AVCodecContext *codec_context,
- const AVRational *time_base,
+ const AVStream *stream,
AVFrame *frame,
uint8_t **buffer, int *buffer_size)
{
if (packet->pts >= 0 && packet->pts != (int64_t)AV_NOPTS_VALUE)
decoder_timestamp(decoder,
- time_from_ffmpeg(packet->pts, *time_base));
+ time_from_ffmpeg(packet->pts - stream->start_time,
+ stream->time_base));
AVPacket packet2 = *packet;
@@ -342,11 +342,9 @@ ffmpeg_probe(Decoder *decoder, InputStream &is)
PADDING = 16,
};
- Error error;
-
unsigned char buffer[BUFFER_SIZE];
size_t nbytes = decoder_read(decoder, is, buffer, BUFFER_SIZE);
- if (nbytes <= PADDING || !is.LockRewind(error))
+ if (nbytes <= PADDING || !is.LockRewind(IgnoreError()))
return nullptr;
/* some ffmpeg parsers (e.g. ac3_parser.c) read a few bytes
@@ -473,7 +471,7 @@ ffmpeg_decode(Decoder &decoder, InputStream &input)
if (packet.stream_index == audio_stream)
cmd = ffmpeg_send_packet(decoder, input,
&packet, codec_context,
- &av_stream->time_base,
+ av_stream,
frame,
&interleaved_buffer, &interleaved_buffer_size);
else
@@ -484,7 +482,8 @@ ffmpeg_decode(Decoder &decoder, InputStream &input)
if (cmd == DecoderCommand::SEEK) {
int64_t where =
time_to_ffmpeg(decoder_seek_where(decoder),
- av_stream->time_base);
+ av_stream->time_base) +
+ av_stream->start_time;
if (av_seek_frame(format_context, audio_stream, where,
AV_TIME_BASE) < 0)
diff --git a/src/input/CdioParanoiaInputPlugin.cxx b/src/input/CdioParanoiaInputPlugin.cxx
index cc366bf..b3ac574 100644
--- a/src/input/CdioParanoiaInputPlugin.cxx
+++ b/src/input/CdioParanoiaInputPlugin.cxx
@@ -41,7 +41,12 @@
#include <glib.h>
#include <assert.h>
+#ifdef HAVE_CDIO_PARANOIA_PARANOIA_H
+#include <cdio/paranoia/paranoia.h>
+#else
#include <cdio/paranoia.h>
+#endif
+
#include <cdio/cd_types.h>
struct CdioParanoiaInputStream {
diff --git a/src/mixer/AlsaMixerPlugin.cxx b/src/mixer/AlsaMixerPlugin.cxx
index 7defdd7..4a4ca43 100644
--- a/src/mixer/AlsaMixerPlugin.cxx
+++ b/src/mixer/AlsaMixerPlugin.cxx
@@ -24,6 +24,7 @@
#include "Main.hxx"
#include "event/MultiSocketMonitor.hxx"
#include "event/Loop.hxx"
+#include "event/Call.hxx"
#include "util/ASCII.hxx"
#include "util/ReusableArray.hxx"
#include "util/Error.hxx"
@@ -46,10 +47,22 @@ class AlsaMixerMonitor final : private MultiSocketMonitor {
public:
AlsaMixerMonitor(EventLoop &_loop, snd_mixer_t *_mixer)
:MultiSocketMonitor(_loop), mixer(_mixer) {
+#ifdef USE_EPOLL
_loop.AddCall([this](){ InvalidateSockets(); });
+#else
+ _loop.AddIdle(InitAlsaMixerMonitor, this);
+#endif
}
private:
+#ifndef USE_EPOLL
+ static gboolean InitAlsaMixerMonitor(gpointer data) {
+ AlsaMixerMonitor &amm = *(AlsaMixerMonitor *)data;
+ amm.InvalidateSockets();
+ return false;
+ }
+#endif
+
virtual int PrepareSockets() override;
virtual void DispatchSockets() override;
};
diff --git a/src/output/OSXOutputPlugin.cxx b/src/output/OSXOutputPlugin.cxx
index 7debe6a..97ebae0 100644
--- a/src/output/OSXOutputPlugin.cxx
+++ b/src/output/OSXOutputPlugin.cxx
@@ -363,9 +363,9 @@ osx_output_open(struct audio_output *ao, AudioFormat &audio_format,
OSStatus status = AudioUnitInitialize(od->au);
if (status != noErr) {
- error.Set(osx_output_domain, status,
- "Unable to initialize OS X audio unit: %s",
- GetMacOSStatusCommentString(status));
+ error.Format(osx_output_domain, status,
+ "Unable to initialize OS X audio unit: %s",
+ GetMacOSStatusCommentString(status));
return false;
}
diff --git a/src/output/OpenALOutputPlugin.cxx b/src/output/OpenALOutputPlugin.cxx
index e753b20..268cf17 100644
--- a/src/output/OpenALOutputPlugin.cxx
+++ b/src/output/OpenALOutputPlugin.cxx
@@ -25,7 +25,7 @@
#include <glib.h>
-#ifndef HAVE_OSX
+#ifndef __APPLE__
#include <AL/al.h>
#include <AL/alc.h>
#else
diff --git a/src/tag/Riff.cxx b/src/tag/Riff.cxx
index ad64afc..ac162bc 100644
--- a/src/tag/Riff.cxx
+++ b/src/tag/Riff.cxx
@@ -87,7 +87,8 @@ riff_seek_id3(FILE *file)
/* pad byte */
++size;
- if (memcmp(chunk.id, "id3 ", 4) == 0)
+ if (memcmp(chunk.id, "id3 ", 4) == 0 ||
+ memcmp(chunk.id, "ID3 ", 4) == 0)
/* found it! */
return size;
diff --git a/src/util/Error.hxx b/src/util/Error.hxx
index facb461..ec8867c 100644
--- a/src/util/Error.hxx
+++ b/src/util/Error.hxx
@@ -24,6 +24,7 @@
#include "Compiler.h"
#include <string>
+#include <algorithm>
#include <assert.h>
diff --git a/test-driver b/test-driver
new file mode 100755
index 0000000..32bf39e
--- /dev/null
+++ b/test-driver
@@ -0,0 +1,127 @@
+#! /bin/sh
+# test-driver - basic testsuite driver script.
+
+scriptversion=2012-06-27.10; # UTC
+
+# Copyright (C) 2011-2013 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
+# the Free Software Foundation; either version 2, 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, 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
+# configuration script generated by Autoconf, you may include it under
+# the same distribution terms that you use for the rest of that program.
+
+# This file is maintained in Automake, please report
+# bugs to <bug-automake at gnu.org> or send patches to
+# <automake-patches at gnu.org>.
+
+# Make unconditional expansion of undefined variables an error. This
+# helps a lot in preventing typo-related bugs.
+set -u
+
+usage_error ()
+{
+ echo "$0: $*" >&2
+ print_usage >&2
+ exit 2
+}
+
+print_usage ()
+{
+ cat <<END
+Usage:
+ test-driver --test-name=NAME --log-file=PATH --trs-file=PATH
+ [--expect-failure={yes|no}] [--color-tests={yes|no}]
+ [--enable-hard-errors={yes|no}] [--] TEST-SCRIPT
+The '--test-name', '--log-file' and '--trs-file' options are mandatory.
+END
+}
+
+# TODO: better error handling in option parsing (in particular, ensure
+# TODO: $log_file, $trs_file and $test_name are defined).
+test_name= # Used for reporting.
+log_file= # Where to save the output of the test script.
+trs_file= # Where to save the metadata of the test run.
+expect_failure=no
+color_tests=no
+enable_hard_errors=yes
+while test $# -gt 0; do
+ case $1 in
+ --help) print_usage; exit $?;;
+ --version) echo "test-driver $scriptversion"; exit $?;;
+ --test-name) test_name=$2; shift;;
+ --log-file) log_file=$2; shift;;
+ --trs-file) trs_file=$2; shift;;
+ --color-tests) color_tests=$2; shift;;
+ --expect-failure) expect_failure=$2; shift;;
+ --enable-hard-errors) enable_hard_errors=$2; shift;;
+ --) shift; break;;
+ -*) usage_error "invalid option: '$1'";;
+ esac
+ shift
+done
+
+if test $color_tests = yes; then
+ # Keep this in sync with 'lib/am/check.am:$(am__tty_colors)'.
+ red='[0;31m' # Red.
+ grn='[0;32m' # Green.
+ lgn='[1;32m' # Light green.
+ blu='[1;34m' # Blue.
+ mgn='[0;35m' # Magenta.
+ std='[m' # No color.
+else
+ red= grn= lgn= blu= mgn= std=
+fi
+
+do_exit='rm -f $log_file $trs_file; (exit $st); exit $st'
+trap "st=129; $do_exit" 1
+trap "st=130; $do_exit" 2
+trap "st=141; $do_exit" 13
+trap "st=143; $do_exit" 15
+
+# Test script is run here.
+"$@" >$log_file 2>&1
+estatus=$?
+if test $enable_hard_errors = no && test $estatus -eq 99; then
+ estatus=1
+fi
+
+case $estatus:$expect_failure in
+ 0:yes) col=$red res=XPASS recheck=yes gcopy=yes;;
+ 0:*) col=$grn res=PASS recheck=no gcopy=no;;
+ 77:*) col=$blu res=SKIP recheck=no gcopy=yes;;
+ 99:*) col=$mgn res=ERROR recheck=yes gcopy=yes;;
+ *:yes) col=$lgn res=XFAIL recheck=no gcopy=yes;;
+ *:*) col=$red res=FAIL recheck=yes gcopy=yes;;
+esac
+
+# Report outcome to console.
+echo "${col}${res}${std}: $test_name"
+
+# Register the test result, and other relevant metadata.
+echo ":test-result: $res" > $trs_file
+echo ":global-test-result: $res" >> $trs_file
+echo ":recheck: $recheck" >> $trs_file
+echo ":copy-in-global-log: $gcopy" >> $trs_file
+
+# Local Variables:
+# mode: shell-script
+# sh-indentation: 2
+# eval: (add-hook 'write-file-hooks 'time-stamp)
+# time-stamp-start: "scriptversion="
+# time-stamp-format: "%:y-%02m-%02d.%02H"
+# time-stamp-time-zone: "UTC"
+# time-stamp-end: "; # UTC"
+# End:
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-mpd/pkg-mpd.git
More information about the Pkg-mpd-commits
mailing list