Fix the subdirs logic so it works with GNU make 3.80

The previous fix which fixed the problem with GNU make 3.81 building
all of the library object files caused GNU make 3.80 fail because the
subdirectories (such as elfshared) were not getting created.  This fix
should allow the Makefiles to work with both GNU make 3.80 and GNU
make 3.81.

diff --git a/lib/ChangeLog b/lib/ChangeLog
index 5604f965f40726965b94a4fab16d3f8a6d896866..1212216ef6a13101f513a147a9cec5d51d625050 100644 (file)
--- a/lib/ChangeLog
+++ b/lib/ChangeLog
@@ -1,3 +1,10 @@
+2006-03-10  Theodore Ts'o  <tytso@mit.edu>
+
+       * Makefile.bsd-lib, Makefile.checker, Makefile.darwin-lib,
+               Makefile.elf-lib, Makefile.library, Makefile.profile,
+               Makefile.solaris-lib: Fix the subdirs logic so it works
+               with GNU make 3.80 (as well as GNU make 3.81).
+
 2005-12-29  Theodore Ts'o  <tytso@mit.edu>
 
        * Makefile.bsd-lib, Makefile.checker, Makefile.darwin-lib,

diff --git a/lib/Makefile.bsd-lib b/lib/Makefile.bsd-lib
index e49dd7af7200e0ef058e74db6f2a846aad2b83df..4ab776aa1ede62545cef1b0e6b830643d21a6c98 100644 (file)
--- a/lib/Makefile.bsd-lib
+++ b/lib/Makefile.bsd-lib
@@ -12,7 +12,7 @@
 
 all:: pic image
 
-subdirs:: pic
+real-subdirs:: pic
        @echo " MKDIR pic"
        @mkdir -p pic
 

diff --git a/lib/Makefile.checker b/lib/Makefile.checker
index 304fc558f06e26147558044911af014fbc4046d0..95974fad2a044e770c0fe913ea34db86f6a1276d 100644 (file)
--- a/lib/Makefile.checker
+++ b/lib/Makefile.checker
@@ -1,6 +1,6 @@
 all:: checker $(LIBRARY)_chk.a
 
-subdirs:: Makefile
+real-subdirs:: Makefile
        @echo " MKDIR checker"
        @mkdir -p checker
 

diff --git a/lib/Makefile.darwin-lib b/lib/Makefile.darwin-lib
index c414a911b9e0d7a3000bde494103e8b2b9a4539d..c9e44cc55f9ae5d175174bf0979c728c53d35c64 100644 (file)
--- a/lib/Makefile.darwin-lib
+++ b/lib/Makefile.darwin-lib
@@ -12,7 +12,7 @@
 
 all:: pic image
 
-subdirs:: Makefile
+real-subdirs:: Makefile
        @echo " MKDIR pic"
        @mkdir -p pic
 

diff --git a/lib/Makefile.elf-lib b/lib/Makefile.elf-lib
index 8819cedabf37f132e0288e71f39312dea8956d66..c360adca964b14392b8930ac7564d32c336dbedf 100644 (file)
--- a/lib/Makefile.elf-lib
+++ b/lib/Makefile.elf-lib
@@ -13,7 +13,7 @@
 
 all:: image
 
-subdirs:: Makefile
+real-subdirs:: Makefile
        @echo " MKDIR elfshared"
        @mkdir -p elfshared
 

diff --git a/lib/Makefile.library b/lib/Makefile.library
index 92001a7aece998b42afbe9b192a17b70833c1b8d..a421447d469251ad3ed1473d2b4170191612c1c6 100644 (file)
--- a/lib/Makefile.library
+++ b/lib/Makefile.library
@@ -5,6 +5,7 @@ install-shlibs::
 uninstall-shlibs::
 
 subdirs:: Makefile
+       @$(MAKE) -s real-subdirs
        @touch subdirs
 
 clean::

diff --git a/lib/Makefile.profile b/lib/Makefile.profile
index ad0f1df004de2767e7feca6bc2102af445595601..deaa7cbe43c0efbc9011ac26f70a2c43c18ceaa2 100644 (file)
--- a/lib/Makefile.profile
+++ b/lib/Makefile.profile
@@ -1,6 +1,6 @@
 all:: profiled $(LIBRARY)_p.a
 
-subdirs:: Makefile
+real-subdirs:: Makefile
        @echo " MKDIR $@"
        @mkdir -p profiled
 

diff --git a/lib/Makefile.solaris-lib b/lib/Makefile.solaris-lib
index 4bb3f6d8108d41d14b5ee536979e219e37eac09f..08745928cd22f1828473bc166c424d751fc0c058 100644 (file)
--- a/lib/Makefile.solaris-lib
+++ b/lib/Makefile.solaris-lib
@@ -13,7 +13,7 @@
 
 all:: elfshared image
 
-subdirs:: Makefile
+real-subdirs:: Makefile
        @echo " MKDIR elfshared"
        @mkdir -p elfshared