Merge tag 'android-7.1.2_r39' into nougat-x86

[android-x86/external-e2fsprogs.git] / misc / Makefile.in

diff --git a/misc/Makefile.in b/misc/Makefile.in
index 0692126..553c361 100644 (file)
--- a/misc/Makefile.in
+++ b/misc/Makefile.in
@@ -33,7 +33,7 @@ SMANPAGES=    tune2fs.8 mklost+found.8 mke2fs.8 dumpe2fs.8 badblocks.8 \
                        e2label.8 $(FINDFS_MAN) $(BLKID_MAN) $(E2IMAGE_MAN) \
                        logsave.8 filefrag.8 e2freefrag.8 e2undo.8 \
                        $(UUIDD_MAN) $(E4DEFRAG_MAN) @FSCK_MAN@
-FMANPAGES=     mke2fs.conf.5
+FMANPAGES=     mke2fs.conf.5 ext4.5
 
 UPROGS=                chattr lsattr @UUID_CMT@ uuidgen
 UMANPAGES=     chattr.1 lsattr.1 @UUID_CMT@ uuidgen.1
@@ -72,6 +72,7 @@ PROFILED_FSCK_OBJS=   profiled/fsck.o profiled/base_device.o \
                        profiled/ismounted.o
 PROFILED_BLKID_OBJS=   profiled/blkid.o
 PROFILED_FILEFRAG_OBJS=        profiled/filefrag.o
+PROFILED_E2FREEFRAG_OBJS= profiled/e2freefrag.o
 PROFILED_E2UNDO_OBJS=  profiled/e2undo.o
 PROFILED_E4DEFRAG_OBJS=        profiled/e4defrag.o
 
@@ -99,6 +100,7 @@ COMPILE_ET=$(top_builddir)/lib/et/compile_et --build-tree
 .c.o:
        $(E) "  CC $<"
        $(Q) $(CC) -c $(ALL_CFLAGS) $< -o $@
+       $(Q) $(CHECK_CMD) $(ALL_CFLAGS) $<
 @PROFILE_CMT@  $(Q) $(CC) $(ALL_CFLAGS) -g -pg -o profiled/$*.o -c $<
 
 all:: profiled $(SPROGS) $(UPROGS) $(USPROGS) $(SMANPAGES) $(UMANPAGES) \
@@ -107,7 +109,7 @@ all:: profiled $(SPROGS) $(UPROGS) $(USPROGS) $(SMANPAGES) $(UMANPAGES) \
 @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 e4defrag.profiled
+       e2image.profiled e4defrag.profiled e2freefrag.profiled
 
 profiled:
 @PROFILE_CMT@  $(E) "  MKDIR $@"
@@ -164,7 +166,7 @@ tune2fs.static: $(TUNE2FS_OBJS) $(STATIC_DEPLIBS) $(STATIC_LIBE2P) $(DEPSTATIC_L
                $(STATIC_LIBS) $(STATIC_LIBBLKID) $(STATIC_LIBUUID) \
                $(STATIC_LIBQUOTA) $(STATIC_LIBE2P) $(LIBINTL)
 
-tune2fs.profiled: $(PROFILED_TUNE2FS_OBJS) $(PROFILED_DEPLIBS) \
+tune2fs.profiled: $(TUNE2FS_OBJS) $(PROFILED_DEPLIBS) \
                $(PROFILED_E2P) $(DEPPROFILED_LIBBLKID) $(DEPPROFILED_LIBUUID) \
                $(DEPPROFILED_LIBQUOTA)
        $(E) "  LD $@"
@@ -183,7 +185,7 @@ blkid.static: $(BLKID_OBJS) $(STATIC_DEPLIBS) $(DEPSTATIC_LIBBLKID)
        $(Q) $(CC) $(ALL_LDFLAGS) -o blkid.static $(BLKID_OBJS) $(STATIC_LIBS) \
                $(STATIC_LIBBLKID) $(LIBINTL)
 
-blkid.profiled: $(PROFILED_BLKID_OBJS) $(DEPPROFILED_LIBBLKID) \
+blkid.profiled: $(BLKID_OBJS) $(DEPPROFILED_LIBBLKID) \
                $(PROFILED_LIBEXT2FS)
        $(E) "  LD $@"
        $(Q) $(CC) $(ALL_LDFLAGS) -g -pg -o blkid.profiled $(PROFILED_BLKID_OBJS) \
@@ -193,7 +195,7 @@ e2image: $(E2IMAGE_OBJS) $(DEPLIBS)
        $(E) "  LD $@"
        $(Q) $(CC) $(ALL_LDFLAGS) -o e2image $(E2IMAGE_OBJS) $(LIBS) $(LIBINTL)
 
-e2image.profiled: $(PROFILED_E2IMAGE_OBJS) $(PROFILED_DEPLIBS)
+e2image.profiled: $(E2IMAGE_OBJS) $(PROFILED_DEPLIBS)
        $(E) "  LD $@"
        $(Q) $(CC) $(ALL_LDFLAGS) -g -pg -o e2image.profiled \
                $(PROFILED_E2IMAGE_OBJS) $(PROFILED_LIBS) $(LIBINTL)
@@ -202,7 +204,7 @@ e2undo: $(E2UNDO_OBJS) $(DEPLIBS)
        $(E) "  LD $@"
        $(Q) $(CC) $(ALL_LDFLAGS) -o e2undo $(E2UNDO_OBJS) $(LIBS) $(LIBINTL)
 
-e2undo.profiled: $(PROFILED_E2UNDO_OBJS) $(PROFILED_DEPLIBS)
+e2undo.profiled: $(E2UNDO_OBJS) $(PROFILED_DEPLIBS)
        $(E) "  LD $@"
        $(Q) $(CC) $(ALL_LDFLAGS) -g -pg -o e2undo.profiled \
                $(PROFILED_E2UNDO_OBJS) $(PROFILED_LIBS) $(LIBINTL)
@@ -211,7 +213,7 @@ e4defrag: $(E4DEFRAG_OBJS) $(DEPLIBS)
        $(E) "  LD $@"
        $(Q) $(CC) $(ALL_LDFLAGS) -o e4defrag $(E4DEFRAG_OBJS) $(LIBS)
 
-e4defrag.profiled: $(PROFILED_E4DEFRAG_OBJS) $(PROFILED_DEPLIBS)
+e4defrag.profiled: $(E4DEFRAG_OBJS) $(PROFILED_DEPLIBS)
        $(E) "  LD $@"
        $(Q) $(CC) $(ALL_LDFLAGS) -g -pg -o e4defrag.profiled \
                $(PROFILED_E4DEFRAG_OBJS) $(PROFILED_LIBS)
@@ -242,7 +244,7 @@ mke2fs.static: $(MKE2FS_OBJS) $(STATIC_DEPLIBS) $(STATIC_LIBE2P) $(DEPSTATIC_LIB
                $(STATIC_LIBQUOTA) $(STATIC_LIBS) $(STATIC_LIBE2P) \
                $(STATIC_LIBBLKID) $(STATIC_LIBUUID) $(LIBINTL)
 
-mke2fs.profiled: $(PROFILED_MKE2FS_OBJS) $(PROFILED_DEPLIBS) \
+mke2fs.profiled: $(MKE2FS_OBJS) $(PROFILED_DEPLIBS) \
        $(PROFILED_LIBE2P) $(PROFILED_DEPLIBBLKID) $(PROFILED_DEPLIBUUID) \
        $(PROFILED_LIBQUOTA)
        $(E) "  LD $@"
@@ -263,7 +265,7 @@ uuidgen: $(UUIDGEN_OBJS) $(DEPLIBUUID)
        $(E) "  LD $@"
        $(Q) $(CC) $(ALL_LDFLAGS) -o uuidgen $(UUIDGEN_OBJS) $(LIBUUID) $(LIBINTL)
 
-uuidgen.profiled: $(PROFILED_UUIDGEN_OBJS) $(PROFILED_DEPLIBUUID)
+uuidgen.profiled: $(UUIDGEN_OBJS) $(PROFILED_DEPLIBUUID)
        $(E) "  LD $@"
        $(Q) $(CC) $(ALL_LDFLAGS) -g -pg -o uuidgen.profiled \
                $(PROFILED_UUIDGEN_OBJS) $(PROFILED_LIBUUID) $(LIBINTL)
@@ -272,7 +274,7 @@ uuidd: $(UUIDD_OBJS) $(DEPLIBUUID)
        $(E) "  LD $@"
        $(Q) $(CC) $(ALL_LDFLAGS) -o uuidd $(UUIDD_OBJS) $(LIBUUID) $(LIBINTL)
 
-uuidd.profiled: $(PROFILED_UUIDD_OBJS) $(PROFILED_DEPLIBUUID)
+uuidd.profiled: $(UUIDD_OBJS) $(PROFILED_DEPLIBUUID)
        $(E) "  LD $@"
        $(Q) $(CC) $(ALL_LDFLAGS) -g -pg -o uuidd.profiled $(PROFILED_UUIDD_OBJS) \
                $(PROFILED_LIBUUID) $(LIBINTL)
@@ -282,7 +284,7 @@ dumpe2fs: $(DUMPE2FS_OBJS) $(DEPLIBS) $(DEPLIBS_E2P) $(DEPLIBUUID)
        $(Q) $(CC) $(ALL_LDFLAGS) -o dumpe2fs $(DUMPE2FS_OBJS) $(LIBS) \
                $(LIBS_E2P) $(LIBUUID) $(LIBINTL)
 
-dumpe2fs.profiled: $(PROFILED_DUMPE2FS_OBJS) $(PROFILED_DEPLIBS) \
+dumpe2fs.profiled: $(DUMPE2FS_OBJS) $(PROFILED_DEPLIBS) \
                $(PROFILED_LIBE2P) $(PROFILED_DEPLIBUUID)
        $(E) "  LD $@"
        $(Q) $(CC) $(ALL_LDFLAGS) -g -pg -o dumpe2fs.profiled \
@@ -293,7 +295,7 @@ fsck: $(FSCK_OBJS) $(DEPLIBBLKID)
        $(E) "  LD $@"
        $(Q) $(CC) $(ALL_LDFLAGS) -o fsck $(FSCK_OBJS) $(LIBBLKID) $(LIBINTL)
 
-fsck.profiled: $(PROFILED_FSCK_OBJS) $(PROFILED_DEPLIBBLKID)
+fsck.profiled: $(FSCK_OBJS) $(PROFILED_DEPLIBBLKID)
        $(E) "  LD $@"
        $(Q) $(CC) $(ALL_LDFLAGS) -g -pg -o fsck.profiled $(PROFILED_FSCK_OBJS) \
                $(PROFILED_LIBBLKID) $(LIBINTL)
@@ -302,7 +304,7 @@ badblocks: $(BADBLOCKS_OBJS) $(DEPLIBS)
        $(E) "  LD $@"
        $(Q) $(CC) $(ALL_LDFLAGS) -o badblocks $(BADBLOCKS_OBJS) $(LIBS) $(LIBINTL)
 
-badblocks.profiled: $(PROFILED_BADBLOCKS_OBJS) $(PROFILED_DEPLIBS)
+badblocks.profiled: $(BADBLOCKS_OBJS) $(PROFILED_DEPLIBS)
        $(E) "  LD $@"
        $(Q) $(CC) $(ALL_LDFLAGS) -g -pg -o badblocks.profiled \
                $(PROFILED_BADBLOCKS_OBJS) $(PROFILED_LIBS) $(LIBINTL)
@@ -311,7 +313,7 @@ logsave: logsave.o
        $(E) "  LD $@"
        $(Q) $(CC) $(ALL_LDFLAGS) -o logsave logsave.o
 
-logsave.profiled: profiled/logsave.o
+logsave.profiled: logsave.o
        $(E) "  LD $@"
        $(Q) $(CC) $(ALL_LDFLAGS) -g -pg -o logsave.profiled profiled/logsave.o
 
@@ -319,11 +321,16 @@ e2freefrag: $(E2FREEFRAG_OBJS)
        $(E) "  LD $@"
        $(Q) $(CC) $(ALL_LDFLAGS) -o e2freefrag $(E2FREEFRAG_OBJS) $(LIBS)
 
+e2freefrag.profiled: $(E2FREEFRAG_OBJS) $(PROFILED_DEPLIBS)
+       $(E) "  LD $@"
+       $(Q) $(CC) $(ALL_LDFLAGS) -g -pg -o e2freefrag.profiled \
+               $(PROFILED_E2FREEFRAG_OBJS) $(PROFILED_LIBS)
+
 filefrag: $(FILEFRAG_OBJS)
        $(E) "  LD $@"
        $(Q) $(CC) $(ALL_LDFLAGS) -o filefrag $(FILEFRAG_OBJS) 
 
-filefrag.profiled: $(PROFILED_FILEFRAG_OBJS)
+filefrag.profiled: $(FILEFRAG_OBJS)
        $(E) "  LD $@"
        $(Q) $(CC) $(ALL_LDFLAGS) -g -pg -o filefrag.profiled \
                $(PROFILED_FILEFRAG_OBJS) 
@@ -349,6 +356,10 @@ mke2fs.conf.5: $(DEP_SUBSTITUTE) $(srcdir)/mke2fs.conf.5.in
        $(E) "  SUBST $@"
        $(Q) $(SUBSTITUTE_UPTIME) $(srcdir)/mke2fs.conf.5.in mke2fs.conf.5
 
+ext4.5: $(DEP_SUBSTITUTE) $(srcdir)/ext4.5.in
+       $(E) "  SUBST $@"
+       $(Q) $(SUBSTITUTE_UPTIME) $(srcdir)/$@.in $@
+
 e2label.8: $(DEP_SUBSTITUTE) $(srcdir)/e2label.8.in
        $(E) "  SUBST $@"
        $(Q) $(SUBSTITUTE_UPTIME) $(srcdir)/e2label.8.in e2label.8
@@ -482,6 +493,11 @@ install: all $(SMANPAGES) $(UMANPAGES) installdirs
                $(ES) " INSTALL_DATA $(man5dir)/$$i"; \
                $(INSTALL_DATA) $$i $(DESTDIR)$(man5dir)/$$i; \
        done
+       $(Q) for i in ext2 ext3; do \
+               $(ES) " LINK $$i.5"; \
+               (cd $(DESTDIR)$(man5dir); \
+                       $(LN) $(LINK_INSTALL_FLAGS) ext4.5 $$i.5); \
+       done
        $(Q) if test -f $(DESTDIR)$(root_sysconfdir)/mke2fs.conf; then \
                if cmp -s $(DESTDIR)$(root_sysconfdir)/mke2fs.conf \
                        mke2fs.conf; then \
@@ -544,7 +560,12 @@ uninstall:
        $(RM) -f $(DESTDIR)$(man8dir)/mkfs.ext2.8 \
                $(DESTDIR)$(man8dir)/mkfs.ext3.8 \
                $(DESTDIR)$(man8dir)/mkfs.ext4.8 \
-               $(DESTDIR)$(man8dir)/mkfs.ext4dev.8
+               $(DESTDIR)$(man8dir)/mkfs.ext4dev.8 \
+               $(DESTDIR)$(man8dir)/fsck.ext2.8 \
+               $(DESTDIR)$(man8dir)/fsck.ext3.8 \
+               $(DESTDIR)$(man8dir)/fsck.ext4.8 \
+               $(DESTDIR)$(man8dir)/fsck.ext4dev.8
+
        for i in $(UMANPAGES); do \
                $(RM) -f $(DESTDIR)$(man1dir)/$$i; \
        done
@@ -554,6 +575,10 @@ uninstall:
        for i in $(FMANPAGES); do \
                $(RM) -f $(DESTDIR)$(man5dir)/$$i; \
        done
+       $(Q) for i in ext2 ext3; do \
+               $(ES) " LINK $$i.5"; \
+               $(RM) -f $(DESTDIR)$(man5dir)/$$i.5; \
+       done
        if cmp -s mke2fs.conf $(DESTDIR)/$(root_sysconfdir)/mke2fs.conf; then \
                $(RM) $(DESTDIR)/$(root_sysconfdir)/mke2fs.conf; \
        fi
@@ -656,7 +681,11 @@ blkid.o: $(srcdir)/blkid.c $(top_builddir)/lib/config.h \
 logsave.o: $(srcdir)/logsave.c $(top_builddir)/lib/config.h \
  $(top_builddir)/lib/dirpaths.h
 filefrag.o: $(srcdir)/filefrag.c $(top_builddir)/lib/config.h \
- $(top_builddir)/lib/dirpaths.h $(top_builddir)/lib/ext2fs/ext2_types.h \
+ $(top_builddir)/lib/dirpaths.h $(top_srcdir)/lib/ext2fs/ext2fs.h \
+ $(top_builddir)/lib/ext2fs/ext2_types.h $(top_srcdir)/lib/ext2fs/ext2_fs.h \
+ $(top_srcdir)/lib/ext2fs/ext3_extents.h $(top_srcdir)/lib/et/com_err.h \
+ $(top_srcdir)/lib/ext2fs/ext2_io.h $(top_builddir)/lib/ext2fs/ext2_err.h \
+ $(top_srcdir)/lib/ext2fs/ext2_ext_attr.h $(top_srcdir)/lib/ext2fs/bitops.h \
  $(top_srcdir)/lib/ext2fs/fiemap.h
 base_device.o: $(srcdir)/base_device.c $(top_builddir)/lib/config.h \
  $(top_builddir)/lib/dirpaths.h $(srcdir)/fsck.h