From 3f546fcc27e9bfca8d365c4d78c6e6c99ca32512 Mon Sep 17 00:00:00 2001 From: Theodore Ts'o Date: Fri, 10 Mar 2006 21:39:40 -0500 Subject: [PATCH] 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. --- lib/ChangeLog | 7 +++++++ lib/Makefile.bsd-lib | 2 +- lib/Makefile.checker | 2 +- lib/Makefile.darwin-lib | 2 +- lib/Makefile.elf-lib | 2 +- lib/Makefile.library | 1 + lib/Makefile.profile | 2 +- lib/Makefile.solaris-lib | 2 +- 8 files changed, 14 insertions(+), 6 deletions(-) diff --git a/lib/ChangeLog b/lib/ChangeLog index 5604f96..1212216 100644 --- a/lib/ChangeLog +++ b/lib/ChangeLog @@ -1,3 +1,10 @@ +2006-03-10 Theodore Ts'o + + * 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 * Makefile.bsd-lib, Makefile.checker, Makefile.darwin-lib, diff --git a/lib/Makefile.bsd-lib b/lib/Makefile.bsd-lib index e49dd7a..4ab776a 100644 --- 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 304fc55..95974fa 100644 --- 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 c414a91..c9e44cc 100644 --- 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 8819ced..c360adc 100644 --- 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 92001a7..a421447 100644 --- 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 ad0f1df..deaa7cb 100644 --- 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 4bb3f6d..0874592 100644 --- 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 -- 1.8.3.1