From 30cd3455812b5a839552d5a0f6fa87a99f09c46a Mon Sep 17 00:00:00 2001
From: Enrico Weigelt <weigelt@metux.de>
Date: Wed, 15 Oct 2008 20:39:46 +0200
Subject: fixing several imports to work via pkg-config

This patch fixes several imports to use pkg-config instead of certain
esoteric tests.
---
 src/Makefile.am | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

(limited to 'src/Makefile.am')

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
 
-- 
cgit v1.2.3