From ec54dd65e2fc551a1549a081ef86c0d5f96528b0 Mon Sep 17 00:00:00 2001
From: Keith Marshall <keithmarshall@@users.sf.net>
Date: Mon, 16 Jan 2012 20:26:49 +0000
Subject: Generalise makefile references to subdirectories of lib.

---
 winsup/w32api/.cvsignore      | 2 +-
 winsup/w32api/ChangeLog       | 8 ++++++++
 winsup/w32api/lib/Makefile.in | 9 +++------
 3 files changed, 12 insertions(+), 7 deletions(-)

(limited to 'winsup/w32api')

diff --git a/winsup/w32api/.cvsignore b/winsup/w32api/.cvsignore
index 1c5ab71c0..5435e9038 100644
--- a/winsup/w32api/.cvsignore
+++ b/winsup/w32api/.cvsignore
@@ -1,2 +1,2 @@
 .hg .hgignore .hgtags
-autom4te.cache
+.cvsignore configure autom4te.cache
diff --git a/winsup/w32api/ChangeLog b/winsup/w32api/ChangeLog
index d1accd09e..0968bd623 100644
--- a/winsup/w32api/ChangeLog
+++ b/winsup/w32api/ChangeLog
@@ -1,3 +1,11 @@
+2012-01-16  Keith Marshall  <keithmarshall@users.sf.net>
+
+	Generalise makefile references to subdirectories of lib.
+
+	* lib/Makefile.in (ddk, directx): Replace explicit references using...
+	(SUBDIRS): ...this macro; it already implements the same references in
+	a more generalised and extensible fashion.
+
 2012-01-16  Corinna Vinschen  <corinna@vinschen.de>
 
 	* configure: Regenerate and re-add to repository.
diff --git a/winsup/w32api/lib/Makefile.in b/winsup/w32api/lib/Makefile.in
index 507e0026a..090e2a797 100644
--- a/winsup/w32api/lib/Makefile.in
+++ b/winsup/w32api/lib/Makefile.in
@@ -70,18 +70,15 @@ DISTFILES = Makefile.in $(DEF_FILES) $(MRI_FILES) $(SOURCES)
 # which is the primary default target identified in the included
 # common makefile fragment, ${top_builddir}/Makefile.comm
 #
-all-default: $(EXTRA_OBJS) $(LIBS) ddk directx
+all-default: $(EXTRA_OBJS) $(LIBS) $(SUBDIRS)
 
 %-subdirs:
 	for dir in $(SUBDIRS); do \
 	  $(MAKE) -C $$dir $*; \
 	done
 
-ddk:
-	$(MAKE) -C $@
-
-directx:
-	$(MAKE) -C $@
+$(SUBDIRS):
+	cd $@ && $(MAKE)
 
 TEST_OPTIONS = \
   $(ALL_CFLAGS) -DWINVER=0x0666 -Wall -pedantic -Wsystem-headers \
-- 
cgit v1.2.3