From 1b39efb694fa1ff9924ef52e93c19b39a54e293f Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Fri, 28 Oct 2016 22:31:26 +0200 Subject: [PATCH] Makefile.am: move a few sources to libbasic.a --- Makefile.am | 57 ++++++++++++++++++++++------------------------------- 1 file changed, 24 insertions(+), 33 deletions(-) diff --git a/Makefile.am b/Makefile.am index 48f778135..42c3e6206 100644 --- a/Makefile.am +++ b/Makefile.am @@ -20,6 +20,7 @@ noinst_LIBRARIES = \ libevent.a \ libicu.a \ libpcm.a \ + libbasic.a \ libconf.a \ libtag.a \ libinput.a \ @@ -54,6 +55,7 @@ src_mpd_LDADD = \ $(ENCODER_LIBS) \ $(MIXER_LIBS) \ libconf.a \ + libbasic.a \ libevent.a \ libthread.a \ libnet.a \ @@ -75,9 +77,6 @@ libmpd_a_SOURCES = \ src/poison.h \ src/notify.cxx src/notify.hxx \ src/AudioConfig.cxx src/AudioConfig.hxx \ - src/CheckAudioFormat.cxx src/CheckAudioFormat.hxx \ - src/AudioFormat.cxx src/AudioFormat.hxx \ - src/AudioParser.cxx src/AudioParser.hxx \ src/protocol/Ack.cxx src/protocol/Ack.hxx \ src/protocol/ArgParser.cxx src/protocol/ArgParser.hxx \ src/protocol/Result.cxx src/protocol/Result.hxx \ @@ -168,7 +167,6 @@ libmpd_a_SOURCES = \ src/queue/Listener.hxx \ src/PluginUnavailable.hxx \ src/ReplayGainConfig.cxx src/ReplayGainConfig.hxx \ - src/ReplayGainInfo.cxx src/ReplayGainInfo.hxx \ src/DetachedSong.cxx src/DetachedSong.hxx \ src/LocateUri.cxx src/LocateUri.hxx \ src/SongUpdate.cxx \ @@ -854,6 +852,12 @@ else ARCHIVE_LIBS = endif +libbasic_a_SOURCES = \ + src/CheckAudioFormat.cxx src/CheckAudioFormat.hxx \ + src/AudioFormat.cxx src/AudioFormat.hxx \ + src/AudioParser.cxx src/AudioParser.hxx \ + src/ReplayGainInfo.cxx src/ReplayGainInfo.hxx + # configuration library libconf_a_SOURCES = \ @@ -1852,6 +1856,7 @@ test_dump_playlist_LDADD = \ $(INPUT_LIBS) \ $(ARCHIVE_LIBS) \ libconf.a \ + libbasic.a \ libevent.a \ libthread.a \ $(FS_LIBS) \ @@ -1867,7 +1872,6 @@ test_dump_playlist_SOURCES = test/dump_playlist.cxx \ src/IOThread.cxx \ src/TagSave.cxx \ src/TagFile.cxx \ - src/AudioFormat.cxx src/CheckAudioFormat.cxx \ src/DetachedSong.cxx if ENABLE_FLAC @@ -1883,6 +1887,7 @@ test_run_decoder_LDADD = \ $(ARCHIVE_LIBS) \ $(TAG_LIBS) \ libconf.a \ + libbasic.a \ libevent.a \ libthread.a \ $(FS_LIBS) \ @@ -1895,7 +1900,6 @@ test_run_decoder_SOURCES = test/run_decoder.cxx \ src/Log.cxx src/LogBackend.cxx \ src/IOThread.cxx \ src/ReplayGainInfo.cxx \ - src/AudioFormat.cxx src/CheckAudioFormat.cxx \ $(ARCHIVE_SRC) \ $(INPUT_SRC) \ $(TAG_SRC) \ @@ -1908,6 +1912,7 @@ test_read_tags_LDADD = \ $(ARCHIVE_LIBS) \ $(TAG_LIBS) \ libconf.a \ + libbasic.a \ libevent.a \ libthread.a \ $(FS_LIBS) \ @@ -1920,7 +1925,6 @@ test_read_tags_SOURCES = test/read_tags.cxx \ src/Log.cxx src/LogBackend.cxx \ src/IOThread.cxx \ src/ReplayGainInfo.cxx \ - src/AudioFormat.cxx src/CheckAudioFormat.cxx \ $(DECODER_SRC) test_ReadApeTags_LDADD = \ @@ -1952,6 +1956,7 @@ endif test_run_filter_LDADD = \ $(FILTER_LIBS) \ libconf.a \ + libbasic.a \ $(FS_LIBS) \ $(ICU_LDADD) \ libsystem.a \ @@ -1959,23 +1964,17 @@ test_run_filter_LDADD = \ test_run_filter_SOURCES = test/run_filter.cxx \ test/FakeReplayGainConfig.cxx \ src/Log.cxx src/LogBackend.cxx \ - src/filter/FilterPlugin.cxx src/filter/FilterRegistry.cxx \ - src/CheckAudioFormat.cxx \ - src/AudioFormat.cxx \ - src/AudioParser.cxx \ - src/ReplayGainInfo.cxx + src/filter/FilterPlugin.cxx src/filter/FilterRegistry.cxx if ENABLE_ENCODER noinst_PROGRAMS += test/run_encoder test_run_encoder_SOURCES = test/run_encoder.cxx \ - src/Log.cxx src/LogBackend.cxx \ - src/CheckAudioFormat.cxx \ - src/AudioFormat.cxx \ - src/AudioParser.cxx + src/Log.cxx src/LogBackend.cxx test_run_encoder_LDADD = \ $(ENCODER_LIBS) \ $(TAG_LIBS) \ libconf.a \ + libbasic.a \ libpcm.a \ libthread.a \ $(FS_LIBS) \ @@ -1988,9 +1987,6 @@ if ENABLE_VORBISENC noinst_PROGRAMS += test/test_vorbis_encoder test_test_vorbis_encoder_SOURCES = test/test_vorbis_encoder.cxx \ src/Log.cxx src/LogBackend.cxx \ - src/CheckAudioFormat.cxx \ - src/AudioFormat.cxx \ - src/AudioParser.cxx \ $(ENCODER_SRC) test_test_vorbis_encoder_CPPFLAGS = $(AM_CPPFLAGS) \ $(ENCODER_CFLAGS) @@ -1999,6 +1995,7 @@ test_test_vorbis_encoder_LDADD = $(MPD_LIBS) \ $(PCM_LIBS) \ $(TAG_LIBS) \ libconf.a \ + libbasic.a \ $(FS_LIBS) \ $(ICU_LDADD) \ libsystem.a \ @@ -2006,11 +2003,10 @@ test_test_vorbis_encoder_LDADD = $(MPD_LIBS) \ endif test_software_volume_SOURCES = test/software_volume.cxx \ - src/Log.cxx src/LogBackend.cxx \ - src/AudioFormat.cxx src/CheckAudioFormat.cxx \ - src/AudioParser.cxx + src/Log.cxx src/LogBackend.cxx test_software_volume_LDADD = \ $(PCM_LIBS) \ + libbasic.a \ libutil.a test_run_avahi_SOURCES = \ @@ -2034,13 +2030,11 @@ test_run_normalize_LDADD = \ libutil.a test_run_convert_SOURCES = test/run_convert.cxx \ - src/Log.cxx src/LogBackend.cxx \ - src/AudioFormat.cxx \ - src/CheckAudioFormat.cxx \ - src/AudioParser.cxx + src/Log.cxx src/LogBackend.cxx test_run_convert_LDADD = \ $(PCM_LIBS) \ libconf.a \ + libbasic.a \ $(FS_LIBS) \ libsystem.a \ $(ICU_LDADD) \ @@ -2054,6 +2048,7 @@ test_run_output_LDADD = $(MPD_LIBS) \ $(FILTER_LIBS) \ $(TAG_LIBS) \ libconf.a \ + libbasic.a \ libevent.a \ $(FS_LIBS) \ $(ICU_LDADD) \ @@ -2066,9 +2061,6 @@ test_run_output_SOURCES = test/run_output.cxx \ test/ScopeIOThread.hxx \ src/Log.cxx src/LogBackend.cxx \ src/IOThread.cxx \ - src/CheckAudioFormat.cxx \ - src/AudioFormat.cxx \ - src/AudioParser.cxx \ src/output/Domain.cxx \ src/output/Init.cxx src/output/Finish.cxx src/output/Registry.cxx \ src/output/OutputPlugin.cxx \ @@ -2076,14 +2068,14 @@ test_run_output_SOURCES = test/run_output.cxx \ src/mixer/MixerType.cxx \ src/filter/FilterPlugin.cxx \ src/filter/FilterConfig.cxx \ - src/filter/Observer.cxx \ - src/ReplayGainInfo.cxx + src/filter/Observer.cxx test_read_mixer_LDADD = \ libpcm.a \ libmixer_plugins.a \ $(OUTPUT_LIBS) \ libconf.a \ + libbasic.a \ libevent.a \ $(FS_LIBS) \ $(ICU_LDADD) \ @@ -2093,7 +2085,6 @@ test_read_mixer_SOURCES = test/read_mixer.cxx \ src/Log.cxx src/LogBackend.cxx \ src/mixer/MixerControl.cxx \ src/filter/FilterPlugin.cxx \ - src/AudioFormat.cxx \ src/filter/plugins/VolumeFilterPlugin.cxx if ENABLE_BZIP2_TEST @@ -2176,7 +2167,6 @@ test_test_icy_parser_LDADD = \ endif test_test_pcm_SOURCES = \ - src/AudioFormat.cxx \ test/test_pcm_util.hxx \ test/test_pcm_dither.cxx \ test/test_pcm_pack.cxx \ @@ -2192,6 +2182,7 @@ test_test_pcm_CPPFLAGS = $(AM_CPPFLAGS) $(CPPUNIT_CFLAGS) -DCPPUNIT_HAVE_RTTI=0 test_test_pcm_CXXFLAGS = $(AM_CXXFLAGS) -Wno-error=deprecated-declarations test_test_pcm_LDADD = \ $(PCM_LIBS) \ + libbasic.a \ libutil.a \ $(CPPUNIT_LIBS)