Fixx gcc -Wall nitpicks.

[tools/e2fsprogs.git] / misc / Makefile.in

diff --git a/misc/Makefile.in b/misc/Makefile.in
index 8263a25..2a3c644 100644 (file)
--- a/misc/Makefile.in
+++ b/misc/Makefile.in
@@ -14,10 +14,12 @@ INSTALL = @INSTALL@
 @IMAGER_CMT@E2IMAGE_PROG= e2image
 @IMAGER_CMT@E2IMAGE_MAN= e2image.8
 
-SPROGS=                mke2fs badblocks tune2fs dumpe2fs blkid $(E2IMAGE_PROG) @FSCK_PROG@
+SPROGS=                mke2fs badblocks tune2fs dumpe2fs blkid logsave \
+                       $(E2IMAGE_PROG) @FSCK_PROG@ 
 USPROGS=       mklost+found
 SMANPAGES=     tune2fs.8 mklost+found.8 mke2fs.8 dumpe2fs.8 badblocks.8 \
-                       e2label.8 findfs.8 blkid.8 $(E2IMAGE_MAN) @FSCK_MAN@
+                       e2label.8 findfs.8 blkid.8 $(E2IMAGE_MAN) \
+                       logsave.8 @FSCK_MAN@
 
 UPROGS=                chattr lsattr uuidgen
 UMANPAGES=     chattr.1 lsattr.1 uuidgen.1
@@ -46,10 +48,10 @@ STATIC_LIBS= $(STATIC_LIBEXT2FS) $(STATIC_LIBCOM_ERR)
 STATIC_DEPLIBS= $(STATIC_LIBEXT2FS) $(STATIC_LIBCOM_ERR) 
 
 LIBS_BLKID= $(LIBBLKID) $(LIBUUID)
-DEPLIBS_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 $@
@@ -59,15 +61,15 @@ 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) $(LIBINTL)
 
-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) $(LIBINTL)
 
 e2image: $(E2IMAGE_OBJS) $(DEPLIBS)
-       $(CC) $(ALL_LDFLAGS) -o e2image $(E2IMAGE_OBJS) $(LIBS)
+       $(CC) $(ALL_LDFLAGS) -o e2image $(E2IMAGE_OBJS) $(LIBS) $(LIBINTL)
 
 base_device: base_device.c
        $(CC) $(ALL_CFLAGS) $(ALL_LDFLAGS) $(srcdir)/base_device.c \
@@ -78,36 +80,40 @@ check:: base_device
        cmp $(srcdir)/base_device.tst base_device.out
 
 mklost+found: $(MKLPF_OBJS)
-       $(CC) $(ALL_LDFLAGS) -o mklost+found $(MKLPF_OBJS)
+       $(CC) $(ALL_LDFLAGS) -o mklost+found $(MKLPF_OBJS) $(LIBINTL)
 
 mke2fs: $(MKE2FS_OBJS) $(DEPLIBS) $(LIBE2P) $(DEPLIBUUID) $(DEPLIBS_BLKID)
        $(CC) $(ALL_LDFLAGS) -o mke2fs $(MKE2FS_OBJS) $(LIBS) $(LIBS_BLKID) \
-               $(LIBE2P) $(LIBUUID)
+               $(LIBE2P) $(LIBUUID) $(LIBINTL)
 
 mke2fs.static: $(MKE2FS_OBJS) $(STATIC_DEPLIBS) $(STATIC_LIBE2P) $(DEPSTATIC_LIBUUID)
        $(CC) $(ALL_LDFLAGS) -static -o mke2fs.static $(MKE2FS_OBJS) \
-               $(STATIC_LIBS) $(STATIC_LIBE2P) $(STATIC_LIBUUID)
+               $(STATIC_LIBS) $(STATIC_LIBE2P) $(STATIC_LIBUUID) $(LIBINTL)
 
 resize2fs: resize2fs.o $(DEPLIBS)
-       $(CC) $(ALL_LDFLAGS) -o resize2fs resize2fs.o $(LIBS)
+       $(CC) $(ALL_LDFLAGS) -o resize2fs resize2fs.o $(LIBS) $(LIBINTL)
 
 chattr: $(CHATTR_OBJS) $(DEPLIBS_E2P)
-       $(CC) $(ALL_LDFLAGS) -o chattr $(CHATTR_OBJS) $(LIBS_E2P)
+       $(CC) $(ALL_LDFLAGS) -o chattr $(CHATTR_OBJS) $(LIBS_E2P) $(LIBINTL)
 
 lsattr: $(LSATTR_OBJS) $(DEPLIBS_E2P)
-       $(CC) $(ALL_LDFLAGS) -o lsattr $(LSATTR_OBJS) $(LIBS_E2P)
+       $(CC) $(ALL_LDFLAGS) -o lsattr $(LSATTR_OBJS) $(LIBS_E2P) $(LIBINTL)
 
 uuidgen: $(UUIDGEN_OBJS) $(DEPLIBUUID)
-       $(CC) $(ALL_LDFLAGS) -o uuidgen $(UUIDGEN_OBJS) $(LIBUUID)
+       $(CC) $(ALL_LDFLAGS) -o uuidgen $(UUIDGEN_OBJS) $(LIBUUID) $(LIBINTL)
 
-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) $(LIBINTL)
 
 fsck: $(FSCK_OBJS) $(DEBLIBS_BLKID)
-       $(CC) $(ALL_LDFLAGS) -o fsck $(FSCK_OBJS) $(LIBS) $(LIBS_BLKID)
+       $(CC) $(ALL_LDFLAGS) -o fsck $(FSCK_OBJS) $(LIBS_BLKID) $(LIBINTL)
 
 badblocks: $(BADBLOCKS_OBJS) $(DEPLIBS)
-       $(CC) $(ALL_LDFLAGS) -o badblocks $(BADBLOCKS_OBJS) $(LIBS)
+       $(CC) $(ALL_LDFLAGS) -o badblocks $(BADBLOCKS_OBJS) $(LIBS) $(LIBINTL)
+
+logsave: logsave.o
+       $(CC) $(ALL_LDFLAGS) -o logsave logsave.o
 
 tune2fs.8: $(DEP_SUBSTITUTE) $(srcdir)/tune2fs.8.in
        $(SUBSTITUTE) $(srcdir)/tune2fs.8.in tune2fs.8
@@ -139,6 +145,9 @@ fsck.8: $(DEP_SUBSTITUTE) $(srcdir)/fsck.8.in
 blkid.8: $(DEP_SUBSTITUTE) $(srcdir)/blkid.8.in
        $(SUBSTITUTE) $(srcdir)/blkid.8.in blkid.8
 
+logsave.8: $(DEP_SUBSTITUTE) $(srcdir)/logsave.8.in
+       $(SUBSTITUTE) $(srcdir)/logsave.8.in logsave.8
+
 chattr.1: $(DEP_SUBSTITUTE) $(srcdir)/chattr.1.in
        $(SUBSTITUTE) $(srcdir)/chattr.1.in chattr.1