summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorTheodore Ts'o <tytso@mit.edu>2000-07-07 04:31:55 +0000
committerTheodore Ts'o <tytso@mit.edu>2000-07-07 04:31:55 +0000
commitec4785766ea9c8abfb01d3a48788c1e62f2620aa (patch)
treebeda036aadcd07bfec09cf106b8f406a4a080ce5 /lib
parent17390c047f5470eec005c5461a7926d03d6bbbe7 (diff)
downloade2fsprogs-ec4785766ea9c8abfb01d3a48788c1e62f2620aa.tar.gz
ChangeLog, Makefile.in:
Makefile.in (uuid_time): Fix compilation rule so that uuid_time.o doesn't get bashed in order to build the command-line version of uuid_time. .del-ext2_fs.h~7a460879, ChangeLog: ext2_fs.h: Update ext3 extension feature #define's.
Diffstat (limited to 'lib')
-rw-r--r--lib/uuid/ChangeLog6
-rw-r--r--lib/uuid/Makefile.in5
2 files changed, 8 insertions, 3 deletions
diff --git a/lib/uuid/ChangeLog b/lib/uuid/ChangeLog
index 84248f81..f0e14508 100644
--- a/lib/uuid/ChangeLog
+++ b/lib/uuid/ChangeLog
@@ -1,3 +1,9 @@
+2000-07-07 Theodore Ts'o <tytso@valinux.com>
+
+ * Makefile.in (uuid_time): Fix compilation rule so that
+ uuid_time.o doesn't get bashed in order to build the
+ command-line version of uuid_time.
+
2000-07-04 Theodore Ts'o <tytso@valinux.com>
* Makefile.in: Remove explicit link of -lc in the shared library.
diff --git a/lib/uuid/Makefile.in b/lib/uuid/Makefile.in
index 2b0addb1..cbf733dc 100644
--- a/lib/uuid/Makefile.in
+++ b/lib/uuid/Makefile.in
@@ -91,9 +91,8 @@ tst_uuid: tst_uuid.o $(DEPLIBUUID)
$(CC) $(ALL_LDFLAGS) -o tst_uuid tst_uuid.o $(LIBUUID)
uuid_time: $(srcdir)/uuid_time.c $(DEPLIBUUID)
- $(CC) $(ALL_CFLAGS) -DDEBUG $(srcdir)/uuid_time.c -c -o uuid_time.o
- $(CC) -o uuid_time uuid_time.o $(LIBUUID)
- $(RM) uuid_time.o
+ $(CC) $(ALL_CFLAGS) -DDEBUG -o uuid_time $(srcdir)/uuid_time.c \
+ $(LIBUUID)
libuuid.3: $(DEP_SUBSTITUTE) $(srcdir)/libuuid.3.in
$(SUBSTITUTE) $(srcdir)/libuuid.3.in libuuid.3