diff options
| author | Keith Marshall <keithmarshall@@users.sf.net> | 2012-01-17 00:26:49 +0400 |
|---|---|---|
| committer | Keith Marshall <keithmarshall@@users.sf.net> | 2012-01-17 00:26:49 +0400 |
| commit | ec54dd65e2fc551a1549a081ef86c0d5f96528b0 (patch) | |
| tree | 9eaf30617b41bdc5dfd4c9cf47d6968041963df2 /winsup/w32api | |
| parent | 32bd06e544568b4d2cd89cf2ddd7040c4a7132c8 (diff) | |
Generalise makefile references to subdirectories of lib.
Diffstat (limited to 'winsup/w32api')
| -rw-r--r-- | winsup/w32api/.cvsignore | 2 | ||||
| -rw-r--r-- | winsup/w32api/ChangeLog | 8 | ||||
| -rw-r--r-- | winsup/w32api/lib/Makefile.in | 9 |
3 files changed, 12 insertions, 7 deletions
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 \ |