aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTheodore Ts'o <tytso@mit.edu>2005-12-29 22:45:29 -0500
committerTheodore Ts'o <tytso@mit.edu>2005-12-29 22:45:29 -0500
commit02ef19621032044c1488931b3f970e11dca0afe0 (patch)
treed67e1245dfe12855623f3080183e6712f6abfd31
parent68963d5a262ad49cbdad8f946e59ebc34677fe33 (diff)
downloade2fsprogs-02ef19621032044c1488931b3f970e11dca0afe0.tar.gz
e2fsprogs-02ef19621032044c1488931b3f970e11dca0afe0.tar.xz
e2fsprogs-02ef19621032044c1488931b3f970e11dca0afe0.zip
Avoid needlessly recompilation of library objection files
Fixing the problem of parallel builds sometimes not creating the library subdirectories caused library object files to get constantly recompiled. Fix this by remaping how the Makefile subdirectories decide to create the subdirectories. Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
-rw-r--r--lib/ChangeLog7
-rw-r--r--lib/Makefile.bsd-lib5
-rw-r--r--lib/Makefile.checker8
-rw-r--r--lib/Makefile.darwin-lib7
-rw-r--r--lib/Makefile.elf-lib8
-rw-r--r--lib/Makefile.library6
-rw-r--r--lib/Makefile.profile6
-rw-r--r--lib/Makefile.solaris-lib7
8 files changed, 28 insertions, 26 deletions
diff --git a/lib/ChangeLog b/lib/ChangeLog
index 3e627280..5604f965 100644
--- a/lib/ChangeLog
+++ b/lib/ChangeLog
@@ -1,3 +1,10 @@
+2005-12-29 Theodore Ts'o <tytso@mit.edu>
+
+ * Makefile.bsd-lib, Makefile.checker, Makefile.darwin-lib,
+ Makefile.elf-lib, Makefile.library, Makefile.profile,
+ Makefile.solaris-lib: Revamp subdirs target so to avoid
+ needless recompilation of library object files.
+
2005-12-10 Theodore Ts'o <tytso@mit.edu>
* Makefile.elf-lib, Makefile.solaris-lib: Add $(LDFLAGS) to the
diff --git a/lib/Makefile.bsd-lib b/lib/Makefile.bsd-lib
index d11301fc..e49dd7af 100644
--- a/lib/Makefile.bsd-lib
+++ b/lib/Makefile.bsd-lib
@@ -13,9 +13,8 @@
all:: pic image
subdirs:: pic
-
-pic:
- mkdir pic
+ @echo " MKDIR pic"
+ @mkdir -p pic
BSD_LIB = $(BSDLIB_IMAGE).so.$(BSDLIB_VERSION)
BSDLIB_PIC_FLAG = -fpic
diff --git a/lib/Makefile.checker b/lib/Makefile.checker
index 372c0889..304fc558 100644
--- a/lib/Makefile.checker
+++ b/lib/Makefile.checker
@@ -1,10 +1,8 @@
all:: checker $(LIBRARY)_chk.a
-subdirs:: checker
-
-checker:
- @echo " MKDIR $@"
- @mkdir checker
+subdirs:: Makefile
+ @echo " MKDIR checker"
+ @mkdir -p checker
clean::
$(RM) -rf checker
diff --git a/lib/Makefile.darwin-lib b/lib/Makefile.darwin-lib
index 7ab584fb..c414a911 100644
--- a/lib/Makefile.darwin-lib
+++ b/lib/Makefile.darwin-lib
@@ -12,10 +12,9 @@
all:: pic image
-subdirs:: pic
-
-pic:
- mkdir pic
+subdirs:: Makefile
+ @echo " MKDIR pic"
+ @mkdir -p pic
BSD_LIB = $(BSDLIB_IMAGE).$(BSDLIB_VERSION).dylib
BSDLIB_PIC_FLAG = -fPIC
diff --git a/lib/Makefile.elf-lib b/lib/Makefile.elf-lib
index 97d9a70e..8819ceda 100644
--- a/lib/Makefile.elf-lib
+++ b/lib/Makefile.elf-lib
@@ -11,13 +11,11 @@
# ELF_INSTALL_DIR = $(SHLIBDIR)
# ELF_OTHER_LIBS = -lc
-all:: elfshared image
+all:: image
-subdirs:: elfshared
-
-elfshared:
+subdirs:: Makefile
@echo " MKDIR elfshared"
- @mkdir elfshared
+ @mkdir -p elfshared
ELF_LIB = $(ELF_IMAGE).so.$(ELF_VERSION)
ELF_SONAME = $(ELF_IMAGE).so.$(ELF_SO_VERSION)
diff --git a/lib/Makefile.library b/lib/Makefile.library
index 5cff608d..92001a7a 100644
--- a/lib/Makefile.library
+++ b/lib/Makefile.library
@@ -4,7 +4,11 @@ install-shlibs::
uninstall-shlibs::
-subdirs::
+subdirs:: Makefile
+ @touch subdirs
+
+clean::
+ @$(RM) -f subdirs
$(LIBRARY).a: $(OBJS)
@echo " GEN_LIB $@"
diff --git a/lib/Makefile.profile b/lib/Makefile.profile
index 44b5704c..ad0f1df0 100644
--- a/lib/Makefile.profile
+++ b/lib/Makefile.profile
@@ -1,10 +1,8 @@
all:: profiled $(LIBRARY)_p.a
-subdirs:: profiled
-
-profiled:
+subdirs:: Makefile
@echo " MKDIR $@"
- @mkdir profiled
+ @mkdir -p profiled
clean::
$(RM) -rf profiled
diff --git a/lib/Makefile.solaris-lib b/lib/Makefile.solaris-lib
index b75c20e1..4bb3f6d8 100644
--- a/lib/Makefile.solaris-lib
+++ b/lib/Makefile.solaris-lib
@@ -13,10 +13,9 @@
all:: elfshared image
-subdirs:: elfshared
-
-elfshared:
- mkdir elfshared
+subdirs:: Makefile
+ @echo " MKDIR elfshared"
+ @mkdir -p elfshared
ELF_LIB = $(ELF_IMAGE).so.$(ELF_VERSION)
ELF_SONAME = $(ELF_IMAGE).so.$(ELF_SO_VERSION)