aboutsummaryrefslogtreecommitdiffstats
path: root/Makefile.am
diff options
context:
space:
mode:
Diffstat (limited to 'Makefile.am')
-rw-r--r--Makefile.am65
1 files changed, 52 insertions, 13 deletions
diff --git a/Makefile.am b/Makefile.am
index 89b643530..a054dd6ed 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -12,6 +12,7 @@ noinst_LIBRARIES = \
libpcm.a \
libtag.a \
libinput.a \
+ libdb_plugins.a \
libplaylist_plugins.a \
libdecoder_plugins.a \
libfilter_plugins.a \
@@ -19,10 +20,12 @@ noinst_LIBRARIES = \
liboutput_plugins.a
src_mpd_CPPFLAGS = $(AM_CPPFLAGS) \
+ $(LIBMPDCLIENT_CFLAGS) \
$(AVAHI_CFLAGS) \
$(LIBWRAP_CFLAGS) \
$(SQLITE_CFLAGS)
src_mpd_LDADD = \
+ $(DB_LIBS) \
$(PLAYLIST_LIBS) \
$(AVAHI_LIBS) \
$(LIBWRAP_LDFLAGS) \
@@ -87,6 +90,7 @@ mpd_headers = \
src/encoder_api.h \
src/exclude.h \
src/fd_util.h \
+ src/gerror.h \
src/glib_compat.h \
src/update.h \
src/inotify_source.h \
@@ -182,6 +186,7 @@ mpd_headers = \
src/replay_gain_info.h \
src/replay_gain_ape.h \
src/sig_handlers.h \
+ src/time_print.c src/time_print.h \
src/song.h \
src/song_print.h \
src/song_save.h \
@@ -235,30 +240,33 @@ src_mpd_SOURCES = \
src/audio_parser.c \
src/protocol/argparser.c src/protocol/argparser.h \
src/protocol/result.c src/protocol/result.h \
+ src/CommandError.cxx src/CommandError.h \
src/command.c \
+ src/DatabaseCommands.cxx \
src/idle.c \
src/cmdline.c \
src/conf.c \
src/crossfade.c \
src/cue/cue_parser.c src/cue/cue_parser.h \
- src/dbUtils.c \
+ src/decoder_error.h \
src/decoder_thread.c \
src/decoder_control.c \
src/decoder_api.c \
src/decoder_internal.c \
src/decoder_print.c \
- src/directory.c \
+ src/Directory.cxx \
src/directory_save.c \
- src/database.c \
- src/db_internal.h \
+ src/DatabaseGlue.cxx \
+ src/DatabasePrint.cxx src/DatabasePrint.hxx \
+ src/DatabaseQueue.cxx src/DatabaseQueue.hxx \
+ src/DatabasePlaylist.cxx src/DatabasePlaylist.hxx \
src/db_error.h \
src/db_lock.c src/db_lock.h \
src/db_save.c src/db_save.h \
- src/db_print.c src/db_print.h \
- src/db_plugin.h \
src/db_visitor.h \
- src/db_selection.h \
- src/db/simple_db_plugin.c src/db/simple_db_plugin.h \
+ src/DatabasePlugin.hxx \
+ src/DatabaseVisitor.hxx \
+ src/DatabaseSelection.hxx \
src/exclude.c \
src/fd_util.c \
src/fifo_buffer.c src/fifo_buffer.h \
@@ -329,14 +337,14 @@ src_mpd_SOURCES = \
src/replay_gain_config.c \
src/replay_gain_info.c \
src/sig_handlers.c \
- src/song.c \
+ src/Song.cxx \
src/song_update.c \
src/song_print.c \
src/song_save.c \
src/resolver.c src/resolver.h \
src/socket_util.c \
src/state_file.c \
- src/stats.c \
+ src/Stats.cxx \
src/tag.c \
src/tag_pool.c \
src/tag_print.c \
@@ -427,6 +435,21 @@ if HAVE_LIBSAMPLERATE
libpcm_a_SOURCES += src/pcm_resample_libsamplerate.c
endif
+# database plugins
+
+libdb_plugins_a_SOURCES = \
+ src/DatabaseRegistry.cxx src/DatabaseRegistry.hxx \
+ src/db/SimpleDatabasePlugin.cxx src/db/SimpleDatabasePlugin.hxx
+
+if HAVE_LIBMPDCLIENT
+libdb_plugins_a_SOURCES += \
+ src/db/ProxyDatabasePlugin.cxx src/db/ProxyDatabasePlugin.hxx
+endif
+
+DB_LIBS = \
+ $(LIBMPDCLIENT_LIBS) \
+ libdb_plugins.a
+
# archive plugins
if ENABLE_ARCHIVE
@@ -773,6 +796,7 @@ OUTPUT_API_SRC = \
src/output_list.c \
src/output_all.c \
src/output_thread.c \
+ src/output_error.h \
src/output_control.c \
src/output_state.c \
src/output_print.c \
@@ -998,6 +1022,7 @@ noinst_PROGRAMS = \
$(C_TESTS) \
test/read_conf \
test/run_resolver \
+ test/DumpDatabase \
test/run_input \
test/dump_text_file \
test/dump_playlist \
@@ -1028,6 +1053,22 @@ test_run_resolver_LDADD = \
test_run_resolver_SOURCES = test/run_resolver.c \
src/resolver.c
+test_DumpDatabase_LDADD = \
+ $(DB_LIBS) \
+ libutil.a \
+ $(GLIB_LIBS)
+test_DumpDatabase_SOURCES = test/DumpDatabase.cxx \
+ src/DatabaseRegistry.cxx \
+ src/Directory.cxx src/directory_save.c \
+ src/playlist_vector.c src/playlist_database.c \
+ src/db_lock.c src/db_save.c \
+ src/Song.cxx src/song_sort.c src/song_save.c \
+ src/tag.c src/tag_pool.c src/tag_save.c \
+ src/path.c \
+ src/locate.c \
+ src/text_file.c \
+ src/conf.c src/tokenizer.c src/utils.c src/string_util.c
+
test_run_input_LDADD = \
$(INPUT_LIBS) \
$(ARCHIVE_LIBS) \
@@ -1065,7 +1106,7 @@ test_dump_playlist_SOURCES = test/dump_playlist.c \
src/io_thread.c src/io_thread.h \
src/conf.c src/tokenizer.c src/utils.c src/string_util.c\
src/uri.c \
- src/song.c src/tag.c src/tag_pool.c src/tag_save.c \
+ src/Song.cxx src/tag.c src/tag_pool.c src/tag_save.c \
src/tag_handler.c src/tag_file.c \
src/audio_check.c src/pcm_buffer.c \
src/text_input_stream.c src/fifo_buffer.c \
@@ -1314,7 +1355,6 @@ test_test_queue_priority_SOURCES = \
test_test_queue_priority_LDADD = \
$(GLIB_LIBS)
-if HAVE_CXX
noinst_PROGRAMS += src/dsd2pcm/dsd2pcm
src_dsd2pcm_dsd2pcm_SOURCES = \
@@ -1322,7 +1362,6 @@ src_dsd2pcm_dsd2pcm_SOURCES = \
src/dsd2pcm/noiseshape.c src/dsd2pcm/noiseshape.h \
src/dsd2pcm/main.cpp
src_dsd2pcm_dsd2pcm_LDADD = libutil.a
-endif
endif