From 083d3f49c2c0fec0bd8b5b0bec875d67748c612e Mon Sep 17 00:00:00 2001 From: "\"Vladimir N. Oleynik\"" Date: Mon, 10 Oct 2005 11:35:17 +0000 Subject: bb_mkdep: Rewroted. removed problem "include name must uniq", speed up * 3. e2fsprogs: remove confuse bb_mkdep. Use internal e2fsprogs includes only. other: remove confuse bb_mkdep. --- e2fsprogs/Makefile.in | 2 +- e2fsprogs/blkid/blkidP.h | 5 ++--- e2fsprogs/blkid/probe.c | 2 +- e2fsprogs/blkid/read.c | 2 +- e2fsprogs/blkid/version.c | 1 - e2fsprogs/chattr.c | 2 +- e2fsprogs/e2p/e2p.h | 6 ++++-- e2fsprogs/e2p/uuid.c | 2 +- e2fsprogs/ext2fs/bmove.c | 4 ++-- e2fsprogs/ext2fs/ext2_fs.h | 2 +- e2fsprogs/ext2fs/ext2fs.h | 18 ++---------------- e2fsprogs/ext2fs/ext2fs_inline.c | 4 ++-- e2fsprogs/ext2fs/mkjournal.c | 2 +- e2fsprogs/ext2fs/swapfs.c | 2 +- e2fsprogs/lsattr.c | 2 +- e2fsprogs/uuid/uuidP.h | 4 ---- 16 files changed, 21 insertions(+), 39 deletions(-) (limited to 'e2fsprogs') diff --git a/e2fsprogs/Makefile.in b/e2fsprogs/Makefile.in index 546cc8368..419b2c6a5 100644 --- a/e2fsprogs/Makefile.in +++ b/e2fsprogs/Makefile.in @@ -9,7 +9,7 @@ E2FSPROGS_AR:=e2fsprogs.a E2FSPROGS_DIR:=$(top_builddir)/e2fsprogs E2FSPROGS_SRC:=$(top_srcdir)/e2fsprogs -E2FSPROGS_CFLAGS := -I$(E2FSPROGS_SRC) -include $(E2FSPROGS_SRC)/e2fsbb.h +E2FSPROGS_CFLAGS := -include $(E2FSPROGS_SRC)/e2fsbb.h BLKID_SRC := cache.c dev.c devname.c devno.c blkid_getsize.c \ probe.c read.c resolve.c save.c tag.c diff --git a/e2fsprogs/blkid/blkidP.h b/e2fsprogs/blkid/blkidP.h index 43b4f0f53..759dfcd87 100644 --- a/e2fsprogs/blkid/blkidP.h +++ b/e2fsprogs/blkid/blkidP.h @@ -16,9 +16,8 @@ #include #include -#include - -#include +#include "blkid.h" +#include "list.h" #ifdef __GNUC__ #define __BLKID_ATTR(x) __attribute__(x) diff --git a/e2fsprogs/blkid/probe.c b/e2fsprogs/blkid/probe.c index 5ae88b1ac..9008dc85c 100644 --- a/e2fsprogs/blkid/probe.c +++ b/e2fsprogs/blkid/probe.c @@ -28,7 +28,7 @@ #include #endif #include "blkidP.h" -#include "uuid/uuid.h" +#include "../uuid/uuid.h" #include "probe.h" /* diff --git a/e2fsprogs/blkid/read.c b/e2fsprogs/blkid/read.c index 358554cb5..36292ab13 100644 --- a/e2fsprogs/blkid/read.c +++ b/e2fsprogs/blkid/read.c @@ -23,7 +23,7 @@ #endif #include "blkidP.h" -#include "uuid/uuid.h" +#include "../uuid/uuid.h" #ifdef HAVE_STRTOULL #define __USE_ISOC9X diff --git a/e2fsprogs/blkid/version.c b/e2fsprogs/blkid/version.c index 772291641..ea30d0c9f 100644 --- a/e2fsprogs/blkid/version.c +++ b/e2fsprogs/blkid/version.c @@ -17,7 +17,6 @@ #include #include "blkid.h" -#include "../../version.h" static const char *lib_version = E2FSPROGS_VERSION; static const char *lib_date = E2FSPROGS_DATE; diff --git a/e2fsprogs/chattr.c b/e2fsprogs/chattr.c index 1471c851d..66838e642 100644 --- a/e2fsprogs/chattr.c +++ b/e2fsprogs/chattr.c @@ -28,7 +28,7 @@ #include #include #include -#include +#include "ext2fs/ext2_fs.h" #ifdef __GNUC__ # define EXT2FS_ATTR(x) __attribute__(x) diff --git a/e2fsprogs/e2p/e2p.h b/e2fsprogs/e2p/e2p.h index 57bcec31f..d4a8c0eda 100644 --- a/e2fsprogs/e2p/e2p.h +++ b/e2fsprogs/e2p/e2p.h @@ -3,12 +3,14 @@ #include #include -#include +#include "../ext2fs/ext2_fs.h" #define E2P_FEATURE_COMPAT 0 #define E2P_FEATURE_INCOMPAT 1 #define E2P_FEATURE_RO_INCOMPAT 2 - +#ifndef EXT3_FEATURE_INCOMPAT_EXTENTS +#define EXT3_FEATURE_INCOMPAT_EXTENTS 0x0040 +#endif /* `options' for print_flags() */ diff --git a/e2fsprogs/e2p/uuid.c b/e2fsprogs/e2p/uuid.c index c16a76842..9feca4cfa 100644 --- a/e2fsprogs/e2p/uuid.c +++ b/e2fsprogs/e2p/uuid.c @@ -4,7 +4,7 @@ #include #include -#include +#include "../ext2fs/ext2_types.h" #include "e2p.h" diff --git a/e2fsprogs/ext2fs/bmove.c b/e2fsprogs/ext2fs/bmove.c index 7fc85a2c9..0b2ebb183 100644 --- a/e2fsprogs/ext2fs/bmove.c +++ b/e2fsprogs/ext2fs/bmove.c @@ -18,8 +18,8 @@ #include #endif -#include "ext2fs/ext2_fs.h" -#include "ext2fs/ext2fsP.h" +#include "ext2_fs.h" +#include "ext2fsP.h" struct process_block_struct { ext2_ino_t ino; diff --git a/e2fsprogs/ext2fs/ext2_fs.h b/e2fsprogs/ext2fs/ext2_fs.h index ff615c4bd..7a9890320 100644 --- a/e2fsprogs/ext2fs/ext2_fs.h +++ b/e2fsprogs/ext2fs/ext2_fs.h @@ -16,7 +16,7 @@ #ifndef _LINUX_EXT2_FS_H #define _LINUX_EXT2_FS_H -#include /* Changed from linux/types.h */ +#include "ext2_types.h" /* Changed from linux/types.h */ /* * The second extended filesystem constants/structures diff --git a/e2fsprogs/ext2fs/ext2fs.h b/e2fsprogs/ext2fs/ext2fs.h index bad2f9e58..eda962239 100644 --- a/e2fsprogs/ext2fs/ext2fs.h +++ b/e2fsprogs/ext2fs/ext2fs.h @@ -61,13 +61,8 @@ extern "C" { #include #include -#if EXT2_FLAT_INCLUDES -#include "e2_types.h" +#include "ext2_types.h" #include "ext2_fs.h" -#else -#include -#include -#endif /* EXT2_FLAT_INCLUDES */ typedef __u32 ext2_ino_t; typedef __u32 blk_t; @@ -76,13 +71,8 @@ typedef __u32 ext2_off_t; typedef __s64 e2_blkcnt_t; typedef __u32 ext2_dirhash_t; -#if EXT2_FLAT_INCLUDES #include "ext2_io.h" #include "ext2_err.h" -#else -#include -#include -#endif /* * Portability help for Microsoft Visual C++ @@ -243,11 +233,7 @@ struct struct_ext2_filsys { io_channel image_io; }; -#if EXT2_FLAT_INCLUDES -#include "e2_bitops.h" -#else -#include -#endif +#include "bitops.h" /* * Return flags for the block iterator functions diff --git a/e2fsprogs/ext2fs/ext2fs_inline.c b/e2fsprogs/ext2fs/ext2fs_inline.c index d1d1b835a..f14e7b22f 100644 --- a/e2fsprogs/ext2fs/ext2fs_inline.c +++ b/e2fsprogs/ext2fs/ext2fs_inline.c @@ -9,8 +9,8 @@ * %End-Header% */ -#include "ext2fs/ext2fs.h" -#include "ext2fs/bitops.h" +#include "ext2fs.h" +#include "bitops.h" /* * Allocate memory diff --git a/e2fsprogs/ext2fs/mkjournal.c b/e2fsprogs/ext2fs/mkjournal.c index 427a08e72..b748918b6 100644 --- a/e2fsprogs/ext2fs/mkjournal.c +++ b/e2fsprogs/ext2fs/mkjournal.c @@ -33,7 +33,7 @@ #endif #include "ext2_fs.h" -#include "e2p/e2p.h" +#include "../e2p/e2p.h" #include "ext2fs.h" #include "jfs_user.h" diff --git a/e2fsprogs/ext2fs/swapfs.c b/e2fsprogs/ext2fs/swapfs.c index 908170129..8a0899515 100644 --- a/e2fsprogs/ext2fs/swapfs.c +++ b/e2fsprogs/ext2fs/swapfs.c @@ -18,7 +18,7 @@ #include "ext2_fs.h" #include "ext2fs.h" -#include +#include "ext2_ext_attr.h" #ifdef EXT2FS_ENABLE_SWAPFS void ext2fs_swap_super(struct ext2_super_block * sb) diff --git a/e2fsprogs/lsattr.c b/e2fsprogs/lsattr.c index 475a66f67..e25f36d82 100644 --- a/e2fsprogs/lsattr.c +++ b/e2fsprogs/lsattr.c @@ -29,7 +29,7 @@ #include #include -#include +#include "ext2fs/ext2_fs.h" #include "e2fsbb.h" #include "e2p/e2p.h" diff --git a/e2fsprogs/uuid/uuidP.h b/e2fsprogs/uuid/uuidP.h index adf233da9..d2e1a450a 100644 --- a/e2fsprogs/uuid/uuidP.h +++ b/e2fsprogs/uuid/uuidP.h @@ -32,11 +32,7 @@ * %End-Header% */ -#ifdef HAVE_INTTYPES_H #include -#else -#include -#endif #include #include "uuid.h" -- cgit v1.2.3