[PATCH app-xsetroot] config: separate pre-processor from compiler flags for LINT

Gaetan Nadon memsize at videotron.ca
Wed Mar 10 10:48:01 PST 2010


Remove INCLUDES which is the deprecated name for AM_CPPFLAGS

Signed-off-by: Gaetan Nadon <memsize at videotron.ca>
---
 Makefile.am |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index dbc01b7..8149b2e 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -21,7 +21,8 @@
 
 bin_PROGRAMS = xsetroot
 
-AM_CFLAGS = $(CWARNFLAGS) $(XSETROOT_CFLAGS)
+AM_CPPFLAGS = $(XSETROOT_CFLAGS)
+AM_CFLAGS = $(CWARNFLAGS)
 xsetroot_LDADD = $(XSETROOT_LIBS)
 
 xsetroot_SOURCES =	\
@@ -75,8 +76,8 @@ SUFFIXES = .$(APP_MAN_SUFFIX) .man
 	$(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@
 
 if LINT
-ALL_LINT_FLAGS=$(LINT_FLAGS) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-		$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS)
+ALL_LINT_FLAGS=$(LINT_FLAGS) $(DEFS) $(DEFAULT_INCLUDES) \
+		$(AM_CPPFLAGS) $(CPPFLAGS)
 lint:
 	$(LINT) $(ALL_LINT_FLAGS) $(xsetroot_SOURCES)
 endif LINT
-- 
1.6.0.4



More information about the xorg-devel mailing list