Archive-Team
/
zfs
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 103 Wiki Activity

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

This commit is contained in:
Brian Behlendorf 2009-03-12 15:57:06 -07:00
parent c503f8e0b7 0fe418c548
commit cc3025635a
27 changed files with 122 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Makefile.in
View File

@ -136,6 +136,7 @@ LIBTOOL = @LIBTOOL@
LICENSE = @LICENSE@ LICENSE = @LICENSE@
LINUX = @LINUX@ LINUX = @LINUX@
LINUX_OBJ = @LINUX_OBJ@ LINUX_OBJ = @LINUX_OBJ@
LINUX_VERSION = @LINUX_VERSION@
LN_S = @LN_S@ LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@ LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@ MAINT = @MAINT@

1
cmd/Makefile.in
View File

@ -111,6 +111,7 @@ LIBTOOL = @LIBTOOL@
LICENSE = @LICENSE@ LICENSE = @LICENSE@
LINUX = @LINUX@ LINUX = @LINUX@
LINUX_OBJ = @LINUX_OBJ@ LINUX_OBJ = @LINUX_OBJ@
LINUX_VERSION = @LINUX_VERSION@
LN_S = @LN_S@ LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@ LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@ MAINT = @MAINT@

1
cmd/zdb/Makefile.in
View File

@ -129,6 +129,7 @@ LIBTOOL = @LIBTOOL@
LICENSE = @LICENSE@ LICENSE = @LICENSE@
LINUX = @LINUX@ LINUX = @LINUX@
LINUX_OBJ = @LINUX_OBJ@ LINUX_OBJ = @LINUX_OBJ@
LINUX_VERSION = @LINUX_VERSION@
LN_S = @LN_S@ LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@ LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@ MAINT = @MAINT@

1
cmd/zfs/Makefile.in
View File

@ -129,6 +129,7 @@ LIBTOOL = @LIBTOOL@
LICENSE = @LICENSE@ LICENSE = @LICENSE@
LINUX = @LINUX@ LINUX = @LINUX@
LINUX_OBJ = @LINUX_OBJ@ LINUX_OBJ = @LINUX_OBJ@
LINUX_VERSION = @LINUX_VERSION@
LN_S = @LN_S@ LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@ LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@ MAINT = @MAINT@

1
cmd/zinject/Makefile.in
View File

@ -129,6 +129,7 @@ LIBTOOL = @LIBTOOL@
LICENSE = @LICENSE@ LICENSE = @LICENSE@
LINUX = @LINUX@ LINUX = @LINUX@
LINUX_OBJ = @LINUX_OBJ@ LINUX_OBJ = @LINUX_OBJ@
LINUX_VERSION = @LINUX_VERSION@
LN_S = @LN_S@ LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@ LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@ MAINT = @MAINT@

1
cmd/zpios/Makefile.in
View File

@ -123,6 +123,7 @@ LIBTOOL = @LIBTOOL@
LICENSE = @LICENSE@ LICENSE = @LICENSE@
LINUX = @LINUX@ LINUX = @LINUX@
LINUX_OBJ = @LINUX_OBJ@ LINUX_OBJ = @LINUX_OBJ@
LINUX_VERSION = @LINUX_VERSION@
LN_S = @LN_S@ LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@ LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@ MAINT = @MAINT@

1
cmd/zpool/Makefile.in
View File

@ -130,6 +130,7 @@ LIBTOOL = @LIBTOOL@
LICENSE = @LICENSE@ LICENSE = @LICENSE@
LINUX = @LINUX@ LINUX = @LINUX@
LINUX_OBJ = @LINUX_OBJ@ LINUX_OBJ = @LINUX_OBJ@
LINUX_VERSION = @LINUX_VERSION@
LN_S = @LN_S@ LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@ LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@ MAINT = @MAINT@

1
cmd/ztest/Makefile.in
View File

@ -129,6 +129,7 @@ LIBTOOL = @LIBTOOL@
LICENSE = @LICENSE@ LICENSE = @LICENSE@
LINUX = @LINUX@ LINUX = @LINUX@
LINUX_OBJ = @LINUX_OBJ@ LINUX_OBJ = @LINUX_OBJ@
LINUX_VERSION = @LINUX_VERSION@
LN_S = @LN_S@ LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@ LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@ MAINT = @MAINT@

1
config/Makefile.in
View File

@ -103,6 +103,7 @@ LIBTOOL = @LIBTOOL@
LICENSE = @LICENSE@ LICENSE = @LICENSE@
LINUX = @LINUX@ LINUX = @LINUX@
LINUX_OBJ = @LINUX_OBJ@ LINUX_OBJ = @LINUX_OBJ@
LINUX_VERSION = @LINUX_VERSION@
LN_S = @LN_S@ LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@ LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@ MAINT = @MAINT@

5
configure vendored
View File

@ -462,7 +462,7 @@ ac_includes_default="\
# include <unistd.h> # include <unistd.h>
#endif" #endif"
ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS ZFS_META_NAME ZFS_META_VERSION ZFS_META_RELEASE ZFS_META_ALIAS ZFS_META_DATA ZFS_META_AUTHOR ZFS_META_LT_CURRENT ZFS_META_LT_REVISION ZFS_META_LT_AGE build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE SED EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CPP CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL CCAS CCASFLAGS LINUX LINUX_OBJ kmoduledir splsrc splsymvers LICENSE UNAME TOPDIR BUILDDIR LIBDIR CMDDIR MODDIR ZFS_CONFIG KERNELMAKE_PARAMS KERNELCPPFLAGS LIBOBJS LTLIBOBJS' ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS ZFS_META_NAME ZFS_META_VERSION ZFS_META_RELEASE ZFS_META_ALIAS ZFS_META_DATA ZFS_META_AUTHOR ZFS_META_LT_CURRENT ZFS_META_LT_REVISION ZFS_META_LT_AGE build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE SED EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CPP CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL CCAS CCASFLAGS LINUX LINUX_OBJ LINUX_VERSION kmoduledir splsrc splsymvers LICENSE UNAME TOPDIR BUILDDIR LIBDIR CMDDIR MODDIR ZFS_CONFIG KERNELMAKE_PARAMS KERNELCPPFLAGS LIBOBJS LTLIBOBJS'
ac_subst_files='' ac_subst_files=''
# Initialize some variables set by options. # Initialize some variables set by options.
@ -19033,6 +19033,8 @@ echo "${ECHO_T}$kernsrcver" >&6
kmoduledir=${INSTALL_MOD_PATH}/lib/modules/$kernsrcver kmoduledir=${INSTALL_MOD_PATH}/lib/modules/$kernsrcver
LINUX=${kernelsrc} LINUX=${kernelsrc}
LINUX_OBJ=${kernelbuild} LINUX_OBJ=${kernelbuild}
LINUX_VERSION=${kernsrcver}
@ -20832,6 +20834,7 @@ s,@CCAS@,$CCAS,;t t
s,@CCASFLAGS@,$CCASFLAGS,;t t s,@CCASFLAGS@,$CCASFLAGS,;t t
s,@LINUX@,$LINUX,;t t s,@LINUX@,$LINUX,;t t
s,@LINUX_OBJ@,$LINUX_OBJ,;t t s,@LINUX_OBJ@,$LINUX_OBJ,;t t
s,@LINUX_VERSION@,$LINUX_VERSION,;t t
s,@kmoduledir@,$kmoduledir,;t t s,@kmoduledir@,$kmoduledir,;t t
s,@splsrc@,$splsrc,;t t s,@splsrc@,$splsrc,;t t
s,@splsymvers@,$splsymvers,;t t s,@splsymvers@,$splsymvers,;t t

1
doc/Makefile.in
View File

@ -102,6 +102,7 @@ LIBTOOL = @LIBTOOL@
LICENSE = @LICENSE@ LICENSE = @LICENSE@
LINUX = @LINUX@ LINUX = @LINUX@
LINUX_OBJ = @LINUX_OBJ@ LINUX_OBJ = @LINUX_OBJ@
LINUX_VERSION = @LINUX_VERSION@
LN_S = @LN_S@ LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@ LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@ MAINT = @MAINT@

1
lib/Makefile.in
View File

@ -111,6 +111,7 @@ LIBTOOL = @LIBTOOL@
LICENSE = @LICENSE@ LICENSE = @LICENSE@
LINUX = @LINUX@ LINUX = @LINUX@
LINUX_OBJ = @LINUX_OBJ@ LINUX_OBJ = @LINUX_OBJ@
LINUX_VERSION = @LINUX_VERSION@
LN_S = @LN_S@ LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@ LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@ MAINT = @MAINT@

1
lib/libavl/Makefile.in
View File

@ -128,6 +128,7 @@ LIBTOOL = @LIBTOOL@
LICENSE = @LICENSE@ LICENSE = @LICENSE@
LINUX = @LINUX@ LINUX = @LINUX@
LINUX_OBJ = @LINUX_OBJ@ LINUX_OBJ = @LINUX_OBJ@
LINUX_VERSION = @LINUX_VERSION@
LN_S = @LN_S@ LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@ LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@ MAINT = @MAINT@

1
lib/libnvpair/Makefile.in
View File

@ -129,6 +129,7 @@ LIBTOOL = @LIBTOOL@
LICENSE = @LICENSE@ LICENSE = @LICENSE@
LINUX = @LINUX@ LINUX = @LINUX@
LINUX_OBJ = @LINUX_OBJ@ LINUX_OBJ = @LINUX_OBJ@
LINUX_VERSION = @LINUX_VERSION@
LN_S = @LN_S@ LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@ LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@ MAINT = @MAINT@

12
lib/libspl/Makefile.in
View File

@ -66,7 +66,7 @@ LTLIBRARIES = $(lib_LTLIBRARIES)
libspl_la_LIBADD = libspl_la_LIBADD =
am_libspl_la_OBJECTS = getexecname.lo gethrtime.lo getmntany.lo \ am_libspl_la_OBJECTS = getexecname.lo gethrtime.lo getmntany.lo \
list.lo mkdirp.lo strlcat.lo strlcpy.lo strnlen.lo zone.lo \ list.lo mkdirp.lo strlcat.lo strlcpy.lo strnlen.lo zone.lo \
atomic.lo xdr.lo atomic.lo
libspl_la_OBJECTS = $(am_libspl_la_OBJECTS) libspl_la_OBJECTS = $(am_libspl_la_OBJECTS)
depcomp = $(SHELL) $(top_srcdir)/config/depcomp depcomp = $(SHELL) $(top_srcdir)/config/depcomp
am__depfiles_maybe = depfiles am__depfiles_maybe = depfiles
@ -140,6 +140,7 @@ LIBTOOL = @LIBTOOL@
LICENSE = @LICENSE@ LICENSE = @LICENSE@
LINUX = @LINUX@ LINUX = @LINUX@
LINUX_OBJ = @LINUX_OBJ@ LINUX_OBJ = @LINUX_OBJ@
LINUX_VERSION = @LINUX_VERSION@
LN_S = @LN_S@ LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@ LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@ MAINT = @MAINT@
@ -247,6 +248,7 @@ libspl_la_SOURCES = \
${top_srcdir}/lib/libspl/strlcpy.c \ ${top_srcdir}/lib/libspl/strlcpy.c \
${top_srcdir}/lib/libspl/strnlen.c \ ${top_srcdir}/lib/libspl/strnlen.c \
${top_srcdir}/lib/libspl/zone.c \ ${top_srcdir}/lib/libspl/zone.c \
${top_srcdir}/lib/libspl/xdr.c \
${top_srcdir}/lib/libspl/asm-${target_cpu}/atomic.S \ ${top_srcdir}/lib/libspl/asm-${target_cpu}/atomic.S \
${top_srcdir}/lib/libspl/include/sys/list.h \ ${top_srcdir}/lib/libspl/include/sys/list.h \
${top_srcdir}/lib/libspl/include/sys/list_impl.h ${top_srcdir}/lib/libspl/include/sys/list_impl.h
@ -328,6 +330,7 @@ distclean-compile:
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/strlcat.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/strlcat.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/strlcpy.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/strlcpy.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/strnlen.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/strnlen.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xdr.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/zone.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/zone.Plo@am__quote@
.S.o: .S.o:
@ -426,6 +429,13 @@ zone.lo: ${top_srcdir}/lib/libspl/zone.c
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o zone.lo `test -f '${top_srcdir}/lib/libspl/zone.c' || echo '$(srcdir)/'`${top_srcdir}/lib/libspl/zone.c @am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o zone.lo `test -f '${top_srcdir}/lib/libspl/zone.c' || echo '$(srcdir)/'`${top_srcdir}/lib/libspl/zone.c
xdr.lo: ${top_srcdir}/lib/libspl/xdr.c
@am__fastdepCC_TRUE@ if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xdr.lo -MD -MP -MF "$(DEPDIR)/xdr.Tpo" -c -o xdr.lo `test -f '${top_srcdir}/lib/libspl/xdr.c' || echo '$(srcdir)/'`${top_srcdir}/lib/libspl/xdr.c; \
@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/xdr.Tpo" "$(DEPDIR)/xdr.Plo"; else rm -f "$(DEPDIR)/xdr.Tpo"; exit 1; fi
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='${top_srcdir}/lib/libspl/xdr.c' object='xdr.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xdr.lo `test -f '${top_srcdir}/lib/libspl/xdr.c' || echo '$(srcdir)/'`${top_srcdir}/lib/libspl/xdr.c
mostlyclean-libtool: mostlyclean-libtool:
-rm -f *.lo -rm -f *.lo

1
lib/libspl/asm-i686/Makefile.in
View File

@ -107,6 +107,7 @@ LIBTOOL = @LIBTOOL@
LICENSE = @LICENSE@ LICENSE = @LICENSE@
LINUX = @LINUX@ LINUX = @LINUX@
LINUX_OBJ = @LINUX_OBJ@ LINUX_OBJ = @LINUX_OBJ@
LINUX_VERSION = @LINUX_VERSION@
LN_S = @LN_S@ LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@ LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@ MAINT = @MAINT@

1
lib/libspl/asm-x86_64/Makefile.in
View File

@ -107,6 +107,7 @@ LIBTOOL = @LIBTOOL@
LICENSE = @LICENSE@ LICENSE = @LICENSE@
LINUX = @LINUX@ LINUX = @LINUX@
LINUX_OBJ = @LINUX_OBJ@ LINUX_OBJ = @LINUX_OBJ@
LINUX_VERSION = @LINUX_VERSION@
LN_S = @LN_S@ LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@ LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@ MAINT = @MAINT@

54
lib/libspl/include/Makefile.in
View File

@ -38,7 +38,7 @@ build_triplet = @build@
host_triplet = @host@ host_triplet = @host@
target_triplet = @target@ target_triplet = @target@
subdir = lib/libspl/include subdir = lib/libspl/include
DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.am \ DIST_COMMON = $(pkginclude_HEADERS) $(srcdir)/Makefile.am \
$(srcdir)/Makefile.in $(srcdir)/Makefile.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/config/kernel-bio-args.m4 \ am__aclocal_m4_deps = $(top_srcdir)/config/kernel-bio-args.m4 \
@ -56,7 +56,15 @@ CONFIG_HEADER = $(top_builddir)/zfs_config.h
CONFIG_CLEAN_FILES = CONFIG_CLEAN_FILES =
SOURCES = SOURCES =
DIST_SOURCES = DIST_SOURCES =
HEADERS = $(noinst_HEADERS) am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
am__vpath_adj = case $$p in \
$(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
*) f=$$p;; \
esac;
am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
am__installdirs = "$(DESTDIR)$(pkgincludedir)"
pkgincludeHEADERS_INSTALL = $(INSTALL_HEADER)
HEADERS = $(pkginclude_HEADERS)
ETAGS = etags ETAGS = etags
CTAGS = ctags CTAGS = ctags
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@ -107,6 +115,7 @@ LIBTOOL = @LIBTOOL@
LICENSE = @LICENSE@ LICENSE = @LICENSE@
LINUX = @LINUX@ LINUX = @LINUX@
LINUX_OBJ = @LINUX_OBJ@ LINUX_OBJ = @LINUX_OBJ@
LINUX_VERSION = @LINUX_VERSION@
LN_S = @LN_S@ LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@ LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@ MAINT = @MAINT@
@ -190,8 +199,8 @@ target_alias = @target_alias@
target_cpu = @target_cpu@ target_cpu = @target_cpu@
target_os = @target_os@ target_os = @target_os@
target_vendor = @target_vendor@ target_vendor = @target_vendor@
noinst_HEADERS = *.h ia32/sys/*.h sys/*.h sys/fm/*.h sys/sysevent/*.h \ pkginclude_HEADERS = *.h ia32/sys/*.h rpc/*.h sys/*.h sys/fm/*.h \
tsol/*.h sys/sysevent/*.h tsol/*.h
all: all-am all: all-am
.SUFFIXES: .SUFFIXES:
@ -234,6 +243,23 @@ clean-libtool:
distclean-libtool: distclean-libtool:
-rm -f libtool -rm -f libtool
uninstall-info-am: uninstall-info-am:
install-pkgincludeHEADERS: $(pkginclude_HEADERS)
@$(NORMAL_INSTALL)
test -z "$(pkgincludedir)" || $(mkdir_p) "$(DESTDIR)$(pkgincludedir)"
@list='$(pkginclude_HEADERS)'; for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
f=$(am__strip_dir) \
echo " $(pkgincludeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(pkgincludedir)/$$f'"; \
$(pkgincludeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(pkgincludedir)/$$f"; \
done
uninstall-pkgincludeHEADERS:
@$(NORMAL_UNINSTALL)
@list='$(pkginclude_HEADERS)'; for p in $$list; do \
f=$(am__strip_dir) \
echo " rm -f '$(DESTDIR)$(pkgincludedir)/$$f'"; \
rm -f "$(DESTDIR)$(pkgincludedir)/$$f"; \
done
ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
@ -284,7 +310,7 @@ distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
distdir: $(DISTFILES) distdir: $(DISTFILES)
$(mkdir_p) $(distdir)/ia32/sys $(distdir)/sys $(distdir)/sys/fm $(distdir)/sys/sysevent $(distdir)/tsol $(mkdir_p) $(distdir)/ia32/sys $(distdir)/rpc $(distdir)/sys $(distdir)/sys/fm $(distdir)/sys/sysevent $(distdir)/tsol
@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
list='$(DISTFILES)'; for file in $$list; do \ list='$(DISTFILES)'; for file in $$list; do \
@ -315,6 +341,9 @@ check-am: all-am
check: check-am check: check-am
all-am: Makefile $(HEADERS) all-am: Makefile $(HEADERS)
installdirs: installdirs:
for dir in "$(DESTDIR)$(pkgincludedir)"; do \
test -z "$$dir" || $(mkdir_p) "$$dir"; \
done
install: install-am install: install-am
install-exec: install-exec-am install-exec: install-exec-am
install-data: install-data-am install-data: install-data-am
@ -358,7 +387,7 @@ info: info-am
info-am: info-am:
install-data-am: install-data-am: install-pkgincludeHEADERS
install-exec-am: install-exec-am:
@ -384,18 +413,19 @@ ps: ps-am
ps-am: ps-am:
uninstall-am: uninstall-info-am uninstall-am: uninstall-info-am uninstall-pkgincludeHEADERS
.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
clean-libtool ctags distclean distclean-generic \ clean-libtool ctags distclean distclean-generic \
distclean-libtool distclean-tags distdir dvi dvi-am html \ distclean-libtool distclean-tags distdir dvi dvi-am html \
html-am info info-am install install-am install-data \ html-am info info-am install install-am install-data \
install-data-am install-exec install-exec-am install-info \ install-data-am install-exec install-exec-am install-info \
install-info-am install-man install-strip installcheck \ install-info-am install-man install-pkgincludeHEADERS \
installcheck-am installdirs maintainer-clean \ install-strip installcheck installcheck-am installdirs \
maintainer-clean-generic mostlyclean mostlyclean-generic \ maintainer-clean maintainer-clean-generic mostlyclean \
mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
uninstall-am uninstall-info-am tags uninstall uninstall-am uninstall-info-am \
uninstall-pkgincludeHEADERS
# Tell versions [3.59,3.63) of GNU make to not export all variables. # Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded. # Otherwise a system limit (for SysV at least) may be exceeded.

1
lib/libunicode/Makefile.in
View File

@ -128,6 +128,7 @@ LIBTOOL = @LIBTOOL@
LICENSE = @LICENSE@ LICENSE = @LICENSE@
LINUX = @LINUX@ LINUX = @LINUX@
LINUX_OBJ = @LINUX_OBJ@ LINUX_OBJ = @LINUX_OBJ@
LINUX_VERSION = @LINUX_VERSION@
LN_S = @LN_S@ LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@ LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@ MAINT = @MAINT@

1
lib/libuutil/Makefile.in
View File

@ -130,6 +130,7 @@ LIBTOOL = @LIBTOOL@
LICENSE = @LICENSE@ LICENSE = @LICENSE@
LINUX = @LINUX@ LINUX = @LINUX@
LINUX_OBJ = @LINUX_OBJ@ LINUX_OBJ = @LINUX_OBJ@
LINUX_VERSION = @LINUX_VERSION@
LN_S = @LN_S@ LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@ LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@ MAINT = @MAINT@

1
lib/libzfs/Makefile.in
View File

@ -131,6 +131,7 @@ LIBTOOL = @LIBTOOL@
LICENSE = @LICENSE@ LICENSE = @LICENSE@
LINUX = @LINUX@ LINUX = @LINUX@
LINUX_OBJ = @LINUX_OBJ@ LINUX_OBJ = @LINUX_OBJ@
LINUX_VERSION = @LINUX_VERSION@
LN_S = @LN_S@ LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@ LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@ MAINT = @MAINT@

1
lib/libzpool/Makefile.in
View File

@ -148,6 +148,7 @@ LIBTOOL = @LIBTOOL@
LICENSE = @LICENSE@ LICENSE = @LICENSE@
LINUX = @LINUX@ LINUX = @LINUX@
LINUX_OBJ = @LINUX_OBJ@ LINUX_OBJ = @LINUX_OBJ@
LINUX_VERSION = @LINUX_VERSION@
LN_S = @LN_S@ LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@ LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@ MAINT = @MAINT@

50
lib/libzpool/include/Makefile.in
View File

@ -38,7 +38,7 @@ build_triplet = @build@
host_triplet = @host@ host_triplet = @host@
target_triplet = @target@ target_triplet = @target@
subdir = lib/libzpool/include subdir = lib/libzpool/include
DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.am \ DIST_COMMON = $(pkginclude_HEADERS) $(srcdir)/Makefile.am \
$(srcdir)/Makefile.in $(srcdir)/Makefile.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/config/kernel-bio-args.m4 \ am__aclocal_m4_deps = $(top_srcdir)/config/kernel-bio-args.m4 \
@ -56,7 +56,15 @@ CONFIG_HEADER = $(top_builddir)/zfs_config.h
CONFIG_CLEAN_FILES = CONFIG_CLEAN_FILES =
SOURCES = SOURCES =
DIST_SOURCES = DIST_SOURCES =
HEADERS = $(noinst_HEADERS) am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
am__vpath_adj = case $$p in \
$(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
*) f=$$p;; \
esac;
am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
am__installdirs = "$(DESTDIR)$(pkgincludedir)"
pkgincludeHEADERS_INSTALL = $(INSTALL_HEADER)
HEADERS = $(pkginclude_HEADERS)
ETAGS = etags ETAGS = etags
CTAGS = ctags CTAGS = ctags
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@ -107,6 +115,7 @@ LIBTOOL = @LIBTOOL@
LICENSE = @LICENSE@ LICENSE = @LICENSE@
LINUX = @LINUX@ LINUX = @LINUX@
LINUX_OBJ = @LINUX_OBJ@ LINUX_OBJ = @LINUX_OBJ@
LINUX_VERSION = @LINUX_VERSION@
LN_S = @LN_S@ LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@ LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@ MAINT = @MAINT@
@ -190,7 +199,7 @@ target_alias = @target_alias@
target_cpu = @target_cpu@ target_cpu = @target_cpu@
target_os = @target_os@ target_os = @target_os@
target_vendor = @target_vendor@ target_vendor = @target_vendor@
noinst_HEADERS = sys/*.h pkginclude_HEADERS = sys/*.h
all: all-am all: all-am
.SUFFIXES: .SUFFIXES:
@ -233,6 +242,23 @@ clean-libtool:
distclean-libtool: distclean-libtool:
-rm -f libtool -rm -f libtool
uninstall-info-am: uninstall-info-am:
install-pkgincludeHEADERS: $(pkginclude_HEADERS)
@$(NORMAL_INSTALL)
test -z "$(pkgincludedir)" || $(mkdir_p) "$(DESTDIR)$(pkgincludedir)"
@list='$(pkginclude_HEADERS)'; for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
f=$(am__strip_dir) \
echo " $(pkgincludeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(pkgincludedir)/$$f'"; \
$(pkgincludeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(pkgincludedir)/$$f"; \
done
uninstall-pkgincludeHEADERS:
@$(NORMAL_UNINSTALL)
@list='$(pkginclude_HEADERS)'; for p in $$list; do \
f=$(am__strip_dir) \
echo " rm -f '$(DESTDIR)$(pkgincludedir)/$$f'"; \
rm -f "$(DESTDIR)$(pkgincludedir)/$$f"; \
done
ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
@ -314,6 +340,9 @@ check-am: all-am
check: check-am check: check-am
all-am: Makefile $(HEADERS) all-am: Makefile $(HEADERS)
installdirs: installdirs:
for dir in "$(DESTDIR)$(pkgincludedir)"; do \
test -z "$$dir" || $(mkdir_p) "$$dir"; \
done
install: install-am install: install-am
install-exec: install-exec-am install-exec: install-exec-am
install-data: install-data-am install-data: install-data-am
@ -357,7 +386,7 @@ info: info-am
info-am: info-am:
install-data-am: install-data-am: install-pkgincludeHEADERS
install-exec-am: install-exec-am:
@ -383,18 +412,19 @@ ps: ps-am
ps-am: ps-am:
uninstall-am: uninstall-info-am uninstall-am: uninstall-info-am uninstall-pkgincludeHEADERS
.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
clean-libtool ctags distclean distclean-generic \ clean-libtool ctags distclean distclean-generic \
distclean-libtool distclean-tags distdir dvi dvi-am html \ distclean-libtool distclean-tags distdir dvi dvi-am html \
html-am info info-am install install-am install-data \ html-am info info-am install install-am install-data \
install-data-am install-exec install-exec-am install-info \ install-data-am install-exec install-exec-am install-info \
install-info-am install-man install-strip installcheck \ install-info-am install-man install-pkgincludeHEADERS \
installcheck-am installdirs maintainer-clean \ install-strip installcheck installcheck-am installdirs \
maintainer-clean-generic mostlyclean mostlyclean-generic \ maintainer-clean maintainer-clean-generic mostlyclean \
mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
uninstall-am uninstall-info-am tags uninstall uninstall-am uninstall-info-am \
uninstall-pkgincludeHEADERS
# Tell versions [3.59,3.63) of GNU make to not export all variables. # Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded. # Otherwise a system limit (for SysV at least) may be exceeded.

1
scripts/Makefile.in
View File

@ -111,6 +111,7 @@ LIBTOOL = @LIBTOOL@
LICENSE = @LICENSE@ LICENSE = @LICENSE@
LINUX = @LINUX@ LINUX = @LINUX@
LINUX_OBJ = @LINUX_OBJ@ LINUX_OBJ = @LINUX_OBJ@
LINUX_VERSION = @LINUX_VERSION@
LN_S = @LN_S@ LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@ LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@ MAINT = @MAINT@

1
scripts/zpios-profile/Makefile.in
View File

@ -102,6 +102,7 @@ LIBTOOL = @LIBTOOL@
LICENSE = @LICENSE@ LICENSE = @LICENSE@
LINUX = @LINUX@ LINUX = @LINUX@
LINUX_OBJ = @LINUX_OBJ@ LINUX_OBJ = @LINUX_OBJ@
LINUX_VERSION = @LINUX_VERSION@
LN_S = @LN_S@ LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@ LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@ MAINT = @MAINT@

1
scripts/zpios-test/Makefile.in
View File

@ -102,6 +102,7 @@ LIBTOOL = @LIBTOOL@
LICENSE = @LICENSE@ LICENSE = @LICENSE@
LINUX = @LINUX@ LINUX = @LINUX@
LINUX_OBJ = @LINUX_OBJ@ LINUX_OBJ = @LINUX_OBJ@
LINUX_VERSION = @LINUX_VERSION@
LN_S = @LN_S@ LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@ LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@ MAINT = @MAINT@

1
scripts/zpool-config/Makefile.in
View File

@ -102,6 +102,7 @@ LIBTOOL = @LIBTOOL@
LICENSE = @LICENSE@ LICENSE = @LICENSE@
LINUX = @LINUX@ LINUX = @LINUX@
LINUX_OBJ = @LINUX_OBJ@ LINUX_OBJ = @LINUX_OBJ@
LINUX_VERSION = @LINUX_VERSION@
LN_S = @LN_S@ LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@ LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@ MAINT = @MAINT@