aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMax Kellermann <max@duempel.org>2009-02-25 16:45:23 +0100
committerMax Kellermann <max@duempel.org>2009-02-25 16:45:23 +0100
commit6fdaa49668e126938c187cabfd78a818a3f68de9 (patch)
tree72e557b92e096919dc9f370d1128e06ccf866b31
parent02c9c3e0d827ebcc2507ba3eb63eebb76dc655d3 (diff)
downloadmpd-6fdaa49668e126938c187cabfd78a818a3f68de9.tar.gz
mpd-6fdaa49668e126938c187cabfd78a818a3f68de9.tar.xz
mpd-6fdaa49668e126938c187cabfd78a818a3f68de9.zip
Makefile.am: use AM_CPPFLAGS, AM_LDFLAGS
Renamed the old AM_CFLAGS to AM_CPPFLAGS, because it contained only preprocessor options. Append it to src_mpd_CPPFLAGS. Removed GLIB_LIBS from src_mpd_CPPFLAGS, because it is already part of AM_LDFLAGS.
-rw-r--r--Makefile.am6
1 files changed, 2 insertions, 4 deletions
diff --git a/Makefile.am b/Makefile.am
index dad62a773..00666c30c 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,16 +1,15 @@
ACLOCAL_AMFLAGS = -I m4
AUTOMAKE_OPTIONS = foreign 1.9 dist-bzip2
-AM_CFLAGS = -I$(srcdir)/src $(GLIB_CFLAGS)
+AM_CPPFLAGS = -I$(srcdir)/src $(GLIB_CFLAGS)
AM_LDFLAGS = $(GLIB_LIBS)
bin_PROGRAMS = src/mpd
src_mpd_CFLAGS = $(MPD_CFLAGS)
-src_mpd_CPPFLAGS = -I$(srcdir)/src \
+src_mpd_CPPFLAGS = $(AM_CPPFLAGS) \
$(SQLITE_CFLAGS) \
$(ID3TAG_CFLAGS) \
- $(GLIB_CFLAGS) \
$(INPUT_CFLAGS) \
$(DECODER_CFLAGS) \
$(ENCODER_CFLAGS) \
@@ -18,7 +17,6 @@ src_mpd_CPPFLAGS = -I$(srcdir)/src \
src_mpd_LDADD = $(MPD_LIBS) \
$(SQLITE_LIBS) \
$(ID3TAG_LIBS) \
- $(GLIB_LIBS) \
$(INPUT_LIBS) \
$(DECODER_LIBS) \
$(ENCODER_LIBS) \