From d4bc7dc0dea218cea380aba972f10f60dc1e86ac Mon Sep 17 00:00:00 2001
From: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Wed, 27 Jun 2007 13:54:07 -0700
Subject: Use AM_CFLAGS & AM_CPPFLAGS to replace per-program and obsolete
 macros

Clears some warnings from automake-1.10
---
 cxpm/Makefile.am | 3 ++-
 src/Makefile.am  | 5 ++---
 sxpm/Makefile.am | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/cxpm/Makefile.am b/cxpm/Makefile.am
index eea6dae..158facb 100644
--- a/cxpm/Makefile.am
+++ b/cxpm/Makefile.am
@@ -1,6 +1,7 @@
 bin_PROGRAMS = cxpm
 
-cxpm_CFLAGS = $(XPM_CFLAGS) -I$(top_srcdir)/src -I$(top_srcdir)/include/X11
+AM_CPPFLAGS = -I$(top_srcdir)/src -I$(top_srcdir)/include/X11
+AM_CFLAGS = $(XPM_CFLAGS)
 
 cxpm_SOURCES = cxpm.c
 
diff --git a/src/Makefile.am b/src/Makefile.am
index 2329daf..5dcdf03 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -2,9 +2,8 @@
 
 lib_LTLIBRARIES=libXpm.la
 
-AM_CFLAGS = -I.						\
-	    -I$(top_srcdir)/include/X11/		\
-            $(XPM_CFLAGS)
+AM_CPPFLAGS = -I. -I$(top_srcdir)/include/X11/
+AM_CFLAGS = $(XPM_CFLAGS)
 
 libXpm_la_LDFLAGS = -version-number 4:11:0 -no-undefined
 libXpm_la_LIBADD =  $(XPM_LIBS)
diff --git a/sxpm/Makefile.am b/sxpm/Makefile.am
index 04571de..0b9771a 100644
--- a/sxpm/Makefile.am
+++ b/sxpm/Makefile.am
@@ -2,9 +2,9 @@ if BUILD_SXPM
 
 bin_PROGRAMS = sxpm
 
-sxpm_CFLAGS = $(SXPM_CFLAGS)
+AM_CFLAGS = $(SXPM_CFLAGS)
 
-INCLUDES = -I$(top_srcdir)/include -I$(top_builddir)/include
+AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include
 
 sxpm_SOURCES = sxpm.c
 
-- 
cgit v1.2.3