From fe493b0f4b9cf42766cd81772a7c3887eb0c1a26 Mon Sep 17 00:00:00 2001
From: Keith Marshall <keithmarshall@@users.sf.net>
Date: Sun, 15 Jan 2012 20:56:25 +0000
Subject: [PATCH] More makefile code refactoring; remove redundant INCLUDES
 references.

---
 winsup/w32api/ChangeLog               | 10 ++++++++++
 winsup/w32api/Makefile.comm.in        |  1 +
 winsup/w32api/lib/Makefile.in         |  2 --
 winsup/w32api/lib/ddk/Makefile.in     |  1 -
 winsup/w32api/lib/directx/Makefile.in |  2 --
 5 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/winsup/w32api/ChangeLog b/winsup/w32api/ChangeLog
index 163c09929..05012f979 100644
--- a/winsup/w32api/ChangeLog
+++ b/winsup/w32api/ChangeLog
@@ -1,3 +1,13 @@
+2012-01-15  Keith Marshall  <keithmarshall@users.sf.net>
+
+	More makefile code refactoring; remove redundant INCLUDES references.
+
+	* lib/directx/Makefile.in (INCLUDES): Reference to include/directx
+	is redundant; remove it.  This results in identical definitions...
+	* lib/Makefile.in lib/ddk/Makefile.in (INCLUDES): ...here; factor out
+	from all three independent makefile locations; relocate to...
+	* Makefile.comm.in (INCLUDES): ...here.
+
 2012-01-15  Keith Marshall  <keithmarshall@users.sf.net>
 
 	Add smart identification of auxiliary header file paths.
diff --git a/winsup/w32api/Makefile.comm.in b/winsup/w32api/Makefile.comm.in
index 322de6fbc..f75e67100 100644
--- a/winsup/w32api/Makefile.comm.in
+++ b/winsup/w32api/Makefile.comm.in
@@ -36,6 +36,7 @@ LD = @LD@
 CFLAGS = @CFLAGS@
 ALL_CFLAGS = $(CFLAGS) $(INCLUDES)
 EXTRA_INCLUDES = -nostdinc -iwithprefix include @EXTRA_INCLUDES@
+INCLUDES = -I ${top_srcdir}/include $(EXTRA_INCLUDES)
 
 DLLTOOL = @DLLTOOL@
 DLLTOOL_FLAGS = --as=$(AS) -k
diff --git a/winsup/w32api/lib/Makefile.in b/winsup/w32api/lib/Makefile.in
index d496c0910..afe362c25 100644
--- a/winsup/w32api/lib/Makefile.in
+++ b/winsup/w32api/lib/Makefile.in
@@ -19,8 +19,6 @@ VPATH = @srcdir@
 
 include ${top_builddir}/Makefile.comm
 
-INCLUDES = -I ${top_srcdir}/include $(EXTRA_INCLUDES)
-
 # Headers
 #
 HEADERS = $(notdir $(wildcard ${top_srcdir}/include/*.h))
diff --git a/winsup/w32api/lib/ddk/Makefile.in b/winsup/w32api/lib/ddk/Makefile.in
index d6813b6ce..a3d2b272a 100644
--- a/winsup/w32api/lib/ddk/Makefile.in
+++ b/winsup/w32api/lib/ddk/Makefile.in
@@ -16,7 +16,6 @@ top_builddir = @top_builddir@
 VPATH = @srcdir@
 
 include ${top_builddir}/Makefile.comm
-INCLUDES = -I ${top_srcdir}/include $(EXTRA_INCLUDES)
 
 # Headers
 #
diff --git a/winsup/w32api/lib/directx/Makefile.in b/winsup/w32api/lib/directx/Makefile.in
index ff2cc85a7..bb5771891 100644
--- a/winsup/w32api/lib/directx/Makefile.in
+++ b/winsup/w32api/lib/directx/Makefile.in
@@ -16,8 +16,6 @@ top_builddir = @top_builddir@
 VPATH = @srcdir@
 
 include ${top_builddir}/Makefile.comm
-INCLUDES = -I ${top_srcdir}/include -I ${top_srcdir}/include/directx \
-  $(EXTRA_INCLUDES)
 
 # Headers
 #