From 6fdaa49668e126938c187cabfd78a818a3f68de9 Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Wed, 25 Feb 2009 16:45:23 +0100 Subject: 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. --- Makefile.am | 6 ++---- 1 file 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) \ -- cgit v1.2.3