aboutsummaryrefslogtreecommitdiffstats
path: root/src/Makefile.am
diff options
context:
space:
mode:
authorEnrico Weigelt <weigelt@metux.de>2008-10-15 20:39:46 +0200
committerMax Kellermann <max@duempel.org>2008-10-15 20:39:46 +0200
commit30cd3455812b5a839552d5a0f6fa87a99f09c46a (patch)
tree5ec18adc6e0d31e9f9269428f6c247fa3b7526ac /src/Makefile.am
parent047043d2a8ee4482a845ed9860dbf4cd01540eef (diff)
downloadmpd-30cd3455812b5a839552d5a0f6fa87a99f09c46a.tar.gz
mpd-30cd3455812b5a839552d5a0f6fa87a99f09c46a.tar.xz
mpd-30cd3455812b5a839552d5a0f6fa87a99f09c46a.zip
fixing several imports to work via pkg-config
This patch fixes several imports to use pkg-config instead of certain esoteric tests.
Diffstat (limited to '')
-rw-r--r--src/Makefile.am13
1 files changed, 10 insertions, 3 deletions
diff --git a/src/Makefile.am b/src/Makefile.am
index 3652caaa9..e31d442e8 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,5 +1,3 @@
-AM_CPPFLAGS = $(GLIB_CFLAGS)
-
bin_PROGRAMS = mpd
SUBDIRS = $(MP4FF_SUBDIR)
@@ -196,8 +194,17 @@ mpd_SOURCES = \
mpd_CFLAGS = $(MPD_CFLAGS)
+mpd_CPPFLAGS = \
+ $(AO_CFLAGS) $(ALSA_CFLAGS) \
+ $(OGGVORBIS_CFLAGS) \
+ $(patsubst -I%/FLAC,-I%,$(FLAC_CFLAGS)) \
+ $(AUDIOFILE_CFLAGS) $(LIBMIKMOD_CFLAGS) \
+ $(GLIB_CFLAGS)
mpd_LDADD = $(MPD_LIBS) $(MP4FF_LIB) \
- $(GLIB_LIBS)
+ $(AO_LIBS) $(ALSA_LIBS) \
+ $(OGGVORBIS_LIBS) $(FLAC_LIBS) \
+ $(AUDIOFILE_LIBS) $(LIBMIKMOD_LIBS) \
+ $(GLIB_LIBS)
DIST_SUBDIRS = mp4ff