Commit 8c5ea7ec authored by Max Kellermann's avatar Max Kellermann

Makefile.am: add DespotifyUtils.cxx to libinput.a and libplaylist_plugins.a

Simplifies test program rules.
parent 412d1b0a
...@@ -230,12 +230,6 @@ src_mpd_DEPENDENCIES = src/win32/mpd_win32_rc.$(OBJEXT) ...@@ -230,12 +230,6 @@ src_mpd_DEPENDENCIES = src/win32/mpd_win32_rc.$(OBJEXT)
src_mpd_LDFLAGS = -Wl,src/win32/mpd_win32_rc.$(OBJEXT) src_mpd_LDFLAGS = -Wl,src/win32/mpd_win32_rc.$(OBJEXT)
endif endif
if ENABLE_DESPOTIFY
src_mpd_SOURCES += \
src/lib/despotify/DespotifyUtils.cxx \
src/lib/despotify/DespotifyUtils.hxx
endif
if ENABLE_INOTIFY if ENABLE_INOTIFY
src_mpd_SOURCES += \ src_mpd_SOURCES += \
src/db/update/InotifyDomain.cxx src/db/update/InotifyDomain.hxx \ src/db/update/InotifyDomain.cxx src/db/update/InotifyDomain.hxx \
...@@ -921,6 +915,8 @@ endif ...@@ -921,6 +915,8 @@ endif
if ENABLE_DESPOTIFY if ENABLE_DESPOTIFY
libinput_a_SOURCES += \ libinput_a_SOURCES += \
src/lib/despotify/DespotifyUtils.cxx \
src/lib/despotify/DespotifyUtils.hxx \
src/input/plugins/DespotifyInputPlugin.cxx \ src/input/plugins/DespotifyInputPlugin.cxx \
src/input/plugins/DespotifyInputPlugin.hxx src/input/plugins/DespotifyInputPlugin.hxx
endif endif
...@@ -1114,6 +1110,8 @@ PLAYLIST_LIBS = \ ...@@ -1114,6 +1110,8 @@ PLAYLIST_LIBS = \
if ENABLE_DESPOTIFY if ENABLE_DESPOTIFY
libplaylist_plugins_a_SOURCES += \ libplaylist_plugins_a_SOURCES += \
src/lib/despotify/DespotifyUtils.cxx \
src/lib/despotify/DespotifyUtils.hxx \
src/playlist/plugins/DespotifyPlaylistPlugin.cxx \ src/playlist/plugins/DespotifyPlaylistPlugin.cxx \
src/playlist/plugins/DespotifyPlaylistPlugin.hxx src/playlist/plugins/DespotifyPlaylistPlugin.hxx
endif endif
...@@ -1350,10 +1348,6 @@ test_visit_archive_SOURCES = test/visit_archive.cxx \ ...@@ -1350,10 +1348,6 @@ test_visit_archive_SOURCES = test/visit_archive.cxx \
src/IOThread.cxx \ src/IOThread.cxx \
src/input/InputStream.cxx src/input/InputStream.cxx
if ENABLE_DESPOTIFY
test_visit_archive_SOURCES += src/lib/despotify/DespotifyUtils.cxx
endif
endif endif
test_dump_text_file_LDADD = \ test_dump_text_file_LDADD = \
...@@ -1477,14 +1471,6 @@ test_run_filter_SOURCES = test/run_filter.cxx \ ...@@ -1477,14 +1471,6 @@ test_run_filter_SOURCES = test/run_filter.cxx \
src/ReplayGainInfo.cxx \ src/ReplayGainInfo.cxx \
src/AudioCompress/compress.c src/AudioCompress/compress.c
if ENABLE_DESPOTIFY
test_read_tags_SOURCES += src/lib/despotify/DespotifyUtils.cxx
test_run_input_SOURCES += src/lib/despotify/DespotifyUtils.cxx
test_dump_text_file_SOURCES += src/lib/despotify/DespotifyUtils.cxx
test_dump_playlist_SOURCES += src/lib/despotify/DespotifyUtils.cxx
test_run_decoder_SOURCES += src/lib/despotify/DespotifyUtils.cxx
endif
if ENABLE_ENCODER if ENABLE_ENCODER
noinst_PROGRAMS += test/run_encoder noinst_PROGRAMS += test/run_encoder
test_run_encoder_SOURCES = test/run_encoder.cxx \ test_run_encoder_SOURCES = test/run_encoder.cxx \
......
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