From 19007e51a548d1e0eff01025dde9f147a0beb26d Mon Sep 17 00:00:00 2001 From: Theodore Ts'o Date: Sun, 23 Dec 2001 19:33:51 -0500 Subject: Move linux/jbd.h to ext2fs/kernel-jbd.h, to avoid using the system header file version of hbd.h when using diet glibc (since it forcibly adds /usr/include to the beginning of include search path.) --- misc/ChangeLog | 8 ++++++++ misc/Makefile.in | 32 +++++++------------------------- misc/jfs_user.h | 3 +-- 3 files changed, 16 insertions(+), 27 deletions(-) (limited to 'misc') diff --git a/misc/ChangeLog b/misc/ChangeLog index 3089f82a..f693d610 100644 --- a/misc/ChangeLog +++ b/misc/ChangeLog @@ -1,3 +1,11 @@ +2001-12-23 Theodore Tso + + * Makefile.in, jfs_user.h: Move linux/jbd.h to + ext2fs/kernel-jbd.h, to avoid using the system header + file version of hbd.h when using diet glibc (since it + forcibly adds /usr/include to the beginning of the + include search path.) + 2001-12-22 Theodore Tso * get_device_by_label.c (init_lvm): Add support to read out diff --git a/misc/Makefile.in b/misc/Makefile.in index a440bc00..5e14330e 100644 --- a/misc/Makefile.in +++ b/misc/Makefile.in @@ -193,16 +193,6 @@ 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 \ - $(top_builddir)/lib/ext2fs/ext2_types.h $(top_srcdir)/lib/ext2fs/ext2fs.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 \ - $(srcdir)/jfs_user.h $(top_srcdir)/include/linux/jbd.h \ - $(top_srcdir)/include/linux/jfs_compat.h \ - $(top_srcdir)/include/linux/linked_list.h $(srcdir)/util.h \ - $(srcdir)/get_device_by_label.h $(top_srcdir)/version.h \ - $(srcdir)/nls-enable.h mklost+found.o: $(srcdir)/mklost+found.c $(top_srcdir)/lib/ext2fs/ext2_fs.h \ $(top_builddir)/lib/ext2fs/ext2_types.h $(top_srcdir)/version.h \ $(srcdir)/nls-enable.h @@ -218,14 +208,6 @@ chattr.o: $(srcdir)/chattr.c $(top_srcdir)/lib/ext2fs/ext2_fs.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 -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/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 \ - $(top_srcdir)/include/linux/jbd.h $(top_srcdir)/include/linux/jfs_compat.h \ - $(top_srcdir)/include/linux/linked_list.h $(top_srcdir)/version.h \ - $(srcdir)/nls-enable.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 \ @@ -233,12 +215,12 @@ badblocks.o: $(srcdir)/badblocks.c $(top_srcdir)/lib/et/com_err.h \ $(srcdir)/nls-enable.h fsck.o: $(srcdir)/fsck.c $(top_srcdir)/version.h $(srcdir)/nls-enable.h \ $(srcdir)/fsck.h $(srcdir)/get_device_by_label.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/ext2_io.h $(top_builddir)/lib/ext2fs/ext2_err.h \ - $(top_srcdir)/lib/ext2fs/bitops.h $(srcdir)/nls-enable.h \ - $(srcdir)/get_device_by_label.h $(srcdir)/util.h +util.o: $(srcdir)/util.c /usr/src/linux/include/linux/major.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/ext2_io.h \ + $(top_builddir)/lib/ext2fs/ext2_err.h $(top_srcdir)/lib/ext2fs/bitops.h \ + $(srcdir)/nls-enable.h $(srcdir)/get_device_by_label.h $(srcdir)/util.h uuidgen.o: $(srcdir)/uuidgen.c $(top_srcdir)/lib/uuid/uuid.h \ $(srcdir)/nls-enable.h -fstype.o: $(srcdir)/fstype.c +fstype.o: $(srcdir)/fstype.c $(srcdir)/fsck.h diff --git a/misc/jfs_user.h b/misc/jfs_user.h index 15831682..3070cd55 100644 --- a/misc/jfs_user.h +++ b/misc/jfs_user.h @@ -3,7 +3,6 @@ typedef unsigned short kdev_t; -#include - +#include #endif /* _JFS_USER_H */ -- cgit v1.2.3