diff options
Diffstat (limited to 'misc')
-rw-r--r-- | misc/Makefile.in | 73 | ||||
-rw-r--r-- | misc/badblocks.c | 1 | ||||
-rw-r--r-- | misc/base_device.c | 1 | ||||
-rw-r--r-- | misc/blkid.c | 1 | ||||
-rw-r--r-- | misc/chattr.c | 1 | ||||
-rw-r--r-- | misc/dumpe2fs.c | 1 | ||||
-rw-r--r-- | misc/e2freefrag.c | 1 | ||||
-rw-r--r-- | misc/e2image.c | 1 | ||||
-rw-r--r-- | misc/e2initrd_helper.c | 1 | ||||
-rw-r--r-- | misc/e2label.c | 1 | ||||
-rw-r--r-- | misc/e2undo.c | 1 | ||||
-rw-r--r-- | misc/e4defrag.c | 1 | ||||
-rw-r--r-- | misc/filefrag.c | 1 | ||||
-rw-r--r-- | misc/findsuper.c | 1 | ||||
-rw-r--r-- | misc/fsck.c | 1 | ||||
-rw-r--r-- | misc/ismounted.c | 1 | ||||
-rw-r--r-- | misc/logsave.c | 1 | ||||
-rw-r--r-- | misc/lsattr.c | 1 | ||||
-rw-r--r-- | misc/mke2fs.c | 1 | ||||
-rw-r--r-- | misc/mklost+found.c | 1 | ||||
-rw-r--r-- | misc/partinfo.c | 1 | ||||
-rw-r--r-- | misc/tune2fs.c | 1 | ||||
-rw-r--r-- | misc/util.c | 1 | ||||
-rw-r--r-- | misc/uuidd.c | 1 | ||||
-rw-r--r-- | misc/uuidgen.c | 1 |
25 files changed, 72 insertions, 25 deletions
diff --git a/misc/Makefile.in b/misc/Makefile.in index d7c4a5e8..cb3c6d9e 100644 --- a/misc/Makefile.in +++ b/misc/Makefile.in @@ -75,8 +75,6 @@ PROFILED_FILEFRAG_OBJS= profiled/filefrag.o PROFILED_E2UNDO_OBJS= profiled/e2undo.o PROFILED_E4DEFRAG_OBJS= profiled/e4defrag.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 \ @@ -119,6 +117,10 @@ prof_err.c prof_err.h: $(srcdir)/../e2fsck/prof_err.et $(E) " COMPILE_ET prof_err.et" $(Q) $(COMPILE_ET) $(srcdir)/../e2fsck/prof_err.et +profile.h: $(top_srcdir)/e2fsck/profile.h + $(E) " CP $<" + $(Q) cp $< $@ + default_profile.c: $(srcdir)/mke2fs.conf $(srcdir)/profile-to-c.awk $(E) " PROFILE_TO_C mke2fs.conf" $(Q) $(AWK) -f $(srcdir)/profile-to-c.awk < $(srcdir)/mke2fs.conf \ @@ -551,7 +553,7 @@ uninstall: clean: $(RM) -f $(SPROGS) $(USPROGS) $(UPROGS) $(UMANPAGES) $(SMANPAGES) \ - $(FMANPAGES) \ + $(FMANPAGES) profile.h \ base_device base_device.out mke2fs.static filefrag e2freefrag \ e2initrd_helper partinfo prof_err.[ch] default_profile.c \ uuidd e2image tune2fs.static tst_ismounted fsck.profiled \ @@ -570,7 +572,8 @@ distclean: clean # Makefile dependencies follow. This must be the last section in # the Makefile.in file # -tune2fs.o: $(srcdir)/tune2fs.c $(top_srcdir)/lib/ext2fs/ext2_fs.h \ +tune2fs.o: $(srcdir)/tune2fs.c $(top_builddir)/lib/config.h \ + $(top_builddir)/lib/dirpaths.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 \ @@ -578,26 +581,34 @@ tune2fs.o: $(srcdir)/tune2fs.c $(top_srcdir)/lib/ext2fs/ext2_fs.h \ $(top_srcdir)/lib/e2p/e2p.h $(srcdir)/jfs_user.h \ $(top_srcdir)/lib/ext2fs/kernel-jbd.h $(top_srcdir)/lib/ext2fs/jfs_compat.h \ $(top_srcdir)/lib/ext2fs/kernel-list.h $(srcdir)/util.h \ - $(top_srcdir)/version.h $(srcdir)/nls-enable.h -mklost+found.o: $(srcdir)/mklost+found.c $(top_srcdir)/lib/ext2fs/ext2_fs.h \ + $(top_srcdir)/lib/quota/mkquota.h $(top_srcdir)/lib/quota/quota.h \ + $(top_srcdir)/lib/../e2fsck/dict.h $(top_srcdir)/version.h \ + $(srcdir)/nls-enable.h +mklost+found.o: $(srcdir)/mklost+found.c $(top_builddir)/lib/config.h \ + $(top_builddir)/lib/dirpaths.h $(top_srcdir)/lib/ext2fs/ext2_fs.h \ $(top_builddir)/lib/ext2fs/ext2_types.h $(top_srcdir)/version.h \ $(srcdir)/nls-enable.h -mke2fs.o: $(srcdir)/mke2fs.c $(top_srcdir)/lib/ext2fs/ext2_fs.h \ +mke2fs.o: $(srcdir)/mke2fs.c $(top_builddir)/lib/config.h \ + $(top_builddir)/lib/dirpaths.h $(top_srcdir)/lib/ext2fs/ext2_fs.h \ $(top_builddir)/lib/ext2fs/ext2_types.h $(top_srcdir)/lib/ext2fs/ext2fsP.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/ext2_ext_attr.h $(top_srcdir)/lib/ext2fs/bitops.h \ $(top_srcdir)/lib/e2p/e2p.h $(top_srcdir)/lib/ext2fs/ext2fs.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 \ + $(srcdir)/util.h profile.h prof_err.h $(top_srcdir)/version.h \ + $(srcdir)/nls-enable.h $(top_srcdir)/lib/quota/mkquota.h \ + $(top_srcdir)/lib/quota/quota.h $(top_srcdir)/lib/../e2fsck/dict.h +chattr.o: $(srcdir)/chattr.c $(top_builddir)/lib/config.h \ + $(top_builddir)/lib/dirpaths.h $(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 -lsattr.o: $(srcdir)/lsattr.c $(top_srcdir)/lib/ext2fs/ext2_fs.h \ +lsattr.o: $(srcdir)/lsattr.c $(top_builddir)/lib/config.h \ + $(top_builddir)/lib/dirpaths.h $(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 -dumpe2fs.o: $(srcdir)/dumpe2fs.c $(top_srcdir)/lib/ext2fs/ext2_fs.h \ +dumpe2fs.o: $(srcdir)/dumpe2fs.c $(top_builddir)/lib/config.h \ + $(top_builddir)/lib/dirpaths.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 \ @@ -606,44 +617,56 @@ dumpe2fs.o: $(srcdir)/dumpe2fs.c $(top_srcdir)/lib/ext2fs/ext2_fs.h \ $(top_srcdir)/lib/ext2fs/kernel-jbd.h $(top_srcdir)/lib/ext2fs/jfs_compat.h \ $(top_srcdir)/lib/ext2fs/kernel-list.h $(top_srcdir)/version.h \ $(srcdir)/nls-enable.h -badblocks.o: $(srcdir)/badblocks.c $(top_srcdir)/lib/et/com_err.h \ +badblocks.o: $(srcdir)/badblocks.c $(top_builddir)/lib/config.h \ + $(top_builddir)/lib/dirpaths.h $(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/ext3_extents.h \ $(top_builddir)/lib/ext2fs/ext2_err.h \ $(top_srcdir)/lib/ext2fs/ext2_ext_attr.h $(top_srcdir)/lib/ext2fs/bitops.h \ $(srcdir)/nls-enable.h -fsck.o: $(srcdir)/fsck.c $(top_srcdir)/version.h $(srcdir)/nls-enable.h \ - $(srcdir)/fsck.h -util.o: $(srcdir)/util.c $(top_srcdir)/lib/et/com_err.h \ +fsck.o: $(srcdir)/fsck.c $(top_builddir)/lib/config.h \ + $(top_builddir)/lib/dirpaths.h $(top_srcdir)/version.h \ + $(srcdir)/nls-enable.h $(srcdir)/fsck.h +util.o: $(srcdir)/util.c $(top_builddir)/lib/config.h \ + $(top_builddir)/lib/dirpaths.h $(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/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 \ $(srcdir)/nls-enable.h $(srcdir)/util.h -uuidgen.o: $(srcdir)/uuidgen.c $(srcdir)/nls-enable.h -blkid.o: $(srcdir)/blkid.c $(top_srcdir)/lib/ext2fs/ext2fs.h \ +uuidgen.o: $(srcdir)/uuidgen.c $(top_builddir)/lib/config.h \ + $(top_builddir)/lib/dirpaths.h $(srcdir)/nls-enable.h +blkid.o: $(srcdir)/blkid.c $(top_builddir)/lib/config.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 -logsave.o: $(srcdir)/logsave.c -filefrag.o: $(srcdir)/filefrag.c $(top_builddir)/lib/ext2fs/ext2_types.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_srcdir)/lib/ext2fs/fiemap.h -base_device.o: $(srcdir)/base_device.c $(srcdir)/fsck.h -ismounted.o: $(srcdir)/ismounted.c $(srcdir)/fsck.h \ +base_device.o: $(srcdir)/base_device.c $(top_builddir)/lib/config.h \ + $(top_builddir)/lib/dirpaths.h $(srcdir)/fsck.h +ismounted.o: $(srcdir)/ismounted.c $(top_builddir)/lib/config.h \ + $(top_builddir)/lib/dirpaths.h $(srcdir)/fsck.h \ $(top_srcdir)/lib/et/com_err.h -profile.o: $(srcdir)/../e2fsck/profile.c $(top_srcdir)/lib/et/com_err.h \ +profile.o: $(srcdir)/../e2fsck/profile.c $(top_builddir)/lib/config.h \ + $(top_builddir)/lib/dirpaths.h $(top_srcdir)/lib/et/com_err.h \ $(srcdir)/../e2fsck/profile.h prof_err.h -e2undo.o: $(srcdir)/e2undo.c $(top_srcdir)/lib/ext2fs/tdb.h \ +e2undo.o: $(srcdir)/e2undo.c $(top_builddir)/lib/config.h \ + $(top_builddir)/lib/dirpaths.h $(top_srcdir)/lib/ext2fs/tdb.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 \ $(srcdir)/nls-enable.h -e2freefrag.o: $(srcdir)/e2freefrag.c $(top_srcdir)/lib/ext2fs/ext2_fs.h \ +e2freefrag.o: $(srcdir)/e2freefrag.c $(top_builddir)/lib/config.h \ + $(top_builddir)/lib/dirpaths.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 \ diff --git a/misc/badblocks.c b/misc/badblocks.c index 1e7e1c84..168d93e6 100644 --- a/misc/badblocks.c +++ b/misc/badblocks.c @@ -37,6 +37,7 @@ #define O_LARGEFILE 0 #endif +#include "config.h" #include <errno.h> #include <fcntl.h> #ifdef HAVE_GETOPT_H diff --git a/misc/base_device.c b/misc/base_device.c index aad2ba05..b2ce1380 100644 --- a/misc/base_device.c +++ b/misc/base_device.c @@ -18,6 +18,7 @@ * License. * %End-Header% */ +#include "config.h" #include <stdio.h> #if HAVE_UNISTD_H #include <unistd.h> diff --git a/misc/blkid.c b/misc/blkid.c index 388abad0..a4a8db0b 100644 --- a/misc/blkid.c +++ b/misc/blkid.c @@ -9,6 +9,7 @@ * %End-Header% */ +#include "config.h" #include <stdio.h> #include <stdlib.h> #include <unistd.h> diff --git a/misc/chattr.c b/misc/chattr.c index de33b083..69aaed1c 100644 --- a/misc/chattr.c +++ b/misc/chattr.c @@ -20,6 +20,7 @@ #define _LARGEFILE64_SOURCE +#include "config.h" #include <sys/types.h> #include <dirent.h> #include <fcntl.h> diff --git a/misc/dumpe2fs.c b/misc/dumpe2fs.c index 4d2d5c7d..df241c21 100644 --- a/misc/dumpe2fs.c +++ b/misc/dumpe2fs.c @@ -20,6 +20,7 @@ * 94/02/27 - Ported to use the ext2fs library */ +#include "config.h" #ifdef HAVE_GETOPT_H #include <getopt.h> #else diff --git a/misc/e2freefrag.c b/misc/e2freefrag.c index 419c6fc2..b442f324 100644 --- a/misc/e2freefrag.c +++ b/misc/e2freefrag.c @@ -11,6 +11,7 @@ * License version 2. * %End-Header% */ +#include "config.h" #include <stdio.h> #ifdef HAVE_UNISTD_H #include <unistd.h> diff --git a/misc/e2image.c b/misc/e2image.c index f6e06d23..4cd834af 100644 --- a/misc/e2image.c +++ b/misc/e2image.c @@ -13,6 +13,7 @@ #define _LARGEFILE_SOURCE #define _LARGEFILE64_SOURCE +#include "config.h" #include <fcntl.h> #include <grp.h> #ifdef HAVE_GETOPT_H diff --git a/misc/e2initrd_helper.c b/misc/e2initrd_helper.c index 3d9f5ab5..c98a07a2 100644 --- a/misc/e2initrd_helper.c +++ b/misc/e2initrd_helper.c @@ -9,6 +9,7 @@ * %End-Header% */ +#include "config.h" #include <stdio.h> #include <unistd.h> #ifdef HAVE_STDLIB_H diff --git a/misc/e2label.c b/misc/e2label.c index e96101ae..bc87a428 100644 --- a/misc/e2label.c +++ b/misc/e2label.c @@ -11,6 +11,7 @@ * %End-Header% */ +#include "config.h" #include <stdio.h> #include <string.h> #include <fcntl.h> diff --git a/misc/e2undo.c b/misc/e2undo.c index 04d0b170..c968f912 100644 --- a/misc/e2undo.c +++ b/misc/e2undo.c @@ -10,6 +10,7 @@ * %End-Header% */ +#include "config.h" #include <stdio.h> #include <stdlib.h> #ifdef HAVE_GETOPT_H diff --git a/misc/e4defrag.c b/misc/e4defrag.c index cdf4ffb0..6491edd6 100644 --- a/misc/e4defrag.c +++ b/misc/e4defrag.c @@ -19,6 +19,7 @@ #define _GNU_SOURCE #endif +#include "config.h" #include <ctype.h> #include <dirent.h> #include <endian.h> diff --git a/misc/filefrag.c b/misc/filefrag.c index b055c2bf..84417574 100644 --- a/misc/filefrag.c +++ b/misc/filefrag.c @@ -9,6 +9,7 @@ * %End-Header% */ +#include "config.h" #ifndef __linux__ #include <stdio.h> #include <stdlib.h> diff --git a/misc/findsuper.c b/misc/findsuper.c index e793e3b1..e3baf2e0 100644 --- a/misc/findsuper.c +++ b/misc/findsuper.c @@ -83,6 +83,7 @@ #define _FILE_OFFSET_BITS 64 +#include "config.h" #include <stdio.h> #include <stdlib.h> #include <string.h> diff --git a/misc/fsck.c b/misc/fsck.c index 93452333..9700f18c 100644 --- a/misc/fsck.c +++ b/misc/fsck.c @@ -27,6 +27,7 @@ #define _XOPEN_SOURCE 600 /* for inclusion of sa_handler in Solaris */ +#include "config.h" #include <sys/types.h> #include <sys/wait.h> #include <sys/signal.h> diff --git a/misc/ismounted.c b/misc/ismounted.c index 50b41407..9e8bebfd 100644 --- a/misc/ismounted.c +++ b/misc/ismounted.c @@ -9,6 +9,7 @@ * %End-Header% */ +#include "config.h" #include <stdio.h> #if HAVE_UNISTD_H #include <unistd.h> diff --git a/misc/logsave.c b/misc/logsave.c index 17457a5f..c37473cb 100644 --- a/misc/logsave.c +++ b/misc/logsave.c @@ -12,6 +12,7 @@ #define _XOPEN_SOURCE 600 /* for inclusion of sa_handler in Solaris */ +#include "config.h" #include <stdio.h> #include <stdlib.h> #include <unistd.h> diff --git a/misc/lsattr.c b/misc/lsattr.c index 15b17ad1..1f55db31 100644 --- a/misc/lsattr.c +++ b/misc/lsattr.c @@ -19,6 +19,7 @@ #define _LARGEFILE64_SOURCE +#include "config.h" #include <sys/types.h> #include <dirent.h> #ifdef HAVE_ERRNO_H diff --git a/misc/mke2fs.c b/misc/mke2fs.c index df694461..1280b3b3 100644 --- a/misc/mke2fs.c +++ b/misc/mke2fs.c @@ -18,6 +18,7 @@ #define _XOPEN_SOURCE 600 /* for inclusion of PATH_MAX in Solaris */ +#include "config.h" #include <stdio.h> #include <string.h> #include <strings.h> diff --git a/misc/mklost+found.c b/misc/mklost+found.c index 8d5fa7be..4f78bdec 100644 --- a/misc/mklost+found.c +++ b/misc/mklost+found.c @@ -13,6 +13,7 @@ * 93/04/22 - Creation */ +#include "config.h" #include <errno.h> #include <fcntl.h> #include <stdio.h> diff --git a/misc/partinfo.c b/misc/partinfo.c index 48b395f6..49660744 100644 --- a/misc/partinfo.c +++ b/misc/partinfo.c @@ -7,6 +7,7 @@ * */ +#include "config.h" #include <sys/types.h> #include <fcntl.h> #ifdef HAVE_SYS_IOCTL_H diff --git a/misc/tune2fs.c b/misc/tune2fs.c index 346e2d17..11ef0958 100644 --- a/misc/tune2fs.c +++ b/misc/tune2fs.c @@ -27,6 +27,7 @@ #define _XOPEN_SOURCE 600 /* for inclusion of strptime() */ #define _BSD_SOURCE /* for inclusion of strcasecmp() */ +#include "config.h" #include <fcntl.h> #include <grp.h> #ifdef HAVE_GETOPT_H diff --git a/misc/util.c b/misc/util.c index babdcf9f..4564b4e6 100644 --- a/misc/util.c +++ b/misc/util.c @@ -12,6 +12,7 @@ #define _LARGEFILE_SOURCE #define _LARGEFILE64_SOURCE +#include "config.h" #include <stdio.h> #include <string.h> #ifdef HAVE_ERRNO_H diff --git a/misc/uuidd.c b/misc/uuidd.c index 912773a1..37e031a5 100644 --- a/misc/uuidd.c +++ b/misc/uuidd.c @@ -11,6 +11,7 @@ #define _GNU_SOURCE /* for setres[ug]id() */ +#include "config.h" #include <stdio.h> #ifdef HAVE_STDLIB_H #include <stdlib.h> diff --git a/misc/uuidgen.c b/misc/uuidgen.c index 7385a5c4..f181d193 100644 --- a/misc/uuidgen.c +++ b/misc/uuidgen.c @@ -9,6 +9,7 @@ * %End-Header% */ +#include "config.h" #include <stdio.h> #ifdef HAVE_STDLIB_H #include <stdlib.h> |