Skip to content

M
mpd
Commit 7ed8833f authored by Max Kellermann's avatar Max Kellermann
Browse files
Options

Makefile.am: add variable FS_LIBS

parent 9fb351a1
Hide whitespace changes
Inline Side-by-side
Showing with 18 additions and 16 deletions
Makefile.am
View file @ 7ed8833f
...@@ -59,7 +59,7 @@ src_mpd_LDADD = \ ...@@ -59,7 +59,7 @@ src_mpd_LDADD = \
libsystem.a \ libsystem.a \
$(ICU_LDADD) \ $(ICU_LDADD) \
libutil.a \ libutil.a \
libfs.a \ $(FS_LIBS) \
$(SYSTEMD_DAEMON_LIBS) \ $(SYSTEMD_DAEMON_LIBS) \
$(GLIB_LIBS) $(GLIB_LIBS)
...@@ -502,6 +502,8 @@ endif ...@@ -502,6 +502,8 @@ endif
# File system library # File system library
FS_LIBS = libfs.a
libfs_a_SOURCES = \ libfs_a_SOURCES = \
src/fs/output/OutputStream.hxx \ src/fs/output/OutputStream.hxx \
src/fs/output/StdoutOutputStream.hxx \ src/fs/output/StdoutOutputStream.hxx \
...@@ -1480,7 +1482,7 @@ endif ...@@ -1480,7 +1482,7 @@ endif
test_read_conf_LDADD = \ test_read_conf_LDADD = \
libconf.a \ libconf.a \
libsystem.a \ libsystem.a \
libfs.a \ $(FS_LIBS) \
libutil.a \ libutil.a \
$(GLIB_LIBS) $(GLIB_LIBS)
test_read_conf_SOURCES = \ test_read_conf_SOURCES = \
...@@ -1504,7 +1506,7 @@ test_DumpDatabase_LDADD = \ ...@@ -1504,7 +1506,7 @@ test_DumpDatabase_LDADD = \
libutil.a \ libutil.a \
libevent.a \ libevent.a \
libsystem.a \ libsystem.a \
libfs.a \ $(FS_LIBS) \
$(ICU_LDADD) \ $(ICU_LDADD) \
$(GLIB_LIBS) $(GLIB_LIBS)
test_DumpDatabase_SOURCES = test/DumpDatabase.cxx \ test_DumpDatabase_SOURCES = test/DumpDatabase.cxx \
...@@ -1535,7 +1537,7 @@ test_run_input_LDADD = \ ...@@ -1535,7 +1537,7 @@ test_run_input_LDADD = \
libevent.a \ libevent.a \
libthread.a \ libthread.a \
libsystem.a \ libsystem.a \
libfs.a \ $(FS_LIBS) \
$(GLIB_LIBS) $(GLIB_LIBS)
test_run_input_SOURCES = test/run_input.cxx \ test_run_input_SOURCES = test/run_input.cxx \
test/stdbin.h \ test/stdbin.h \
...@@ -1557,7 +1559,7 @@ test_run_neighbor_explorer_LDADD = $(AM_LDADD) \ ...@@ -1557,7 +1559,7 @@ test_run_neighbor_explorer_LDADD = $(AM_LDADD) \
libtag.a \ libtag.a \
libconf.a \ libconf.a \
libevent.a \ libevent.a \
libfs.a \ $(FS_LIBS) \
libsystem.a \ libsystem.a \
libthread.a \ libthread.a \
libutil.a libutil.a
...@@ -1585,7 +1587,7 @@ test_visit_archive_LDADD = \ ...@@ -1585,7 +1587,7 @@ test_visit_archive_LDADD = \
libevent.a \ libevent.a \
libthread.a \ libthread.a \
libsystem.a \ libsystem.a \
libfs.a \ $(FS_LIBS) \
$(GLIB_LIBS) $(GLIB_LIBS)
test_visit_archive_SOURCES = test/visit_archive.cxx \ test_visit_archive_SOURCES = test/visit_archive.cxx \
src/Log.cxx src/LogBackend.cxx \ src/Log.cxx src/LogBackend.cxx \
...@@ -1600,7 +1602,7 @@ test_dump_text_file_LDADD = \ ...@@ -1600,7 +1602,7 @@ test_dump_text_file_LDADD = \
$(TAG_LIBS) \ $(TAG_LIBS) \
libconf.a \ libconf.a \
libevent.a \ libevent.a \
libfs.a \ $(FS_LIBS) \
libsystem.a \ libsystem.a \
libthread.a \ libthread.a \
libutil.a \ libutil.a \
...@@ -1621,7 +1623,7 @@ test_dump_playlist_LDADD = \ ...@@ -1621,7 +1623,7 @@ test_dump_playlist_LDADD = \
libevent.a \ libevent.a \
libthread.a \ libthread.a \
libsystem.a \ libsystem.a \
libfs.a \ $(FS_LIBS) \
libutil.a \ libutil.a \
libpcm.a \ libpcm.a \
$(GLIB_LIBS) $(GLIB_LIBS)
...@@ -1651,7 +1653,7 @@ test_run_decoder_LDADD = \ ...@@ -1651,7 +1653,7 @@ test_run_decoder_LDADD = \
libevent.a \ libevent.a \
libthread.a \ libthread.a \
libsystem.a \ libsystem.a \
libfs.a \ $(FS_LIBS) \
libutil.a \ libutil.a \
$(GLIB_LIBS) $(GLIB_LIBS)
test_run_decoder_SOURCES = test/run_decoder.cxx \ test_run_decoder_SOURCES = test/run_decoder.cxx \
...@@ -1676,7 +1678,7 @@ test_read_tags_LDADD = \ ...@@ -1676,7 +1678,7 @@ test_read_tags_LDADD = \
libevent.a \ libevent.a \
libthread.a \ libthread.a \
libsystem.a \ libsystem.a \
libfs.a \ $(FS_LIBS) \
libutil.a \ libutil.a \
$(GLIB_LIBS) $(GLIB_LIBS)
test_read_tags_SOURCES = test/read_tags.cxx \ test_read_tags_SOURCES = test/read_tags.cxx \
...@@ -1701,7 +1703,7 @@ test_run_filter_LDADD = \ ...@@ -1701,7 +1703,7 @@ test_run_filter_LDADD = \
$(FILTER_LIBS) \ $(FILTER_LIBS) \
libconf.a \ libconf.a \
libsystem.a \ libsystem.a \
libfs.a \ $(FS_LIBS) \
libutil.a \ libutil.a \
$(GLIB_LIBS) $(GLIB_LIBS)
test_run_filter_SOURCES = test/run_filter.cxx \ test_run_filter_SOURCES = test/run_filter.cxx \
...@@ -1729,7 +1731,7 @@ test_run_encoder_LDADD = \ ...@@ -1729,7 +1731,7 @@ test_run_encoder_LDADD = \
libpcm.a \ libpcm.a \
libthread.a \ libthread.a \
libsystem.a \ libsystem.a \
libfs.a \ $(FS_LIBS) \
libutil.a \ libutil.a \
$(GLIB_LIBS) $(GLIB_LIBS)
endif endif
...@@ -1751,7 +1753,7 @@ test_test_vorbis_encoder_LDADD = $(MPD_LIBS) \ ...@@ -1751,7 +1753,7 @@ test_test_vorbis_encoder_LDADD = $(MPD_LIBS) \
$(TAG_LIBS) \ $(TAG_LIBS) \
libconf.a \ libconf.a \
libsystem.a \ libsystem.a \
libfs.a \ $(FS_LIBS) \
libutil.a \ libutil.a \
$(GLIB_LIBS) $(GLIB_LIBS)
endif endif
...@@ -1807,7 +1809,7 @@ test_run_output_LDADD = $(MPD_LIBS) \ ...@@ -1807,7 +1809,7 @@ test_run_output_LDADD = $(MPD_LIBS) \
$(TAG_LIBS) \ $(TAG_LIBS) \
libconf.a \ libconf.a \
libevent.a \ libevent.a \
libfs.a \ $(FS_LIBS) \
libsystem.a \ libsystem.a \
libthread.a \ libthread.a \
libutil.a \ libutil.a \
...@@ -1836,7 +1838,7 @@ test_read_mixer_LDADD = \ ...@@ -1836,7 +1838,7 @@ test_read_mixer_LDADD = \
libconf.a \ libconf.a \
libevent.a \ libevent.a \
libsystem.a \ libsystem.a \
libfs.a \ $(FS_LIBS) \
libutil.a \ libutil.a \
$(GLIB_LIBS) $(GLIB_LIBS)
test_read_mixer_SOURCES = test/read_mixer.cxx \ test_read_mixer_SOURCES = test/read_mixer.cxx \
...@@ -1967,7 +1969,7 @@ test_test_translate_song_CXXFLAGS = $(AM_CXXFLAGS) -Wno-error=deprecated-declara ...@@ -1967,7 +1969,7 @@ test_test_translate_song_CXXFLAGS = $(AM_CXXFLAGS) -Wno-error=deprecated-declara
test_test_translate_song_LDADD = \ test_test_translate_song_LDADD = \
$(STORAGE_LIBS) \ $(STORAGE_LIBS) \
libtag.a \ libtag.a \
libfs.a \ $(FS_LIBS) \
libsystem.a \ libsystem.a \
libutil.a \ libutil.a \
$(GLIB_LIBS) \ $(GLIB_LIBS) \
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment