+2003-03-02 Theodore Ts'o <tytso@mit.edu>
+
+ * configure.in, Makefile.in: Ignore missing directories so we can
+ do a subset distribution. If there are no e2fsprogs
+ applications, then "make install" will install the
+ library's development files. "make subset_tar_file" will
+ create a subset distribution which consists of the
+ et, ss, uuid, and blkid libraries.
+
2003-02-22 Theodore Ts'o <tytso@mit.edu>
* configure.in, configure: Add new configure option
PROG_SUBDIRS=e2fsck $(DEBUGFS_DIR) misc $(RESIZE_DIR) tests/progs $(EVMS_DIR)
SUBDIRS=util $(LIB_SUBDIRS) $(PROG_SUBDIRS) tests
-SUBS= lib/ext2fs/ext2_types.h lib/blkid/blkid_types.h
+SUBS= lib/ext2fs/ext2_types.h lib/blkid/blkid_types.h lib/uuid/uuid_types.h
TAR=tar
-all:: $(SUBS)
+all::
$(MAKE) libs
$(MAKE) progs
$(MAKE) docs
-progs: $(SUBS) all-progs-recursive
-libs: $(SUBS) all-libs-recursive
+subs:
+ for i in $(SUBS) ; do if test -d `dirname $$i` ; then make $$i ; fi ; done
+
+progs: subs all-progs-recursive
+libs: subs all-libs-recursive
docs:
- cd doc && $(MAKE) libext2fs.info
+ -test -d doc && cd doc && $(MAKE) libext2fs.info
install-doc-libs:
- cd doc && $(MAKE) install-doc-libs
+ -test -d doc && cd doc && $(MAKE) install-doc-libs
uninstall-doc-libs:
- cd doc && $(MAKE) uninstall-doc-libs
+ -test -d doc && cd doc && $(MAKE) uninstall-doc-libs
clean-doc:
- cd doc && $(MAKE) clean
+ -test -d doc && cd doc && $(MAKE) clean
distclean-doc:
- cd doc && $(MAKE) distclean
+ -test -d doc && cd doc && $(MAKE) distclean
-install: $(SUBS) all-libs-recursive install-progs-recursive \
+install: subs all-libs-recursive install-progs-recursive \
install-shlibs-libs-recursive install-doc-libs
# export MANPATH=$(DESTDIR)$(mandir); $(srcdir)/install-utils/compile_manpages
+ if test ! -d e2fsck -a ! -d debugfs -a ! -d misc -a ! -d ext2ed ; then $(MAKE) install-libs ; fi
uninstall: uninstall-progs-recursive uninstall-shlibs-libs-recursive uninstall-doc-libs
$(SUBSTITUTE) $(srcdir)/lib/blkid/blkid_types.h.in \
> lib/blkid/blkid_types.h
+lib/uuid/uuid_types.h: $(DEP_SUBSTITUTE) $(srcdir)/lib/uuid/uuid_types.h.in
+ $(SUBSTITUTE) $(srcdir)/lib/uuid/uuid_types.h.in \
+ > lib/uuid/uuid_types.h
+
mostlyclean-local:
$(RM) -f \#* *~ *.orig core MAKELOG
realclean-local: distclean-local
$(RM) -f configure
-check:: $(SUBS) check-recursive
+check:: subs check-recursive
distribution_tar_file:
$(RM) -rf /tmp/dest
SRCROOT = `echo e2fsprogs-@E2FSPROGS_VERSION@ | sed -e 's/-WIP//' \
-e 's/pre-//' -e 's/-PLUS//'`
+SSROOT = `echo e2fsprogs-libs-@E2FSPROGS_VERSION@ | sed -e 's/-WIP//' \
+ -e 's/pre-//' -e 's/-PLUS//'`
+
$(srcdir)/.exclude-file:
a=$(SRCROOT); \
(cd $(srcdir)/.. && find e2fsprogs \( -name \*~ -o -name \*.orig \
-o -name changed-files -o -name .#\* \) \
-print) | sed -e "s/e2fsprogs/$$a/" > $(srcdir)/.exclude-file
echo "$(SRCROOT)/BitKeeper" >> $(srcdir)/.exclude-file
+ echo "$(SRCROOT)/README.subset" >> $(srcdir)/.exclude-file
echo "$(SRCROOT)/build" >> $(srcdir)/.exclude-file
echo "$(SRCROOT)/rpm.log" >> $(srcdir)/.exclude-file
echo "$(SRCROOT)/TODO" >> $(srcdir)/.exclude-file
echo $(SRCROOT)/e2fsprogs-@E2FSPROGS_VERSION@.tar.gz \
>> $(srcdir)/.exclude-file
+$(srcdir)/.exclude-subset:
+ a=$(SSROOT); \
+ (cd $(srcdir)/.. && find e2fsprogs \( -name \*~ -o -name \*.orig \
+ -o -name CVS -o -name \*.rej -o -name Makefile.pq \
+ -o -name TAGS -o -name \*.old -o -name \*.gmo -o -name SCCS \
+ -o -name changed-files -o -name .#\* \) \
+ -print) | sed -e "s/e2fsprogs/$$a/" > $(srcdir)/.exclude-subset
+ echo "$(SSROOT)/BitKeeper" >> $(srcdir)/.exclude-subset
+ echo "$(SSROOT)/build" >> $(srcdir)/.exclude-subset
+ echo "$(SSROOT)/rpm.log" >> $(srcdir)/.exclude-subset
+ echo "$(SSROOT)/TODO" >> $(srcdir)/.exclude-subset
+ echo "$(SSROOT)/powerquest" >> $(srcdir)/.exclude-subset
+ echo "$(SSROOT)/.exclude-subset" >> $(srcdir)/.exclude-subset
+ echo "$(SSROOT)/po/stamp-cat-id" >> $(srcdir)/.exclude-subset
+ echo "$(SSROOT)/po/cat-id-tbl.c" >> $(srcdir)/.exclude-subset
+ echo $(SSROOT)/e2fsprogs-@E2FSPROGS_VERSION@.tar.gz \
+ >> $(srcdir)/.exclude-subset
+ echo "$(SSROOT)/e2fsck" >> $(srcdir)/.exclude-subset
+ echo "$(SSROOT)/ext2ed" >> $(srcdir)/.exclude-subset
+ echo "$(SSROOT)/debugfs" >> $(srcdir)/.exclude-subset
+ echo "$(SSROOT)/misc" >> $(srcdir)/.exclude-subset
+ echo "$(SSROOT)/tests" >> $(srcdir)/.exclude-subset
+ echo "$(SSROOT)/resize" >> $(srcdir)/.exclude-subset
+ echo "$(SSROOT)/doc" >> $(srcdir)/.exclude-subset
+ echo "$(SSROOT)/contrib" >> $(srcdir)/.exclude-subset
+ echo "$(SSROOT)/po" >> $(srcdir)/.exclude-subset
+ echo "$(SSROOT)/include" >> $(srcdir)/.exclude-subset
+ echo "$(SSROOT)/debian" >> $(srcdir)/.exclude-subset
+ echo "$(SSROOT)/lib/e2p" >> $(srcdir)/.exclude-subset
+ echo "$(SSROOT)/lib/evms" >> $(srcdir)/.exclude-subset
+ echo "$(SSROOT)/lib/ext2fs" >> $(srcdir)/.exclude-subset
+ echo "$(SSROOT)/ABOUT-NLS" >> $(srcdir)/.exclude-subset
+ echo "$(SSROOT)/README" >> $(srcdir)/.exclude-subset
+ echo "$(SSROOT)/INSTALL" >> $(srcdir)/.exclude-subset
+ echo "$(SSROOT)/INSTALL.dllbin" >> $(srcdir)/.exclude-subset
+ echo "$(SSROOT)/INSTALL.elfbin" >> $(srcdir)/.exclude-subset
+ echo "$(SSROOT)/RELEASE-NOTES" >> $(srcdir)/.exclude-subset
+ echo "$(SSROOT)/e2fsprogs.lsm" >> $(srcdir)/.exclude-subset
+ echo "$(SSROOT)/e2fsprogs.spec" >> $(srcdir)/.exclude-subset
+
source_tar_file: $(srcdir)/.exclude-file
cd $(srcdir)/.. && a=$(SRCROOT); rm -f $$a ; ln -sf e2fsprogs $$a ; \
$(TAR) -c -h -v -f - \
-X $$a/.exclude-file $$a | \
gzip -9 > e2fsprogs-@E2FSPROGS_VERSION@.tar.gz
rm -f $(srcdir)/.exclude-file
+
+subset_tar_file: $(srcdir)/.exclude-subset
+ cd $(srcdir)/.. && a=$(SSROOT); rm -f $$a ; ln -sf e2fsprogs $$a ; \
+ $(TAR) -c -h -v -f - \
+ -X $$a/.exclude-subset $$a | \
+ gzip -9 > e2fsprogs-libs-@E2FSPROGS_VERSION@.tar.gz
+ rm -f $(srcdir)/.exclude-file $(srcdir)/.exclude-subset
+
+
--- /dev/null
+This distribution contains a subset of the e2fsprogs package; it
+contains the base libraries which may be used by other
+non-ext2-releated applications.
+
+This may be is useful for non-Linux operating systems that need these
+libraries GNOME, but who do not need the ext2/ext3 filesystem utilities.
+
+The full e2fsprogs distributions can be found at the e2fsprogs web
+page, which is:
+
+ http://e2fsprogs.sourceforge.net
+
+In case of bugs in these libraries, please contact Ted Ts'o at
+tytso@thunk.org or tytso@alum.mit.edu.
test -d include || mkdir include
test -d include/linux || mkdir include/linux
test -d include/asm || mkdir include/asm
-rmakefile=
-if test -d ${srcdir}/resize ; then
- rmakefile=resize/Makefile
-fi
+for i in MCONFIG Makefile util/Makefile util/subst.conf lib/et/Makefile \
+ lib/ss/Makefile lib/ext2fs/Makefile lib/e2p/Makefile \
+ lib/uuid/Makefile lib/uuid/uuid_types.h \
+ lib/blkid/Makefile lib/blkid/blkid_types.h \
+ lib/evms/Makefile misc/Makefile ext2ed/Makefile e2fsck/Makefile \
+ debugfs/Makefile tests/Makefile tests/progs/Makefile \
+ resize/Makefile doc/Makefile intl/Makefile po/Makefile.in ; do
+ if test -d `dirname ${srcdir}/$i` ; then
+ outlist="$outlist $i"
+ fi
+done
trap '' 1 2 15
cat > confcache <<\EOF
# This file is a shell script that caches the results of configure
ac_given_srcdir=$srcdir
ac_given_INSTALL="$INSTALL"
-trap 'rm -fr `echo "MCONFIG Makefile util/Makefile util/subst.conf lib/et/Makefile
- lib/ss/Makefile lib/ext2fs/Makefile lib/e2p/Makefile lib/uuid/Makefile
- lib/blkid/Makefile lib/blkid/blkid_types.h lib/evms/Makefile
- misc/Makefile ext2ed/Makefile e2fsck/Makefile debugfs/Makefile \
- tests/Makefile tests/progs/Makefile $rmakefile doc/Makefile
- intl/Makefile po/Makefile.in" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
+trap 'rm -fr `echo "$outlist" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
EOF
cat >> $CONFIG_STATUS <<EOF
cat >> $CONFIG_STATUS <<EOF
-CONFIG_FILES=\${CONFIG_FILES-"MCONFIG Makefile util/Makefile util/subst.conf lib/et/Makefile
- lib/ss/Makefile lib/ext2fs/Makefile lib/e2p/Makefile lib/uuid/Makefile
- lib/blkid/Makefile lib/blkid/blkid_types.h lib/evms/Makefile
- misc/Makefile ext2ed/Makefile e2fsck/Makefile debugfs/Makefile \
- tests/Makefile tests/progs/Makefile $rmakefile doc/Makefile
- intl/Makefile po/Makefile.in"}
+CONFIG_FILES=\${CONFIG_FILES-"$outlist"}
EOF
cat >> $CONFIG_STATUS <<\EOF
for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then
test -d include || mkdir include
test -d include/linux || mkdir include/linux
test -d include/asm || mkdir include/asm
-rmakefile=
-if test -d ${srcdir}/resize ; then
- rmakefile=resize/Makefile
-fi
-AC_OUTPUT(MCONFIG Makefile util/Makefile util/subst.conf lib/et/Makefile
- lib/ss/Makefile lib/ext2fs/Makefile lib/e2p/Makefile lib/uuid/Makefile
- lib/blkid/Makefile lib/blkid/blkid_types.h lib/evms/Makefile
- misc/Makefile ext2ed/Makefile e2fsck/Makefile debugfs/Makefile \
- tests/Makefile tests/progs/Makefile $rmakefile doc/Makefile
- intl/Makefile po/Makefile.in)
+for i in MCONFIG Makefile util/Makefile util/subst.conf lib/et/Makefile \
+ lib/ss/Makefile lib/ext2fs/Makefile lib/e2p/Makefile \
+ lib/uuid/Makefile lib/uuid/uuid_types.h \
+ lib/blkid/Makefile lib/blkid/blkid_types.h \
+ lib/evms/Makefile misc/Makefile ext2ed/Makefile e2fsck/Makefile \
+ debugfs/Makefile tests/Makefile tests/progs/Makefile \
+ resize/Makefile doc/Makefile intl/Makefile po/Makefile.in ; do
+ if test -d `dirname ${srcdir}/$i` ; then
+ outlist="$outlist $i"
+ fi
+done
+AC_OUTPUT($outlist)
+2003-03-02 Theodore Ts'o <tytso@mit.edu>
+
+ * Makefile.in: Don't install list.h, since it's not used by the
+ public blkid.h file.
+
+ * blkid_types.h.in: Change #ifndef protection to use _BLKID_TYPES_H
+
2003-03-01 Theodore Ts'o <tytso@mit.edu>
* tag.c (blkid_set_tag): Fix bug; don't return an error when
$(srcdir)/getsize.c $(srcdir)/llseek.c $(srcdir)/probe.c \
$(srcdir)/read.c $(srcdir)/resolve.c $(srcdir)/save.c $(srcdir)/tag.c
-HFILES= blkid.h list.h
+HFILES= blkid.h
HFILES_IN= blkid_types.h
LIBRARY= libblkid
-#ifndef _EXT2_TYPES_H
-#define _EXT2_TYPES_H
+#ifndef _BLKID_TYPES_H
+#define _BLKID_TYPES_H
/*
* If linux/types.h is already been included, assume it has defined
#endif /* LINUX_TYPES_H */
-#endif /* EXT2_TYPES_H */
+#endif /* BLKID_TYPES_H */
+2003-03-02 Theodore Ts'o <tytso@mit.edu>
+
+ * Makefile.in, uuidP.h, uuid_types.h.in: Use uuid_types.h instead
+ of ext2_types.h
+
2002-11-09 Theodore Ts'o <tytso@mit.edu>
* Release of E2fsprogs 1.32
all:: tst_uuid uuid_time $(SMANPAGES)
+$(top_builddir)/lib/uuid/uuid_types.h: $(srcdir)/uuid_types.h.in $(top_builddir)/config.status
+ cd $(top_builddir); CONFIG_FILES=$(my_dir)/uuid_types.h ./config.status
+
tst_uuid.o: $(srcdir)/tst_uuid.c
$(CC) $(ALL_CFLAGS) -c $(srcdir)/tst_uuid.c -o tst_uuid.o
-$(RANLIB) $(DESTDIR)$(libdir)/libuuid.a
$(CHMOD) $(LIBMODE) $(DESTDIR)$(libdir)/libuuid.a
$(INSTALL_DATA) $(srcdir)/uuid.h $(DESTDIR)$(includedir)/uuid/uuid.h
+ $(INSTALL_DATA) uuid_types.h $(DESTDIR)$(includedir)/uuid/uuid_types.h
for i in $(SMANPAGES); do \
$(RM) -f $(DESTDIR)$(man3dir)/$$i.gz; \
$(INSTALL_DATA) $$i $(DESTDIR)$(man3dir)/$$i; \
# the Makefile.in file
#
clear.o: $(srcdir)/clear.c $(srcdir)/uuidP.h \
- $(top_builddir)/lib/ext2fs/ext2_types.h $(srcdir)/uuid.h
+ $(top_builddir)/lib/uuid/uuid_types.h $(srcdir)/uuid.h
compare.o: $(srcdir)/compare.c $(srcdir)/uuidP.h \
- $(top_builddir)/lib/ext2fs/ext2_types.h $(srcdir)/uuid.h
+ $(top_builddir)/lib/uuid/uuid_types.h $(srcdir)/uuid.h
copy.o: $(srcdir)/copy.c $(srcdir)/uuidP.h \
- $(top_builddir)/lib/ext2fs/ext2_types.h $(srcdir)/uuid.h
+ $(top_builddir)/lib/uuid/uuid_types.h $(srcdir)/uuid.h
gen_uuid.o: $(srcdir)/gen_uuid.c $(srcdir)/uuidP.h \
- $(top_builddir)/lib/ext2fs/ext2_types.h $(srcdir)/uuid.h
+ $(top_builddir)/lib/uuid/uuid_types.h $(srcdir)/uuid.h
isnull.o: $(srcdir)/isnull.c $(srcdir)/uuidP.h \
- $(top_builddir)/lib/ext2fs/ext2_types.h $(srcdir)/uuid.h
+ $(top_builddir)/lib/uuid/uuid_types.h $(srcdir)/uuid.h
pack.o: $(srcdir)/pack.c $(srcdir)/uuidP.h \
- $(top_builddir)/lib/ext2fs/ext2_types.h $(srcdir)/uuid.h
+ $(top_builddir)/lib/uuid/uuid_types.h $(srcdir)/uuid.h
parse.o: $(srcdir)/parse.c $(srcdir)/uuidP.h \
- $(top_builddir)/lib/ext2fs/ext2_types.h $(srcdir)/uuid.h
+ $(top_builddir)/lib/uuid/uuid_types.h $(srcdir)/uuid.h
unpack.o: $(srcdir)/unpack.c $(srcdir)/uuidP.h \
- $(top_builddir)/lib/ext2fs/ext2_types.h $(srcdir)/uuid.h
+ $(top_builddir)/lib/uuid/uuid_types.h $(srcdir)/uuid.h
unparse.o: $(srcdir)/unparse.c $(srcdir)/uuidP.h \
- $(top_builddir)/lib/ext2fs/ext2_types.h $(srcdir)/uuid.h
+ $(top_builddir)/lib/uuid/uuid_types.h $(srcdir)/uuid.h
uuid_time.o: $(srcdir)/uuid_time.c $(srcdir)/uuidP.h \
- $(top_builddir)/lib/ext2fs/ext2_types.h $(srcdir)/uuid.h
+ $(top_builddir)/lib/uuid/uuid_types.h $(srcdir)/uuid.h
*/
#include <sys/types.h>
-#include <ext2fs/ext2_types.h>
+#include <uuid/uuid_types.h>
#include "uuid.h"
--- /dev/null
+#ifndef _UUID_TYPES_H
+#define _UUID_TYPES_H
+
+/*
+ * If linux/types.h is already been included, assume it has defined
+ * everything we need. (cross fingers)
+ */
+#ifndef _LINUX_TYPES_H
+
+typedef unsigned char __u8;
+typedef signed char __s8;
+
+#if (@SIZEOF_INT@ == 8)
+typedef int __s64;
+typedef unsigned int __u64;
+#elif (@SIZEOF_LONG@ == 8)
+typedef long __s64;
+typedef unsigned long __u64;
+#elif (@SIZEOF_LONG_LONG@ == 8)
+#if defined(__GNUC__)
+typedef __signed__ long long __s64;
+#else
+typedef signed long long __s64;
+#endif
+typedef unsigned long long __u64;
+#endif
+
+#if (@SIZEOF_INT@ == 2)
+typedef int __s16;
+typedef unsigned int __u16;
+#elif (@SIZEOF_SHORT@ == 2)
+typedef short __s16;
+typedef unsigned short __u16;
+#else
+ ?==error: undefined 16 bit type
+#endif
+
+#if (@SIZEOF_INT@ == 4)
+typedef int __s32;
+typedef unsigned int __u32;
+#elif (@SIZEOF_LONG@ == 4)
+typedef long __s32;
+typedef unsigned long __u32;
+#elif (@SIZEOF_SHORT@ == 4)
+typedef short __s32;
+typedef unsigned short __u32;
+#else
+ ?== error: undefined 32 bit type
+#endif
+
+#endif /* LINUX_TYPES_H */
+
+#endif /* UUID_TYPES_H */