More makefile code refactoring; remove redundant INCLUDES references.

2012-01-15 20:56:25 +00:00
parent 71992560f7
commit fe493b0f4b
5 changed files with 11 additions and 5 deletions
--- 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.
--- 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
--- 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))
--- 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
 #
--- 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
 #