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.
This commit is contained in:
parent
ff9f2f6fba
commit
083d3f49c2
@ -234,10 +234,6 @@ static void flush_outbuf(void);
|
|||||||
* terms of the GNU General Public License, see the file COPYING.
|
* terms of the GNU General Public License, see the file COPYING.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#if !defined(OF) && defined(lint)
|
|
||||||
# include "gzip.h"
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifndef BITS
|
#ifndef BITS
|
||||||
# define BITS 16
|
# define BITS 16
|
||||||
#endif
|
#endif
|
||||||
|
@ -9,7 +9,7 @@ E2FSPROGS_AR:=e2fsprogs.a
|
|||||||
E2FSPROGS_DIR:=$(top_builddir)/e2fsprogs
|
E2FSPROGS_DIR:=$(top_builddir)/e2fsprogs
|
||||||
E2FSPROGS_SRC:=$(top_srcdir)/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 \
|
BLKID_SRC := cache.c dev.c devname.c devno.c blkid_getsize.c \
|
||||||
probe.c read.c resolve.c save.c tag.c
|
probe.c read.c resolve.c save.c tag.c
|
||||||
|
@ -16,9 +16,8 @@
|
|||||||
#include <sys/types.h>
|
#include <sys/types.h>
|
||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
|
|
||||||
#include <blkid/blkid.h>
|
#include "blkid.h"
|
||||||
|
#include "list.h"
|
||||||
#include <blkid/list.h>
|
|
||||||
|
|
||||||
#ifdef __GNUC__
|
#ifdef __GNUC__
|
||||||
#define __BLKID_ATTR(x) __attribute__(x)
|
#define __BLKID_ATTR(x) __attribute__(x)
|
||||||
|
@ -28,7 +28,7 @@
|
|||||||
#include <errno.h>
|
#include <errno.h>
|
||||||
#endif
|
#endif
|
||||||
#include "blkidP.h"
|
#include "blkidP.h"
|
||||||
#include "uuid/uuid.h"
|
#include "../uuid/uuid.h"
|
||||||
#include "probe.h"
|
#include "probe.h"
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
@ -23,7 +23,7 @@
|
|||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include "blkidP.h"
|
#include "blkidP.h"
|
||||||
#include "uuid/uuid.h"
|
#include "../uuid/uuid.h"
|
||||||
|
|
||||||
#ifdef HAVE_STRTOULL
|
#ifdef HAVE_STRTOULL
|
||||||
#define __USE_ISOC9X
|
#define __USE_ISOC9X
|
||||||
|
@ -17,7 +17,6 @@
|
|||||||
#include <ctype.h>
|
#include <ctype.h>
|
||||||
|
|
||||||
#include "blkid.h"
|
#include "blkid.h"
|
||||||
#include "../../version.h"
|
|
||||||
|
|
||||||
static const char *lib_version = E2FSPROGS_VERSION;
|
static const char *lib_version = E2FSPROGS_VERSION;
|
||||||
static const char *lib_date = E2FSPROGS_DATE;
|
static const char *lib_date = E2FSPROGS_DATE;
|
||||||
|
@ -28,7 +28,7 @@
|
|||||||
#include <errno.h>
|
#include <errno.h>
|
||||||
#include <sys/param.h>
|
#include <sys/param.h>
|
||||||
#include <sys/stat.h>
|
#include <sys/stat.h>
|
||||||
#include <ext2fs/ext2_fs.h>
|
#include "ext2fs/ext2_fs.h"
|
||||||
|
|
||||||
#ifdef __GNUC__
|
#ifdef __GNUC__
|
||||||
# define EXT2FS_ATTR(x) __attribute__(x)
|
# define EXT2FS_ATTR(x) __attribute__(x)
|
||||||
|
@ -3,12 +3,14 @@
|
|||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
#include <dirent.h>
|
#include <dirent.h>
|
||||||
|
|
||||||
#include <ext2fs/ext2_fs.h>
|
#include "../ext2fs/ext2_fs.h"
|
||||||
|
|
||||||
#define E2P_FEATURE_COMPAT 0
|
#define E2P_FEATURE_COMPAT 0
|
||||||
#define E2P_FEATURE_INCOMPAT 1
|
#define E2P_FEATURE_INCOMPAT 1
|
||||||
#define E2P_FEATURE_RO_INCOMPAT 2
|
#define E2P_FEATURE_RO_INCOMPAT 2
|
||||||
|
#ifndef EXT3_FEATURE_INCOMPAT_EXTENTS
|
||||||
|
#define EXT3_FEATURE_INCOMPAT_EXTENTS 0x0040
|
||||||
|
#endif
|
||||||
|
|
||||||
/* `options' for print_flags() */
|
/* `options' for print_flags() */
|
||||||
|
|
||||||
|
@ -4,7 +4,7 @@
|
|||||||
|
|
||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
#include <ext2fs/ext2_types.h>
|
#include "../ext2fs/ext2_types.h"
|
||||||
|
|
||||||
#include "e2p.h"
|
#include "e2p.h"
|
||||||
|
|
||||||
|
@ -18,8 +18,8 @@
|
|||||||
#include <sys/time.h>
|
#include <sys/time.h>
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include "ext2fs/ext2_fs.h"
|
#include "ext2_fs.h"
|
||||||
#include "ext2fs/ext2fsP.h"
|
#include "ext2fsP.h"
|
||||||
|
|
||||||
struct process_block_struct {
|
struct process_block_struct {
|
||||||
ext2_ino_t ino;
|
ext2_ino_t ino;
|
||||||
|
@ -16,7 +16,7 @@
|
|||||||
#ifndef _LINUX_EXT2_FS_H
|
#ifndef _LINUX_EXT2_FS_H
|
||||||
#define _LINUX_EXT2_FS_H
|
#define _LINUX_EXT2_FS_H
|
||||||
|
|
||||||
#include <ext2fs/ext2_types.h> /* Changed from linux/types.h */
|
#include "ext2_types.h" /* Changed from linux/types.h */
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* The second extended filesystem constants/structures
|
* The second extended filesystem constants/structures
|
||||||
|
@ -61,13 +61,8 @@ extern "C" {
|
|||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
|
|
||||||
#if EXT2_FLAT_INCLUDES
|
#include "ext2_types.h"
|
||||||
#include "e2_types.h"
|
|
||||||
#include "ext2_fs.h"
|
#include "ext2_fs.h"
|
||||||
#else
|
|
||||||
#include <ext2fs/ext2_types.h>
|
|
||||||
#include <ext2fs/ext2_fs.h>
|
|
||||||
#endif /* EXT2_FLAT_INCLUDES */
|
|
||||||
|
|
||||||
typedef __u32 ext2_ino_t;
|
typedef __u32 ext2_ino_t;
|
||||||
typedef __u32 blk_t;
|
typedef __u32 blk_t;
|
||||||
@ -76,13 +71,8 @@ typedef __u32 ext2_off_t;
|
|||||||
typedef __s64 e2_blkcnt_t;
|
typedef __s64 e2_blkcnt_t;
|
||||||
typedef __u32 ext2_dirhash_t;
|
typedef __u32 ext2_dirhash_t;
|
||||||
|
|
||||||
#if EXT2_FLAT_INCLUDES
|
|
||||||
#include "ext2_io.h"
|
#include "ext2_io.h"
|
||||||
#include "ext2_err.h"
|
#include "ext2_err.h"
|
||||||
#else
|
|
||||||
#include <ext2fs/ext2_io.h>
|
|
||||||
#include <ext2fs/ext2_err.h>
|
|
||||||
#endif
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Portability help for Microsoft Visual C++
|
* Portability help for Microsoft Visual C++
|
||||||
@ -243,11 +233,7 @@ struct struct_ext2_filsys {
|
|||||||
io_channel image_io;
|
io_channel image_io;
|
||||||
};
|
};
|
||||||
|
|
||||||
#if EXT2_FLAT_INCLUDES
|
#include "bitops.h"
|
||||||
#include "e2_bitops.h"
|
|
||||||
#else
|
|
||||||
#include <ext2fs/bitops.h>
|
|
||||||
#endif
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Return flags for the block iterator functions
|
* Return flags for the block iterator functions
|
||||||
|
@ -9,8 +9,8 @@
|
|||||||
* %End-Header%
|
* %End-Header%
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include "ext2fs/ext2fs.h"
|
#include "ext2fs.h"
|
||||||
#include "ext2fs/bitops.h"
|
#include "bitops.h"
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Allocate memory
|
* Allocate memory
|
||||||
|
@ -33,7 +33,7 @@
|
|||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include "ext2_fs.h"
|
#include "ext2_fs.h"
|
||||||
#include "e2p/e2p.h"
|
#include "../e2p/e2p.h"
|
||||||
#include "ext2fs.h"
|
#include "ext2fs.h"
|
||||||
#include "jfs_user.h"
|
#include "jfs_user.h"
|
||||||
|
|
||||||
|
@ -18,7 +18,7 @@
|
|||||||
|
|
||||||
#include "ext2_fs.h"
|
#include "ext2_fs.h"
|
||||||
#include "ext2fs.h"
|
#include "ext2fs.h"
|
||||||
#include <ext2fs/ext2_ext_attr.h>
|
#include "ext2_ext_attr.h"
|
||||||
|
|
||||||
#ifdef EXT2FS_ENABLE_SWAPFS
|
#ifdef EXT2FS_ENABLE_SWAPFS
|
||||||
void ext2fs_swap_super(struct ext2_super_block * sb)
|
void ext2fs_swap_super(struct ext2_super_block * sb)
|
||||||
|
@ -29,7 +29,7 @@
|
|||||||
#include <sys/param.h>
|
#include <sys/param.h>
|
||||||
#include <sys/stat.h>
|
#include <sys/stat.h>
|
||||||
|
|
||||||
#include <ext2fs/ext2_fs.h>
|
#include "ext2fs/ext2_fs.h"
|
||||||
#include "e2fsbb.h"
|
#include "e2fsbb.h"
|
||||||
#include "e2p/e2p.h"
|
#include "e2p/e2p.h"
|
||||||
|
|
||||||
|
@ -32,11 +32,7 @@
|
|||||||
* %End-Header%
|
* %End-Header%
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#ifdef HAVE_INTTYPES_H
|
|
||||||
#include <inttypes.h>
|
#include <inttypes.h>
|
||||||
#else
|
|
||||||
#include <uuid/uuid_types.h>
|
|
||||||
#endif
|
|
||||||
#include <sys/types.h>
|
#include <sys/types.h>
|
||||||
|
|
||||||
#include "uuid.h"
|
#include "uuid.h"
|
||||||
|
@ -111,8 +111,6 @@ struct in6_ifreq {
|
|||||||
#if HAVE_AFIPX
|
#if HAVE_AFIPX
|
||||||
#if (__GLIBC__ >= 2) && (__GLIBC_MINOR__ >= 1)
|
#if (__GLIBC__ >= 2) && (__GLIBC_MINOR__ >= 1)
|
||||||
#include <netipx/ipx.h>
|
#include <netipx/ipx.h>
|
||||||
#else
|
|
||||||
#include "ipx.h"
|
|
||||||
#endif
|
#endif
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
File diff suppressed because it is too large
Load Diff
Loading…
Reference in New Issue
Block a user