diff options
author | "Vladimir N. Oleynik" <dzo@simtreas.ru> | 2005-10-10 11:35:17 +0000 |
---|---|---|
committer | "Vladimir N. Oleynik" <dzo@simtreas.ru> | 2005-10-10 11:35:17 +0000 |
commit | 083d3f49c2c0fec0bd8b5b0bec875d67748c612e (patch) | |
tree | bb326553f70f3bebe7ff3ed3cf1d57dcc8a5e8ab /e2fsprogs | |
parent | ff9f2f6fbae538d27197e7e357da187031ef33df (diff) | |
download | busybox-w32-083d3f49c2c0fec0bd8b5b0bec875d67748c612e.tar.gz busybox-w32-083d3f49c2c0fec0bd8b5b0bec875d67748c612e.tar.bz2 busybox-w32-083d3f49c2c0fec0bd8b5b0bec875d67748c612e.zip |
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.
Diffstat (limited to 'e2fsprogs')
-rw-r--r-- | e2fsprogs/Makefile.in | 2 | ||||
-rw-r--r-- | e2fsprogs/blkid/blkidP.h | 5 | ||||
-rw-r--r-- | e2fsprogs/blkid/probe.c | 2 | ||||
-rw-r--r-- | e2fsprogs/blkid/read.c | 2 | ||||
-rw-r--r-- | e2fsprogs/blkid/version.c | 1 | ||||
-rw-r--r-- | e2fsprogs/chattr.c | 2 | ||||
-rw-r--r-- | e2fsprogs/e2p/e2p.h | 6 | ||||
-rw-r--r-- | e2fsprogs/e2p/uuid.c | 2 | ||||
-rw-r--r-- | e2fsprogs/ext2fs/bmove.c | 4 | ||||
-rw-r--r-- | e2fsprogs/ext2fs/ext2_fs.h | 2 | ||||
-rw-r--r-- | e2fsprogs/ext2fs/ext2fs.h | 18 | ||||
-rw-r--r-- | e2fsprogs/ext2fs/ext2fs_inline.c | 4 | ||||
-rw-r--r-- | e2fsprogs/ext2fs/mkjournal.c | 2 | ||||
-rw-r--r-- | e2fsprogs/ext2fs/swapfs.c | 2 | ||||
-rw-r--r-- | e2fsprogs/lsattr.c | 2 | ||||
-rw-r--r-- | e2fsprogs/uuid/uuidP.h | 4 |
16 files changed, 21 insertions, 39 deletions
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 | |||
9 | E2FSPROGS_DIR:=$(top_builddir)/e2fsprogs | 9 | E2FSPROGS_DIR:=$(top_builddir)/e2fsprogs |
10 | E2FSPROGS_SRC:=$(top_srcdir)/e2fsprogs | 10 | E2FSPROGS_SRC:=$(top_srcdir)/e2fsprogs |
11 | 11 | ||
12 | E2FSPROGS_CFLAGS := -I$(E2FSPROGS_SRC) -include $(E2FSPROGS_SRC)/e2fsbb.h | 12 | E2FSPROGS_CFLAGS := -include $(E2FSPROGS_SRC)/e2fsbb.h |
13 | 13 | ||
14 | BLKID_SRC := cache.c dev.c devname.c devno.c blkid_getsize.c \ | 14 | BLKID_SRC := cache.c dev.c devname.c devno.c blkid_getsize.c \ |
15 | probe.c read.c resolve.c save.c tag.c | 15 | 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 @@ | |||
16 | #include <sys/types.h> | 16 | #include <sys/types.h> |
17 | #include <stdio.h> | 17 | #include <stdio.h> |
18 | 18 | ||
19 | #include <blkid/blkid.h> | 19 | #include "blkid.h" |
20 | 20 | #include "list.h" | |
21 | #include <blkid/list.h> | ||
22 | 21 | ||
23 | #ifdef __GNUC__ | 22 | #ifdef __GNUC__ |
24 | #define __BLKID_ATTR(x) __attribute__(x) | 23 | #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 @@ | |||
28 | #include <errno.h> | 28 | #include <errno.h> |
29 | #endif | 29 | #endif |
30 | #include "blkidP.h" | 30 | #include "blkidP.h" |
31 | #include "uuid/uuid.h" | 31 | #include "../uuid/uuid.h" |
32 | #include "probe.h" | 32 | #include "probe.h" |
33 | 33 | ||
34 | /* | 34 | /* |
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 @@ | |||
23 | #endif | 23 | #endif |
24 | 24 | ||
25 | #include "blkidP.h" | 25 | #include "blkidP.h" |
26 | #include "uuid/uuid.h" | 26 | #include "../uuid/uuid.h" |
27 | 27 | ||
28 | #ifdef HAVE_STRTOULL | 28 | #ifdef HAVE_STRTOULL |
29 | #define __USE_ISOC9X | 29 | #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 @@ | |||
17 | #include <ctype.h> | 17 | #include <ctype.h> |
18 | 18 | ||
19 | #include "blkid.h" | 19 | #include "blkid.h" |
20 | #include "../../version.h" | ||
21 | 20 | ||
22 | static const char *lib_version = E2FSPROGS_VERSION; | 21 | static const char *lib_version = E2FSPROGS_VERSION; |
23 | static const char *lib_date = E2FSPROGS_DATE; | 22 | 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 @@ | |||
28 | #include <errno.h> | 28 | #include <errno.h> |
29 | #include <sys/param.h> | 29 | #include <sys/param.h> |
30 | #include <sys/stat.h> | 30 | #include <sys/stat.h> |
31 | #include <ext2fs/ext2_fs.h> | 31 | #include "ext2fs/ext2_fs.h" |
32 | 32 | ||
33 | #ifdef __GNUC__ | 33 | #ifdef __GNUC__ |
34 | # define EXT2FS_ATTR(x) __attribute__(x) | 34 | # 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 @@ | |||
3 | #include <stdio.h> | 3 | #include <stdio.h> |
4 | #include <dirent.h> | 4 | #include <dirent.h> |
5 | 5 | ||
6 | #include <ext2fs/ext2_fs.h> | 6 | #include "../ext2fs/ext2_fs.h" |
7 | 7 | ||
8 | #define E2P_FEATURE_COMPAT 0 | 8 | #define E2P_FEATURE_COMPAT 0 |
9 | #define E2P_FEATURE_INCOMPAT 1 | 9 | #define E2P_FEATURE_INCOMPAT 1 |
10 | #define E2P_FEATURE_RO_INCOMPAT 2 | 10 | #define E2P_FEATURE_RO_INCOMPAT 2 |
11 | 11 | #ifndef EXT3_FEATURE_INCOMPAT_EXTENTS | |
12 | #define EXT3_FEATURE_INCOMPAT_EXTENTS 0x0040 | ||
13 | #endif | ||
12 | 14 | ||
13 | /* `options' for print_flags() */ | 15 | /* `options' for print_flags() */ |
14 | 16 | ||
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 @@ | |||
4 | 4 | ||
5 | #include <stdio.h> | 5 | #include <stdio.h> |
6 | #include <string.h> | 6 | #include <string.h> |
7 | #include <ext2fs/ext2_types.h> | 7 | #include "../ext2fs/ext2_types.h" |
8 | 8 | ||
9 | #include "e2p.h" | 9 | #include "e2p.h" |
10 | 10 | ||
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 @@ | |||
18 | #include <sys/time.h> | 18 | #include <sys/time.h> |
19 | #endif | 19 | #endif |
20 | 20 | ||
21 | #include "ext2fs/ext2_fs.h" | 21 | #include "ext2_fs.h" |
22 | #include "ext2fs/ext2fsP.h" | 22 | #include "ext2fsP.h" |
23 | 23 | ||
24 | struct process_block_struct { | 24 | struct process_block_struct { |
25 | ext2_ino_t ino; | 25 | 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 @@ | |||
16 | #ifndef _LINUX_EXT2_FS_H | 16 | #ifndef _LINUX_EXT2_FS_H |
17 | #define _LINUX_EXT2_FS_H | 17 | #define _LINUX_EXT2_FS_H |
18 | 18 | ||
19 | #include <ext2fs/ext2_types.h> /* Changed from linux/types.h */ | 19 | #include "ext2_types.h" /* Changed from linux/types.h */ |
20 | 20 | ||
21 | /* | 21 | /* |
22 | * The second extended filesystem constants/structures | 22 | * 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" { | |||
61 | #include <stdio.h> | 61 | #include <stdio.h> |
62 | #include <stdlib.h> | 62 | #include <stdlib.h> |
63 | 63 | ||
64 | #if EXT2_FLAT_INCLUDES | 64 | #include "ext2_types.h" |
65 | #include "e2_types.h" | ||
66 | #include "ext2_fs.h" | 65 | #include "ext2_fs.h" |
67 | #else | ||
68 | #include <ext2fs/ext2_types.h> | ||
69 | #include <ext2fs/ext2_fs.h> | ||
70 | #endif /* EXT2_FLAT_INCLUDES */ | ||
71 | 66 | ||
72 | typedef __u32 ext2_ino_t; | 67 | typedef __u32 ext2_ino_t; |
73 | typedef __u32 blk_t; | 68 | typedef __u32 blk_t; |
@@ -76,13 +71,8 @@ typedef __u32 ext2_off_t; | |||
76 | typedef __s64 e2_blkcnt_t; | 71 | typedef __s64 e2_blkcnt_t; |
77 | typedef __u32 ext2_dirhash_t; | 72 | typedef __u32 ext2_dirhash_t; |
78 | 73 | ||
79 | #if EXT2_FLAT_INCLUDES | ||
80 | #include "ext2_io.h" | 74 | #include "ext2_io.h" |
81 | #include "ext2_err.h" | 75 | #include "ext2_err.h" |
82 | #else | ||
83 | #include <ext2fs/ext2_io.h> | ||
84 | #include <ext2fs/ext2_err.h> | ||
85 | #endif | ||
86 | 76 | ||
87 | /* | 77 | /* |
88 | * Portability help for Microsoft Visual C++ | 78 | * Portability help for Microsoft Visual C++ |
@@ -243,11 +233,7 @@ struct struct_ext2_filsys { | |||
243 | io_channel image_io; | 233 | io_channel image_io; |
244 | }; | 234 | }; |
245 | 235 | ||
246 | #if EXT2_FLAT_INCLUDES | 236 | #include "bitops.h" |
247 | #include "e2_bitops.h" | ||
248 | #else | ||
249 | #include <ext2fs/bitops.h> | ||
250 | #endif | ||
251 | 237 | ||
252 | /* | 238 | /* |
253 | * Return flags for the block iterator functions | 239 | * 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 @@ | |||
9 | * %End-Header% | 9 | * %End-Header% |
10 | */ | 10 | */ |
11 | 11 | ||
12 | #include "ext2fs/ext2fs.h" | 12 | #include "ext2fs.h" |
13 | #include "ext2fs/bitops.h" | 13 | #include "bitops.h" |
14 | 14 | ||
15 | /* | 15 | /* |
16 | * Allocate memory | 16 | * 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 @@ | |||
33 | #endif | 33 | #endif |
34 | 34 | ||
35 | #include "ext2_fs.h" | 35 | #include "ext2_fs.h" |
36 | #include "e2p/e2p.h" | 36 | #include "../e2p/e2p.h" |
37 | #include "ext2fs.h" | 37 | #include "ext2fs.h" |
38 | #include "jfs_user.h" | 38 | #include "jfs_user.h" |
39 | 39 | ||
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 @@ | |||
18 | 18 | ||
19 | #include "ext2_fs.h" | 19 | #include "ext2_fs.h" |
20 | #include "ext2fs.h" | 20 | #include "ext2fs.h" |
21 | #include <ext2fs/ext2_ext_attr.h> | 21 | #include "ext2_ext_attr.h" |
22 | 22 | ||
23 | #ifdef EXT2FS_ENABLE_SWAPFS | 23 | #ifdef EXT2FS_ENABLE_SWAPFS |
24 | void ext2fs_swap_super(struct ext2_super_block * sb) | 24 | 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 @@ | |||
29 | #include <sys/param.h> | 29 | #include <sys/param.h> |
30 | #include <sys/stat.h> | 30 | #include <sys/stat.h> |
31 | 31 | ||
32 | #include <ext2fs/ext2_fs.h> | 32 | #include "ext2fs/ext2_fs.h" |
33 | #include "e2fsbb.h" | 33 | #include "e2fsbb.h" |
34 | #include "e2p/e2p.h" | 34 | #include "e2p/e2p.h" |
35 | 35 | ||
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 @@ | |||
32 | * %End-Header% | 32 | * %End-Header% |
33 | */ | 33 | */ |
34 | 34 | ||
35 | #ifdef HAVE_INTTYPES_H | ||
36 | #include <inttypes.h> | 35 | #include <inttypes.h> |
37 | #else | ||
38 | #include <uuid/uuid_types.h> | ||
39 | #endif | ||
40 | #include <sys/types.h> | 36 | #include <sys/types.h> |
41 | 37 | ||
42 | #include "uuid.h" | 38 | #include "uuid.h" |