diff options
| author | Theodore Ts'o <tytso@mit.edu> | 2006-03-10 21:39:40 -0500 |
|---|---|---|
| committer | Theodore Ts'o <tytso@mit.edu> | 2006-03-10 21:39:40 -0500 |
| commit | 3f546fcc27e9bfca8d365c4d78c6e6c99ca32512 (patch) | |
| tree | 49f0789c3396de4615a1e7894b5f285fb4cb86b7 | |
| parent | ba5e38494e6b42d77f76d9ad18744388958eca7c (diff) | |
| download | e2fsprogs-3f546fcc27e9bfca8d365c4d78c6e6c99ca32512.tar.gz | |
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.
| -rw-r--r-- | lib/ChangeLog | 7 | ||||
| -rw-r--r-- | lib/Makefile.bsd-lib | 2 | ||||
| -rw-r--r-- | lib/Makefile.checker | 2 | ||||
| -rw-r--r-- | lib/Makefile.darwin-lib | 2 | ||||
| -rw-r--r-- | lib/Makefile.elf-lib | 2 | ||||
| -rw-r--r-- | lib/Makefile.library | 1 | ||||
| -rw-r--r-- | lib/Makefile.profile | 2 | ||||
| -rw-r--r-- | lib/Makefile.solaris-lib | 2 |
8 files changed, 14 insertions, 6 deletions
diff --git a/lib/ChangeLog b/lib/ChangeLog index 5604f965..1212216e 100644 --- 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 e49dd7af..4ab776aa 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 304fc558..95974fad 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 c414a911..c9e44cc5 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 8819ceda..c360adca 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 92001a7a..a421447d 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 ad0f1df0..deaa7cbe 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 4bb3f6d8..08745928 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 |