From fc56eee2eaf97243122725460612ab6455193e09 Mon Sep 17 00:00:00 2001 From: Theodore Ts'o Date: Fri, 18 Apr 2003 07:32:00 -0400 Subject: [PATCH] Makefile.in (uuidgen): Avoid linking lsattr and chattr against libext2fs, and avoid linking blkid against any of the ext2 libraries. --- misc/ChangeLog | 6 ++++++ misc/Makefile.in | 19 ++++++++++--------- 2 files changed, 16 insertions(+), 9 deletions(-) diff --git a/misc/ChangeLog b/misc/ChangeLog index 621eb12c..86d995cc 100644 --- a/misc/ChangeLog +++ b/misc/ChangeLog @@ -1,3 +1,9 @@ +2003-04-18 Theodore Ts'o + + * Makefile.in (uuidgen): Avoid linking lsattr and chattr against + libext2fs, and avoid linking blkid against any of the ext2 + libraries. + 2003-04-17 Theodore Ts'o * Makefile.in (fsck): Fsck does not need to linked against the diff --git a/misc/Makefile.in b/misc/Makefile.in index 788fce74..f06280cb 100644 --- a/misc/Makefile.in +++ b/misc/Makefile.in @@ -50,8 +50,8 @@ STATIC_DEPLIBS= $(STATIC_LIBEXT2FS) $(STATIC_LIBCOM_ERR) LIBS_BLKID= $(LIBBLKID) $(LIBUUID) DEPLIBS_BLKID= $(LIBBLKID) $(DEPLIBUUID) -LIBS_E2P= $(LIBEXT2FS) $(LIBE2P) $(LIBCOM_ERR) -DEPLIBS_E2P= $(LIBEXT2FS) $(LIBE2P) $(LIBCOM_ERR) +LIBS_E2P= $(LIBE2P) $(LIBCOM_ERR) +DEPLIBS_E2P= $(LIBE2P) $(LIBCOM_ERR) .c.o: $(CC) -c $(ALL_CFLAGS) $< -o $@ @@ -61,12 +61,12 @@ all:: $(SPROGS) $(UPROGS) $(USPROGS) $(SMANPAGES) $(UMANPAGES) findsuper: findsuper.o $(CC) $(ALL_LDFLAGS) -o findsuper findsuper.o -tune2fs: $(TUNE2FS_OBJS) $(DEPLIBS_E2P) $(DEPLIBUUID) $(DEPLIBS_BLKID) - $(CC) $(ALL_LDFLAGS) -o tune2fs $(TUNE2FS_OBJS) $(LIBS_BLKID) \ - $(LIBS_E2P) $(LIBUUID) +tune2fs: $(TUNE2FS_OBJS) $(DEPLIBS) $(DEPLIBS_E2P) $(DEPLIBS_BLKID) + $(CC) $(ALL_LDFLAGS) -o tune2fs $(TUNE2FS_OBJS) $(LIBS) \ + $(LIBS_BLKID) $(LIBS_E2P) -blkid: $(BLKID_OBJS) $(DEPLIBS_E2P) $(DEPLIBS_BLKID) - $(CC) $(ALL_LDFLAGS) -o blkid $(BLKID_OBJS) $(LIBS_E2P) $(LIBS_BLKID) +blkid: $(BLKID_OBJS) $(DEPLIBS_BLKID) + $(CC) $(ALL_LDFLAGS) -o blkid $(BLKID_OBJS) $(LIBS_BLKID) e2image: $(E2IMAGE_OBJS) $(DEPLIBS) $(CC) $(ALL_LDFLAGS) -o e2image $(E2IMAGE_OBJS) $(LIBS) @@ -102,8 +102,9 @@ lsattr: $(LSATTR_OBJS) $(DEPLIBS_E2P) uuidgen: $(UUIDGEN_OBJS) $(DEPLIBUUID) $(CC) $(ALL_LDFLAGS) -o uuidgen $(UUIDGEN_OBJS) $(LIBUUID) -dumpe2fs: $(DUMPE2FS_OBJS) $(DEPLIBS_E2P) $(DEPLIBUUID) - $(CC) $(ALL_LDFLAGS) -o dumpe2fs $(DUMPE2FS_OBJS) $(LIBS_E2P) $(LIBUUID) +dumpe2fs: $(DUMPE2FS_OBJS) $(DEPLIBS) $(DEPLIBS_E2P) $(DEPLIBUUID) + $(CC) $(ALL_LDFLAGS) -o dumpe2fs $(DUMPE2FS_OBJS) $(LIBS) \ + $(LIBS_E2P) $(LIBUUID) fsck: $(FSCK_OBJS) $(DEBLIBS_BLKID) $(CC) $(ALL_LDFLAGS) -o fsck $(FSCK_OBJS) $(LIBS_BLKID) -- 2.11.0