Merge branch 'maint' into next

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

diff --git a/misc/Makefile.in b/misc/Makefile.in
index 09c6d6a..8fd7704 100644 (file)
--- a/misc/Makefile.in
+++ b/misc/Makefile.in
@@ -11,6 +11,9 @@ INSTALL = @INSTALL@
 
 @MCONFIG@
 
+@LINUX_CMT@E4DEFRAG_PROG= e4defrag
+@LINUX_CMT@E4DEFRAG_MAN= e4defrag.8
+
 @IMAGER_CMT@E2IMAGE_PROG= e2image
 @IMAGER_CMT@E2IMAGE_MAN= e2image.8
 
@@ -50,6 +53,7 @@ FSCK_OBJS=    fsck.o base_device.o ismounted.o
 BLKID_OBJS=    blkid.o
 FILEFRAG_OBJS= filefrag.o
 E2UNDO_OBJS=  e2undo.o
+E4DEFRAG_OBJS= e4defrag.o
 E2FREEFRAG_OBJS= e2freefrag.o
 
 PROFILED_TUNE2FS_OBJS= profiled/tune2fs.o profiled/util.o
@@ -68,7 +72,7 @@ PROFILED_FSCK_OBJS=   profiled/fsck.o profiled/base_device.o \
 PROFILED_BLKID_OBJS=   profiled/blkid.o
 PROFILED_FILEFRAG_OBJS=        profiled/filefrag.o
 PROFILED_E2UNDO_OBJS=  profiled/e2undo.o
-
+PROFILED_E4DEFRAG_OBJS=        profiled/e4defrag.o
 
 XTRA_CFLAGS=   -I$(srcdir)/../e2fsck -I.
 
@@ -99,12 +103,12 @@ COMPILE_ET=$(top_builddir)/lib/et/compile_et --build-tree
 @PROFILE_CMT@  $(Q) $(CC) $(ALL_CFLAGS) -g -pg -o profiled/$*.o -c $<
 
 all:: profiled $(SPROGS) $(UPROGS) $(USPROGS) $(SMANPAGES) $(UMANPAGES) \
-       $(FMANPAGES) $(LPROGS)
+       $(FMANPAGES) $(LPROGS) $(E4DEFRAG_PROG)
 
 @PROFILE_CMT@all:: tune2fs.profiled blkid.profiled e2image.profiled \
        e2undo.profiled mke2fs.profiled dumpe2fs.profiled fsck.profiled \
        logsave.profiled filefrag.profiled uuidgen.profiled uuidd.profiled \
-       e2image.profiled
+       e2image.profiled e4defrag.profiled
 
 profiled:
 @PROFILE_CMT@  $(E) "  MKDIR $@"
@@ -126,7 +130,7 @@ profile.o:
 
 findsuper: findsuper.o
        $(E) "  LD $@"
-       $(Q) $(CC) $(ALL_LDFLAGS) -o findsuper findsuper.o
+       $(Q) $(CC) $(ALL_LDFLAGS) -o findsuper findsuper.o $(LIBS)
 
 partinfo: partinfo.o
        $(E) "  LD $@"
@@ -191,6 +195,15 @@ e2undo.profiled: $(PROFILED_E2UNDO_OBJS) $(PROFILED_DEPLIBS)
        $(Q) $(CC) $(ALL_LDFLAGS) -g -pg -o e2undo.profiled \
                $(PROFILED_E2UNDO_OBJS) $(PROFILED_LIBS) $(LIBINTL)
 
+e4defrag: $(E4DEFRAG_OBJS) $(DEPLIBS)
+       $(E) "  LD $@"
+       $(Q) $(CC) $(ALL_LDFLAGS) -o e4defrag $(E4DEFRAG_OBJS) $(LIBS)
+
+e4defrag.profiled: $(PROFILED_E4DEFRAG_OBJS) $(PROFILED_DEPLIBS)
+       $(E) "  LD $@"
+       $(Q) $(CC) $(ALL_LDFLAGS) -g -pg -o e4defrag.profiled \
+               $(PROFILED_E4DEFRAG_OBJS) $(PROFILED_LIBS)
+
 base_device: base_device.c
        $(E) "  LD $@"
        $(Q) $(CC) $(ALL_CFLAGS) $(ALL_LDFLAGS) $(srcdir)/base_device.c \
@@ -338,6 +351,10 @@ e2image.8: $(DEP_SUBSTITUTE) $(srcdir)/e2image.8.in
        $(E) "  SUBST $@"
        $(Q) $(SUBSTITUTE_UPTIME) $(srcdir)/e2image.8.in e2image.8
 
+e4defrag.8: $(DEP_SUBSTITUTE) $(srcdir)/e4defrag.8.in
+       $(E) "  SUBST $@"
+       $(Q) $(SUBSTITUTE_UPTIME) $(srcdir)/e4defrag.8.in e4defrag.8
+
 dumpe2fs.8: $(DEP_SUBSTITUTE) $(srcdir)/dumpe2fs.8.in 
        $(E) "  SUBST $@"
        $(Q) $(SUBSTITUTE_UPTIME) $(srcdir)/dumpe2fs.8.in dumpe2fs.8
@@ -403,25 +420,17 @@ install: all $(SMANPAGES) $(UMANPAGES) installdirs
                echo "  INSTALL $(sbindir)/$$i"; \
                $(INSTALL_PROGRAM) $$i $(DESTDIR)$(sbindir)/$$i; \
        done
-       $(E) "  LINK $(root_sbindir)/mkfs.ext2"
-       $(Q) $(LN) -f $(DESTDIR)$(root_sbindir)/mke2fs \
-               $(DESTDIR)$(root_sbindir)/mkfs.ext2
-       $(E) "  LINK $(root_sbindir)/mkfs.ext3"
-       $(Q) $(LN) -f $(DESTDIR)$(root_sbindir)/mke2fs \
-               $(DESTDIR)$(root_sbindir)/mkfs.ext3
-       $(E) "  LINK $(root_sbindir)/mkfs.ext4"
-       $(Q) $(LN) -f $(DESTDIR)$(root_sbindir)/mke2fs \
-               $(DESTDIR)$(root_sbindir)/mkfs.ext4
-       $(E) "  LINK $(root_sbindir)/mkfs.ext4dev"
-       $(Q) $(LN) -f $(DESTDIR)$(root_sbindir)/mke2fs \
-               $(DESTDIR)$(root_sbindir)/mkfs.ext4dev
-       $(E) "  LINK $(root_sbindir)/e2label"
-       $(Q) $(LN) -f $(DESTDIR)$(root_sbindir)/tune2fs \
-               $(DESTDIR)$(root_sbindir)/e2label
+       $(Q) for i in ext2 ext3 ext4 ext4dev; do \
+               echo "  LINK $(root_sbindir)/mkfs.$$i"; \
+               (cd $(DESTDIR)$(root_sbindir); \
+                       $(LN) $(LINK_INSTALL_FLAGS) mke2fs mkfs.$$i); \
+       done
+       $(Q) (cd $(DESTDIR)$(root_sbindir); \
+               $(LN) $(LINK_INSTALL_FLAGS) tune2fs e2label)
        $(Q) if test -n "$(FINDFS_LINK)"; then \
-               echo "  LINK $(root_sbindir)/findfs"; \
-               $(LN) -f $(DESTDIR)$(root_sbindir)/tune2fs \
-                       $(DESTDIR)$(root_sbindir)/$(FINDFS_LINK); \
+               echo "  LINK $(root_sbindir)/findfs"; \
+               (cd $(DESTDIR)$(root_sbindir); \
+               $(LN) $(LINK_INSTALL_FLAGS) tune2fs $(FINDFS_LINK)); \
        fi
        $(Q) for i in $(UPROGS); do \
                echo "  INSTALL $(bindir)/$$i"; \
@@ -440,18 +449,11 @@ install: all $(SMANPAGES) $(UMANPAGES) installdirs
        done
        $(Q) $(RM) -f $(DESTDIR)$(man8dir)/mkfs.ext2.8.gz \
                $(DESTDIR)$(man8dir)/mkfs.ext3.8.gz
-       $(E) "  LINK mkfs.ext2.8"
-       $(Q) $(LN) -f $(DESTDIR)$(man8dir)/mke2fs.8 \
-               $(DESTDIR)$(man8dir)/mkfs.ext2.8
-       $(E) "  LINK mkfs.ext3.8"
-       $(Q) $(LN) -f $(DESTDIR)$(man8dir)/mke2fs.8 \
-               $(DESTDIR)$(man8dir)/mkfs.ext3.8
-       $(E) "  LINK mkfs.ext4.8"
-       $(Q) $(LN) -f $(DESTDIR)$(man8dir)/mke2fs.8 \
-               $(DESTDIR)$(man8dir)/mkfs.ext4.8
-       $(E) "  LINK mkfs.ext4dev.8"
-       $(Q) $(LN) -f $(DESTDIR)$(man8dir)/mke2fs.8 \
-               $(DESTDIR)$(man8dir)/mkfs.ext4dev.8
+       $(Q) for i in ext2 ext3 ext4 ext4dev; do \
+               echo "  LINK mkfs.$$i.8"; \
+               (cd $(DESTDIR)$(man8dir); \
+                       $(LN) $(LINK_INSTALL_FLAGS) mke2fs.8 mkfs.$$i.8); \
+       done
        $(Q) for i in $(UMANPAGES); do \
                for j in $(COMPRESS_EXT); do \
                        $(RM) -f $(DESTDIR)$(man1dir)/$$i.$$j; \