diff options
| author | Max Kellermann <max@duempel.org> | 2011-01-10 11:47:14 +0100 |
|---|---|---|
| committer | Max Kellermann <max@duempel.org> | 2011-01-10 11:47:14 +0100 |
| commit | 2b29ca796edfc765b498463dac732663142911f2 (patch) | |
| tree | bb71702b20181e5f96bf64c95facc164deb19736 /Makefile.am | |
| parent | 51840088128a25a642744db3a2bff380952ca375 (diff) | |
| parent | 9ad862d3a6f0cbb043bf4f9ff97e54e5c606ad3e (diff) | |
| download | mpd-2b29ca796edfc765b498463dac732663142911f2.tar.gz mpd-2b29ca796edfc765b498463dac732663142911f2.tar.xz mpd-2b29ca796edfc765b498463dac732663142911f2.zip | |
Merge commit 'release-0.16.1'
Conflicts:
NEWS
Diffstat (limited to 'Makefile.am')
| -rw-r--r-- | Makefile.am | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/Makefile.am b/Makefile.am index 1efd5605e..873cc0925 100644 --- a/Makefile.am +++ b/Makefile.am @@ -7,6 +7,8 @@ AM_CPPFLAGS += -DSYSTEM_CONFIG_FILE_LOCATION='"$(sysconfdir)/mpd.conf"' bin_PROGRAMS = src/mpd +noinst_LIBRARIES = + src_mpd_CFLAGS = $(AM_CFLAGS) $(MPD_CFLAGS) src_mpd_CPPFLAGS = $(AM_CPPFLAGS) \ $(LIBWRAP_CFLAGS) \ @@ -436,7 +438,6 @@ DECODER_CFLAGS = \ $(SNDFILE_CFLAGS) \ $(AUDIOFILE_CFLAGS) \ $(LIBMIKMOD_CFLAGS) \ - $(MODPLUG_CFLAGS) \ $(GME_CFLAGS) \ $(SIDPLAY_CFLAGS) \ $(FLUIDSYNTH_CFLAGS) \ @@ -452,7 +453,6 @@ DECODER_LIBS = \ $(FLAC_LIBS) \ $(SNDFILE_LIBS) \ $(AUDIOFILE_LIBS) $(LIBMIKMOD_LIBS) \ - $(MODPLUG_LIBS) \ $(GME_LIBS) \ $(SIDPLAY_LIBS) \ $(FLUIDSYNTH_LIBS) \ @@ -526,7 +526,11 @@ DECODER_SRC += src/decoder/mikmod_decoder_plugin.c endif if HAVE_MODPLUG -DECODER_SRC += src/decoder/modplug_decoder_plugin.c +libmodplug_decoder_plugin_a_SOURCES = src/decoder/modplug_decoder_plugin.c +libmodplug_decoder_plugin_a_CFLAGS = $(src_mpd_CFLAGS) $(MODPLUG_CFLAGS) +libmodplug_decoder_plugin_a_CPPFLAGS = $(src_mpd_CPPFLAGS) +noinst_LIBRARIES += libmodplug_decoder_plugin.a +DECODER_LIBS += libmodplug_decoder_plugin.a $(MODPLUG_LIBS) endif if ENABLE_SIDPLAY |