From 3ded50b37cfb3d3864792dfed7793029a061267e Mon Sep 17 00:00:00 2001 From: Theodore Ts'o Date: Sat, 10 Dec 2005 22:23:01 -0500 Subject: [PATCH] Address parallel build problem in the library Makefiles Add a dependency to make sure that the subdirectories are created before creating all of the object files. Addresses Sourceforge Bug: #1261553 Signed-off-by: "Theodore Ts'o" --- lib/blkid/ChangeLog | 6 ++++++ lib/blkid/Makefile.in | 4 +++- lib/e2p/ChangeLog | 6 ++++++ lib/e2p/Makefile.in | 2 ++ lib/et/ChangeLog | 6 ++++++ lib/et/Makefile.in | 2 ++ lib/ext2fs/ChangeLog | 6 ++++++ lib/ext2fs/Makefile.in | 2 ++ lib/ss/ChangeLog | 6 ++++++ lib/ss/Makefile.in | 2 ++ lib/uuid/ChangeLog | 6 ++++++ lib/uuid/Makefile.in | 2 ++ 12 files changed, 49 insertions(+), 1 deletion(-) diff --git a/lib/blkid/ChangeLog b/lib/blkid/ChangeLog index a31bbfd..7683a77 100644 --- a/lib/blkid/ChangeLog +++ b/lib/blkid/ChangeLog @@ -1,3 +1,9 @@ +2005-12-10 Theodore Ts'o + + * Makefile.in: Add a dependency to make sure that the + subdirectories are created before creating all of the + object files. + 2005-09-10 Theodore Ts'o * probe.c (probe_fat): Search the root directory of FAT diff --git a/lib/blkid/Makefile.in b/lib/blkid/Makefile.in index 2fc589c..2dd9260 100644 --- a/lib/blkid/Makefile.in +++ b/lib/blkid/Makefile.in @@ -181,6 +181,8 @@ distclean:: clean $(RM) -f .depend Makefile blkid.pc \ $(srcdir)/TAGS $(srcdir)/Makefile.in.old +$(OBJS): subdirs + # +++ Dependency line eater +++ # # Makefile dependencies follow. This must be the last section in @@ -205,7 +207,7 @@ read.o: $(srcdir)/read.c $(srcdir)/blkidP.h $(srcdir)/blkid.h \ $(top_builddir)/lib/blkid/blkid_types.h $(srcdir)/list.h \ $(top_srcdir)/lib/uuid/uuid.h resolve.o: $(srcdir)/resolve.c $(srcdir)/blkidP.h $(srcdir)/blkid.h \ - $(top_builddir)/lib/blkid/blkid_types.h $(srcdir)/list.h $(srcdir)/probe.h + $(top_builddir)/lib/blkid/blkid_types.h $(srcdir)/list.h save.o: $(srcdir)/save.c $(srcdir)/blkidP.h $(srcdir)/blkid.h \ $(top_builddir)/lib/blkid/blkid_types.h $(srcdir)/list.h tag.o: $(srcdir)/tag.c $(srcdir)/blkidP.h $(srcdir)/blkid.h \ diff --git a/lib/e2p/ChangeLog b/lib/e2p/ChangeLog index 79f62fd..763f940 100644 --- a/lib/e2p/ChangeLog +++ b/lib/e2p/ChangeLog @@ -1,3 +1,9 @@ +2005-12-10 Theodore Ts'o + + * Makefile.in: Add a dependency to make sure that the + subdirectories are created before creating all of the + object files. + 2006-06-30 Theodore Ts'o * Release of E2fsprogs 1.38 diff --git a/lib/e2p/Makefile.in b/lib/e2p/Makefile.in index ac24940..6dd3922 100644 --- a/lib/e2p/Makefile.in +++ b/lib/e2p/Makefile.in @@ -103,6 +103,8 @@ distclean:: clean $(RM) -f .depend Makefile e2p.pc \ $(srcdir)/TAGS $(srcdir)/Makefile.in.old +$(OBJS): subdirs + # +++ Dependency line eater +++ # # Makefile dependencies follow. This must be the last section in diff --git a/lib/et/ChangeLog b/lib/et/ChangeLog index 7505fa8..c8f63d2 100644 --- a/lib/et/ChangeLog +++ b/lib/et/ChangeLog @@ -1,3 +1,9 @@ +2005-12-10 Theodore Ts'o + + * Makefile.in: Add a dependency to make sure that the + subdirectories are created before creating all of the + object files. + 2005-07-19 Theodore Ts'o * et_c.awk: Fix bug where error messages using continuations diff --git a/lib/et/Makefile.in b/lib/et/Makefile.in index 066a47a..fc2aa61 100644 --- a/lib/et/Makefile.in +++ b/lib/et/Makefile.in @@ -132,6 +132,8 @@ distclean:: clean $(RM) -f .depend Makefile com_err.pc \ $(srcdir)/TAGS $(srcdir)/Makefile.in.old +$(OBJS): subdirs + # +++ Dependency line eater +++ # # Makefile dependencies follow. This must be the last section in diff --git a/lib/ext2fs/ChangeLog b/lib/ext2fs/ChangeLog index 0db4eff..f2cd2fb 100644 --- a/lib/ext2fs/ChangeLog +++ b/lib/ext2fs/ChangeLog @@ -1,5 +1,11 @@ 2005-12-10 Theodore Ts'o + * Makefile.in: Add a dependency to make sure that the + subdirectories are created before creating all of the + object files. + +2005-12-10 Theodore Ts'o + * res_gdt.c (ext2fs_create_resize_inode): Fix type-punning warning. * read_bb_file.c (ext2fs_read_bb_FILE): Use a data structure diff --git a/lib/ext2fs/Makefile.in b/lib/ext2fs/Makefile.in index b857c61..d0412ff 100644 --- a/lib/ext2fs/Makefile.in +++ b/lib/ext2fs/Makefile.in @@ -270,6 +270,8 @@ distclean:: clean # $(top_builddir)/lib/ext2fs/ext2_err.h: ext2_err.h +$(OBJS): subdirs + # +++ Dependency line eater +++ # # Makefile dependencies follow. This must be the last section in diff --git a/lib/ss/ChangeLog b/lib/ss/ChangeLog index 13447b0..3a41491 100644 --- a/lib/ss/ChangeLog +++ b/lib/ss/ChangeLog @@ -1,3 +1,9 @@ +2005-12-10 Theodore Ts'o + + * Makefile.in: Add a dependency to make sure that the + subdirectories are created before creating all of the + object files. + 2005-07-25 Theodore Ts'o * pager.c (ss_safe_getenv): Pass in zero to the unusued arguments diff --git a/lib/ss/Makefile.in b/lib/ss/Makefile.in index bbcc38b..40e1005 100644 --- a/lib/ss/Makefile.in +++ b/lib/ss/Makefile.in @@ -173,6 +173,8 @@ distclean:: clean # $(top_builddir)/lib/ss/ss_err.h: ss_err.h +$(OBJS): subdirs + # +++ Dependency line eater +++ # # Makefile dependencies follow. This must be the last section in diff --git a/lib/uuid/ChangeLog b/lib/uuid/ChangeLog index b90e063..26a9699 100644 --- a/lib/uuid/ChangeLog +++ b/lib/uuid/ChangeLog @@ -1,3 +1,9 @@ +2005-12-10 Theodore Ts'o + + * Makefile.in: Add a dependency to make sure that the + subdirectories are created before creating all of the + object files. + 2006-06-30 Theodore Ts'o * Release of E2fsprogs 1.38 diff --git a/lib/uuid/Makefile.in b/lib/uuid/Makefile.in index 4656090..2c6b4fa 100644 --- a/lib/uuid/Makefile.in +++ b/lib/uuid/Makefile.in @@ -179,6 +179,8 @@ distclean:: clean ../../lib/libuuid.so: image ../../lib/libuuid.dylib: image +$(OBJS): subdirs + # +++ Dependency line eater +++ # # Makefile dependencies follow. This must be the last section in -- 1.8.3.1