diff options
| author | Yuriy Kaminskiy <yumkam@mail.ru> | 2011-01-09 18:21:27 +0100 |
|---|---|---|
| committer | Max Kellermann <max@duempel.org> | 2011-01-09 18:21:27 +0100 |
| commit | 77d71c4ee62485f74ac46cdced504db862b79750 (patch) | |
| tree | 398476630eb9e5942379333f01948a44d5204a39 /Makefile.am | |
| parent | 8c0afd8557b1823e2df94c9f4de90c29eafbf035 (diff) | |
| download | mpd-77d71c4ee62485f74ac46cdced504db862b79750.tar.gz mpd-77d71c4ee62485f74ac46cdced504db862b79750.tar.xz mpd-77d71c4ee62485f74ac46cdced504db862b79750.zip | |
Makefile.am: resolve modplug vs. libsndfile cflags/headers conflict
A bit of automake magic (see info automake "Per-Object Flags").
Compile-tested.
Diffstat (limited to '')
| -rw-r--r-- | Makefile.am | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/Makefile.am b/Makefile.am index 0966a2a66..cf79d0903 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) \ @@ -432,7 +434,6 @@ DECODER_CFLAGS = \ $(SNDFILE_CFLAGS) \ $(AUDIOFILE_CFLAGS) \ $(LIBMIKMOD_CFLAGS) \ - $(MODPLUG_CFLAGS) \ $(GME_CFLAGS) \ $(SIDPLAY_CFLAGS) \ $(FLUIDSYNTH_CFLAGS) \ @@ -448,7 +449,6 @@ DECODER_LIBS = \ $(FLAC_LIBS) \ $(SNDFILE_LIBS) \ $(AUDIOFILE_LIBS) $(LIBMIKMOD_LIBS) \ - $(MODPLUG_LIBS) \ $(GME_LIBS) \ $(SIDPLAY_LIBS) \ $(FLUIDSYNTH_LIBS) \ @@ -521,7 +521,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 |