Merge commit 'refs/top-bases/linux-docs' into linux-docs

This commit is contained in:
Brian Behlendorf 2009-03-10 21:25:36 -07:00
commit f69ecb664b
23 changed files with 48 additions and 62 deletions

View File

@ -3,7 +3,6 @@ SUBDIRS = config doc scripts lib cmd module
AUTOMAKE_OPTIONS = foreign dist-zip
EXTRA_DIST = autogen.sh zfs.spec.in META DISCLAIMER GIT
EXTRA_DIST += OPENSOLARIS.LICENSE ZFS.RELEASE
include_HEADERS = zfs_config.h
distclean-local::
-$(RM) -R autom4te*.cache
@ -18,7 +17,9 @@ distclean-local::
-type f -print | xargs $(RM)
install-data-local:
$(INSTALL) module/Module.symvers $(DESTDIR)/$(includedir)
/bin/mkdir -p $(DESTDIR)/$(LINUX)/include/zfs
$(INSTALL) module/Module.symvers $(DESTDIR)/$(LINUX)/include/zfs
$(INSTALL) zfs_config.h $(DESTDIR)/$(LINUX)/include/zfs
ctags:
$(RM) $(top_srcdir)/tags

View File

@ -6,6 +6,17 @@ dnl # AUTHOR:
dnl # Chris Dunlap <cdunlap@llnl.gov>
dnl #
AC_DEFUN([ZFS_AC_META], [
AH_BOTTOM([
#undef PACKAGE
#undef PACKAGE_BUGREPORT
#undef PACKAGE_NAME
#undef PACKAGE_STRING
#undef PACKAGE_TARNAME
#undef PACKAGE_VERSION
#undef STDC_HEADERS
#undef VERSION])
AC_MSG_CHECKING([metadata])
META="$srcdir/META"

View File

@ -60,6 +60,7 @@ AC_CONFIG_FILES([
lib/libunicode/Makefile
lib/libuutil/Makefile
lib/libzpool/Makefile
lib/libzpool/include/Makefile
lib/libzfs/Makefile
cmd/Makefile
cmd/zdb/Makefile
@ -69,20 +70,9 @@ AC_CONFIG_FILES([
cmd/ztest/Makefile
module/Makefile
module/avl/Makefile
module/avl/include/Makefile
module/avl/include/sys/Makefile
module/nvpair/Makefile
module/nvpair/include/Makefile
module/nvpair/include/sys/Makefile
module/unicode/Makefile
module/unicode/include/Makefile
module/unicode/include/sys/Makefile
module/zcommon/Makefile
module/zcommon/include/Makefile
module/zcommon/include/sys/Makefile
module/zcommon/include/sys/fs/Makefile
module/zcommon/include/sys/fm/Makefile
module/zcommon/include/sys/fm/fs/Makefile
module/zfs/Makefile
scripts/Makefile
scripts/zpool-config/Makefile

View File

@ -1,5 +1,6 @@
include $(top_srcdir)/config/Rules.am
SUBDIRS = include
DEFAULT_INCLUDES += \
-I${top_srcdir}/lib/libzpool/include \
-I${top_srcdir}/lib/libspl/include \

View File

@ -0,0 +1 @@
noinst_HEADERS = sys/*.h

View File

@ -1,13 +1,34 @@
subdir-m = avl nvpair unicode zcommon zfs
subdir-m += avl
subdir-m += nvpair
subdir-m += unicode
subdir-m += zcommon
subdir-m += zfs
subdir-m += zpios
# Make the exported SPL symbols available to these modules.
# Unfortunately there is not a cleaner way to do this, modpost
# does not contain an option to search additional symbol files.
all:
modules clean:
# Make the exported SPL symbols available to these modules.
cp @splsymvers@ .
$(MAKE) -C @LINUX@ SUBDIRS=`pwd` @KERNELMAKE_PARAMS@ modules
install uninstall clean distclean maintainer-clean distdir:
$(MAKE) -C @LINUX@ SUBDIRS=`pwd` @KERNELMAKE_PARAMS@ $@
modules_install:
$(MAKE) -C @LINUX@ SUBDIRS=`pwd` INSTALL_MOD_PATH=$(DESTDIR) INSTALL_MOD_DIR=addon $@
# Install the required headers in to the kernel source
(mkdir -p $(DESTDIR)/@LINUX@/include/zfs && \
find . -mindepth 3 -maxdepth 3 -name '*.h' | \
xargs cp -t $(DESTDIR)/@LINUX@/include/zfs) || exit 1; \
(mkdir -p $(DESTDIR)/@LINUX@/include/zfs/sys && \
find . -mindepth 4 -maxdepth 4 -name '*.h' | \
xargs cp -t $(DESTDIR)/@LINUX@/include/zfs/sys) || exit 1;
distdir:
distfiles=`find . -name '*.c' -o -name '*.h'`; \
for distfile in $$distfiles; do \
distpath=`dirname $$distdir/$$distfile`; \
(/bin/mkdir -p $$distpath && \
/bin/cp $$distfile $$distdir/$$distfile) || exit 1; \
done
distclean maintainer-clean: clean
install: modules_install
all: modules
check:

View File

@ -1,6 +1,3 @@
subdir-m += include
DISTFILES = *.c
MODULE := zavl
EXTRA_CFLAGS = -I@MODDIR@/avl/include

View File

@ -1 +0,0 @@
subdir-m += sys

View File

@ -1 +0,0 @@
DISTFILES = avl.h avl_impl.h

View File

@ -1,6 +1,3 @@
subdir-m += include
DISTFILES = *.c
MODULE := znvpair
EXTRA_CFLAGS = -I@MODDIR@/nvpair/include

View File

@ -1,2 +0,0 @@
subdir-m += sys
DISTFILES = libnvpair.h

View File

@ -1 +0,0 @@
DISTFILES = nvpair.h nvpair_impl.h

View File

@ -1,6 +1,3 @@
subdir-m += include
DISTFILES = *.c
MODULE := zunicode
EXTRA_CFLAGS = -I@MODDIR@/unicode/include

View File

@ -1 +0,0 @@
subdir-m += sys

View File

@ -1 +0,0 @@
DISTFILES = u8_textprep.h u8_textprep_data.h

View File

@ -1,6 +1,3 @@
subdir-m += include
DISTFILES = *.c
MODULE := zcommon
EXTRA_CFLAGS = -I@MODDIR@/avl/include

View File

@ -1,2 +0,0 @@
subdir-m += sys
DISTFILES = zfs_comutil.h zfs_deleg.h zfs_namecheck.h zfs_prop.h

View File

@ -1,14 +0,0 @@
subdir-m += fm fs
DISTFILES = arc.h bplist.h compress.h dbuf.h dmu.h dmu_impl.h
DISTFILES += dmu_objset.h dmu_traverse.h dmu_tx.h dmu_zfetch.h
DISTFILES += dnode.h dsl_dataset.h dsl_deleg.h dsl_dir.h dsl_pool.h
DISTFILES += dsl_prop.h dsl_synctask.h list.h list_impl.h metaslab.h
DISTFILES += metaslab_impl.h refcount.h rprwlock.h rrwlock.h spa.h
DISTFILES += spa_boot.h spa_impl.h space_map.h txg.h txg_impl.h uberblock.h
DISTFILES += uberblock_impl.h unique.h vdev.h vdev_disk.h vdev_file.h
DISTFILES += vdev_impl.h zap.h zap_impl.h zap_leaf.h zfs_acl.h
DISTFILES += zfs_context.h zfs_context_user.h zfs_ctldir.h zfs_debug.h
DISTFILES += zfs_dir.h zfs_fuid.h zfs_i18n.h zfs_ioctl.h zfs_rlock.h
DISTFILES += zfs_vfsops.h zfs_znode.h zil.h zil_impl.h zio.h
DISTFILES += zio_checksum.h zio_compress.h zio_impl.h zvol.h

View File

@ -1 +0,0 @@
subdir-m += fs

View File

@ -1 +0,0 @@
DISTFILES = zfs.h

View File

@ -1 +0,0 @@
DISTFILES = zfs.h

View File

@ -1,5 +1,3 @@
DISTFILES = *.c
MODULE := zfs
EXTRA_CFLAGS = -I@MODDIR@/zfs/include

View File

@ -73,7 +73,7 @@ symbols needed for building additional modules which use %{name}.
%prep
%setup
%build
%configure --includedir=%{kdir}/include/zfs --with-linux=%{kdir}
%configure --with-linux=%{kdir} --with-spl=%{kdir}/include/spl
make
%install
@ -88,6 +88,7 @@ rm -rf $RPM_BUILD_ROOT
%doc AUTHORS ChangeLog COPYING COPYRIGHT DISCLAIMER GIT
%doc OPENSOLARIS.LICENSE README TODO ZFS.RELEASE
%{_sbindir}/*
%{_libdir}/*
/lib/modules/*
%files devel