Whamcloud - gitweb
git://git.whamcloud.com / tools / e2fsprogs.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
fix check_mntent_file() to pass mode for open(O_CREAT)
[tools/e2fsprogs.git] / misc / Makefile.in
diff --git a/misc/Makefile.in b/misc/Makefile.in
index 29afcb3..db18985 100644 (file)
--- a/misc/Makefile.in
+++ b/misc/Makefile.in
@@ -20,6 +20,7 @@ USPROGS=      mklost+found filefrag
 SMANPAGES=     tune2fs.8 mklost+found.8 mke2fs.8 dumpe2fs.8 badblocks.8 \
                        e2label.8 findfs.8 blkid.8 $(E2IMAGE_MAN) \
                        logsave.8 filefrag.8 @FSCK_MAN@ 
+FMANPAGES=     mke2fs.conf.5
 
 UPROGS=                chattr lsattr uuidgen
 UMANPAGES=     chattr.1 lsattr.1 uuidgen.1
@@ -28,7 +29,7 @@ LPROGS=               @E2INITRD_PROG@
 
 TUNE2FS_OBJS=  tune2fs.o util.o
 MKLPF_OBJS=    mklost+found.o
-MKE2FS_OBJS=   mke2fs.o util.o 
+MKE2FS_OBJS=   mke2fs.o util.o profile.o prof_err.o default_profile.o
 CHATTR_OBJS=   chattr.o
 LSATTR_OBJS=   lsattr.o
 UUIDGEN_OBJS=  uuidgen.o
@@ -39,11 +40,14 @@ FSCK_OBJS=  fsck.o base_device.o
 BLKID_OBJS=    blkid.o
 FILEFRAG_OBJS= filefrag.o
 
+XTRA_CFLAGS=   -I$(srcdir)/../e2fsck -I.
+
 SRCS=  $(srcdir)/tune2fs.c $(srcdir)/mklost+found.c $(srcdir)/mke2fs.c \
                $(srcdir)/chattr.c $(srcdir)/lsattr.c $(srcdir)/dumpe2fs.c \
                $(srcdir)/badblocks.c $(srcdir)/fsck.c $(srcdir)/util.c \
                $(srcdir)/uuidgen.c $(srcdir)/blkid.c $(srcdir)/logsave.c \
-               $(srcdir)/filefrag.c $(srcdir)/base_device.c
+               $(srcdir)/filefrag.c $(srcdir)/base_device.c \
+               $(srcdir)/../e2fsck/profile.c
 
 LIBS= $(LIBEXT2FS) $(LIBCOM_ERR) 
 DEPLIBS= $(LIBEXT2FS) $(LIBCOM_ERR) 
@@ -52,21 +56,40 @@ STATIC_LIBS= $(STATIC_LIBEXT2FS) $(STATIC_LIBCOM_ERR)
 STATIC_DEPLIBS= $(STATIC_LIBEXT2FS) $(STATIC_LIBCOM_ERR) 
 
 LIBS_BLKID= $(LIBBLKID) $(LIBUUID)
-DEPLIBS_BLKID= $(LIBBLKID) $(DEPLIBUUID)
+DEPLIBS_BLKID= $(DEPLIBBLKID) $(DEPLIBUUID)
 
 LIBS_E2P= $(LIBE2P) $(LIBCOM_ERR) 
 DEPLIBS_E2P= $(LIBE2P) $(LIBCOM_ERR) 
 
+COMPILE_ET=$(top_builddir)/lib/et/compile_et --build-tree
+
 .c.o:
        @echo " CC $<"
        @$(CC) -c $(ALL_CFLAGS) $< -o $@
 
-all:: $(SPROGS) $(UPROGS) $(USPROGS) $(SMANPAGES) $(UMANPAGES) $(LPROGS)
+all:: $(SPROGS) $(UPROGS) $(USPROGS) $(SMANPAGES) $(UMANPAGES) \
+       $(FMANPAGES) $(LPROGS)
+
+prof_err.c prof_err.h: $(srcdir)/../e2fsck/prof_err.et
+       @echo " COMPILE_ET prof_err.et"
+       @$(COMPILE_ET) $(srcdir)/../e2fsck/prof_err.et
+
+default_profile.c: $(srcdir)/mke2fs.conf $(srcdir)/profile-to-c.awk
+       @echo " PROFILE_TO_C mke2fs.conf"
+       $(AWK) -f $(srcdir)/profile-to-c.awk < $(srcdir)/mke2fs.conf \
+               >  default_profile.c
+profile.o:
+       @echo " CC $<"
+       @$(CC) -c $(ALL_CFLAGS) $(srcdir)/../e2fsck/profile.c -o $@
 
 findsuper: findsuper.o
        @echo " LD $@"
        @$(CC) $(ALL_LDFLAGS) -o findsuper findsuper.o
 
+partinfo: partinfo.o
+       @echo " LD $@"
+       @$(CC) $(ALL_LDFLAGS) -o partinfo partinfo.o
+
 e2initrd_helper: e2initrd_helper.o $(DEPLIBS) $(DEPLIBS_E2P) $(DEPLIBS_BLKID)
        @echo " LD $@"
        @$(CC) $(ALL_LDFLAGS) -o e2initrd_helper e2initrd_helper.o $(LIBS) \
@@ -109,10 +132,6 @@ mke2fs.static: $(MKE2FS_OBJS) $(STATIC_DEPLIBS) $(STATIC_LIBE2P) $(DEPSTATIC_LIB
                $(STATIC_LIBS) $(STATIC_LIBE2P) $(STATIC_LIBBLKID) \
                $(STATIC_LIBUUID) $(LIBINTL)
 
-resize2fs: resize2fs.o $(DEPLIBS)
-       @echo " LD $@"
-       @$(CC) $(ALL_LDFLAGS) -o resize2fs resize2fs.o $(LIBS) $(LIBINTL)
-
 chattr: $(CHATTR_OBJS) $(DEPLIBS_E2P)
        @echo " LD $@"
        @$(CC) $(ALL_LDFLAGS) -o chattr $(CHATTR_OBJS) $(LIBS_E2P) $(LIBINTL)
@@ -158,6 +177,10 @@ mke2fs.8: $(DEP_SUBSTITUTE) $(srcdir)/mke2fs.8.in
        @echo " SUBST $@"
        @$(SUBSTITUTE_UPTIME) $(srcdir)/mke2fs.8.in mke2fs.8
 
+mke2fs.conf.5: $(DEP_SUBSTITUTE) $(srcdir)/mke2fs.conf.5.in
+       @echo " SUBST $@"
+       @$(SUBSTITUTE_UPTIME) $(srcdir)/mke2fs.conf.5.in mke2fs.conf.5
+
 e2label.8: $(DEP_SUBSTITUTE) $(srcdir)/e2label.8.in
        @echo " SUBST $@"
        @$(SUBSTITUTE_UPTIME) $(srcdir)/e2label.8.in e2label.8
@@ -211,10 +234,12 @@ filefrag.8: $(DEP_SUBSTITUTE) $(srcdir)/filefrag.8.in
        @$(SUBSTITUTE_UPTIME) $(srcdir)/filefrag.8.in filefrag.8
 
 installdirs:
-       @echo " MKINSTALLDIRS $(sbindir) $(root_sbindir) $(bindir) $(man1dir) $(man8dir) $(libdir)"
+       @echo " MKINSTALLDIRS $(sbindir) $(root_sbindir) $(bindir) $(man1dir) $(man8dir) $(libdir) $(root_sysconfdir)"
        @$(MKINSTALLDIRS) $(DESTDIR)$(sbindir) \
                $(DESTDIR)$(root_sbindir) $(DESTDIR)$(bindir) \
-               $(DESTDIR)$(man1dir) $(DESTDIR)$(man8dir) $(DESTDIR)$(libdir)
+               $(DESTDIR)$(man1dir) $(DESTDIR)$(man8dir) \
+               $(DESTDIR)$(man1dir) $(DESTDIR)$(man5dir) \
+               $(DESTDIR)$(libdir) $(DESTDIR)/$(root_sysconfdir)
 
 install: all $(SMANPAGES) $(UMANPAGES) installdirs
        @for i in $(SPROGS); do \
@@ -261,10 +286,24 @@ install: all $(SMANPAGES) $(UMANPAGES) installdirs
        @$(LN) -f $(DESTDIR)$(man8dir)/mke2fs.8 \
                $(DESTDIR)$(man8dir)/mkfs.ext3.8
        @for i in $(UMANPAGES); do \
-               $(RM) -f $(DESTDIR)$(man1dir)/$$i.gz; \
+               for j in $(COMPRESS_EXT); do \
+                       $(RM) -f $(DESTDIR)$(man1dir)/$$i.$$j; \
+               done; \
                echo "  INSTALL_DATA $(man1dir)/$$i"; \
                $(INSTALL_DATA) $$i $(DESTDIR)$(man1dir)/$$i; \
        done
+       @for i in $(FMANPAGES); do \
+               for j in $(COMPRESS_EXT); do \
+                       $(RM) -f $(DESTDIR)$(man5dir)/$$i.$$j; \
+               done; \
+               echo "  INSTALL_DATA $(man5dir)/$$i"; \
+               $(INSTALL_DATA) $$i $(DESTDIR)$(man5dir)/$$i; \
+       done
+       @if ! test -f $(DESTDIR)$(root_sysconfdir)/mke2fs.conf; then \
+               echo "  INSTALL_DATA $(root_sysconfdir)/mke2fs.conf"; \
+               $(INSTALL_DATA) $(srcdir)/mke2fs.conf \
+                       $(DESTDIR)$(root_sysconfdir)/mke2fs.conf; \
+       fi
 
 install-strip: install
        @for i in $(SPROGS); do \
@@ -305,11 +344,19 @@ uninstall:
        for i in fsck.ext2.8 fsck.ext3.8 ; do \
                $(RM) -f $(DESTDIR)$(man8dir)/$$i; \
        done
+       for i in $(FMANPAGES); do \
+               $(RM) -f $(DESTDIR)$(man5dir)/$$i; \
+       done
+       if cmp -s $(srcdir)/mke2fs.conf $(DESTDIR)/$(root_sysconfdir)/mke2fs.conf; then \
+               $(RM) $(DESTDIR)/$(root_sysconfdir)/mke2fs.conf; \
+       fi
 
 clean:
        $(RM) -f $(SPROGS) $(USPROGS) $(UPROGS) $(UMANPAGES) $(SMANPAGES) \
+               $(FMANPAGES) \
                base_device base_device.out mke2fs.static filefrag \
-               e2initrd_helper \#* *.s *.o *.a *~ core 
+               e2initrd_helper partinfo prof_err.[ch] default_profile.c \
+               \#* *.s *.o *.a *~ core 
 
 mostlyclean: clean
 distclean: clean
@@ -322,6 +369,7 @@ distclean: clean
 #
 tune2fs.o: $(srcdir)/tune2fs.c $(top_srcdir)/lib/ext2fs/ext2_fs.h \
  $(top_builddir)/lib/ext2fs/ext2_types.h $(top_srcdir)/lib/ext2fs/ext2fs.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/bitops.h \
  $(top_srcdir)/lib/uuid/uuid.h $(top_srcdir)/lib/e2p/e2p.h \
@@ -336,17 +384,23 @@ mklost+found.o: $(srcdir)/mklost+found.c $(top_srcdir)/lib/ext2fs/ext2_fs.h \
 mke2fs.o: $(srcdir)/mke2fs.c $(top_srcdir)/lib/ext2fs/ext2_fs.h \
  $(top_builddir)/lib/ext2fs/ext2_types.h $(top_srcdir)/lib/et/com_err.h \
  $(top_srcdir)/lib/uuid/uuid.h $(top_srcdir)/lib/e2p/e2p.h \
- $(top_srcdir)/lib/ext2fs/ext2fs.h $(top_srcdir)/lib/ext2fs/ext2_io.h \
- $(top_builddir)/lib/ext2fs/ext2_err.h $(top_srcdir)/lib/ext2fs/bitops.h \
- $(srcdir)/util.h $(top_srcdir)/version.h $(srcdir)/nls-enable.h
+ $(top_srcdir)/lib/ext2fs/ext2_fs.h $(top_srcdir)/lib/ext2fs/ext2fs.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/bitops.h $(srcdir)/util.h \
+ $(srcdir)/../e2fsck/profile.h prof_err.h $(top_srcdir)/version.h \
+ $(srcdir)/nls-enable.h
 chattr.o: $(srcdir)/chattr.c $(top_srcdir)/lib/ext2fs/ext2_fs.h \
  $(top_builddir)/lib/ext2fs/ext2_types.h $(top_srcdir)/lib/et/com_err.h \
- $(top_srcdir)/lib/e2p/e2p.h $(top_srcdir)/version.h $(srcdir)/nls-enable.h
+ $(top_srcdir)/lib/e2p/e2p.h $(top_srcdir)/lib/ext2fs/ext2_fs.h \
+ $(top_srcdir)/version.h $(srcdir)/nls-enable.h
 lsattr.o: $(srcdir)/lsattr.c $(top_srcdir)/lib/ext2fs/ext2_fs.h \
  $(top_builddir)/lib/ext2fs/ext2_types.h $(top_srcdir)/lib/et/com_err.h \
- $(top_srcdir)/lib/e2p/e2p.h $(top_srcdir)/version.h $(srcdir)/nls-enable.h
+ $(top_srcdir)/lib/e2p/e2p.h $(top_srcdir)/lib/ext2fs/ext2_fs.h \
+ $(top_srcdir)/version.h $(srcdir)/nls-enable.h
 dumpe2fs.o: $(srcdir)/dumpe2fs.c $(top_srcdir)/lib/ext2fs/ext2_fs.h \
  $(top_builddir)/lib/ext2fs/ext2_types.h $(top_srcdir)/lib/ext2fs/ext2fs.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/bitops.h \
  $(top_srcdir)/lib/e2p/e2p.h $(srcdir)/jfs_user.h \
@@ -356,6 +410,8 @@ dumpe2fs.o: $(srcdir)/dumpe2fs.c $(top_srcdir)/lib/ext2fs/ext2_fs.h \
 badblocks.o: $(srcdir)/badblocks.c $(top_srcdir)/lib/et/com_err.h \
  $(top_srcdir)/lib/ext2fs/ext2_io.h $(top_srcdir)/lib/ext2fs/ext2_fs.h \
  $(top_builddir)/lib/ext2fs/ext2_types.h $(top_srcdir)/lib/ext2fs/ext2fs.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/bitops.h \
  $(srcdir)/nls-enable.h
 fsck.o: $(srcdir)/fsck.c $(top_srcdir)/version.h $(srcdir)/nls-enable.h \
@@ -364,6 +420,7 @@ fsck.o: $(srcdir)/fsck.c $(top_srcdir)/version.h $(srcdir)/nls-enable.h \
 util.o: $(srcdir)/util.c $(top_srcdir)/lib/et/com_err.h \
  $(top_srcdir)/lib/e2p/e2p.h $(top_srcdir)/lib/ext2fs/ext2_fs.h \
  $(top_builddir)/lib/ext2fs/ext2_types.h $(top_srcdir)/lib/ext2fs/ext2fs.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/bitops.h $(srcdir)/nls-enable.h \
  $(top_srcdir)/lib/blkid/blkid.h $(top_builddir)/lib/blkid/blkid_types.h \
@@ -375,3 +432,5 @@ blkid.o: $(srcdir)/blkid.c $(top_srcdir)/lib/blkid/blkid.h \
 logsave.o: $(srcdir)/logsave.c
 filefrag.o: $(srcdir)/filefrag.c
 base_device.o: $(srcdir)/base_device.c $(srcdir)/fsck.h
+profile.o: $(srcdir)/../e2fsck/profile.c $(top_srcdir)/lib/et/com_err.h \
+ $(srcdir)/../e2fsck/profile.h prof_err.h
Mirror of git://git.kernel.org/pub/scm/fs/ext2/e2fsprogs.git