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

This commit is contained in:
Brian Behlendorf 2008-12-12 12:19:05 -08:00
commit 98d6a64f81
14 changed files with 45 additions and 43 deletions

View File

@ -207,9 +207,9 @@ target_vendor = @target_vendor@
AM_CFLAGS = -Wall -Wstrict-prototypes -Wshadow -Werror -Wno-switch \ AM_CFLAGS = -Wall -Wstrict-prototypes -Wshadow -Werror -Wno-switch \
-Wno-unused -Wno-missing-braces -Wno-unknown-pragmas \ -Wno-unused -Wno-missing-braces -Wno-unknown-pragmas \
-Wno-parentheses -Wno-uninitialized -fno-strict-aliasing \ -Wno-parentheses -Wno-uninitialized -fno-strict-aliasing \
-D_GNU_SOURCE -D__EXTENSIONS__ -D_POSIX_PTHREAD_SEMANTICS \ -D_GNU_SOURCE -D__EXTENSIONS__ -D_REENTRANT \
-D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE -D_REENTRANT \ -D_POSIX_PTHREAD_SEMANTICS -D_FILE_OFFSET_BITS=64 \
-DTEXT_DOMAIN=\\\"zfs-linux-user\\\" -D_LARGEFILE64_SOURCE -DTEXT_DOMAIN=\"zfs-linux-user\"
DEFAULT_INCLUDES = -I${top_srcdir}/lib/libspl/include DEFAULT_INCLUDES = -I${top_srcdir}/lib/libspl/include
zdb_SOURCES = \ zdb_SOURCES = \
zdb.c \ zdb.c \

View File

@ -207,9 +207,9 @@ target_vendor = @target_vendor@
AM_CFLAGS = -Wall -Wstrict-prototypes -Wshadow -Werror -Wno-switch \ AM_CFLAGS = -Wall -Wstrict-prototypes -Wshadow -Werror -Wno-switch \
-Wno-unused -Wno-missing-braces -Wno-unknown-pragmas \ -Wno-unused -Wno-missing-braces -Wno-unknown-pragmas \
-Wno-parentheses -Wno-uninitialized -fno-strict-aliasing \ -Wno-parentheses -Wno-uninitialized -fno-strict-aliasing \
-D_GNU_SOURCE -D__EXTENSIONS__ -D_POSIX_PTHREAD_SEMANTICS \ -D_GNU_SOURCE -D__EXTENSIONS__ -D_REENTRANT \
-D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE -D_REENTRANT \ -D_POSIX_PTHREAD_SEMANTICS -D_FILE_OFFSET_BITS=64 \
-DTEXT_DOMAIN=\\\"zfs-linux-user\\\" -D_LARGEFILE64_SOURCE -DTEXT_DOMAIN=\"zfs-linux-user\"
DEFAULT_INCLUDES = -I${top_srcdir}/lib/libspl/include DEFAULT_INCLUDES = -I${top_srcdir}/lib/libspl/include
zdump_SOURCES = \ zdump_SOURCES = \
zdump.c zdump.c

View File

@ -207,9 +207,9 @@ target_vendor = @target_vendor@
AM_CFLAGS = -Wall -Wstrict-prototypes -Wshadow -Werror -Wno-switch \ AM_CFLAGS = -Wall -Wstrict-prototypes -Wshadow -Werror -Wno-switch \
-Wno-unused -Wno-missing-braces -Wno-unknown-pragmas \ -Wno-unused -Wno-missing-braces -Wno-unknown-pragmas \
-Wno-parentheses -Wno-uninitialized -fno-strict-aliasing \ -Wno-parentheses -Wno-uninitialized -fno-strict-aliasing \
-D_GNU_SOURCE -D__EXTENSIONS__ -D_POSIX_PTHREAD_SEMANTICS \ -D_GNU_SOURCE -D__EXTENSIONS__ -D_REENTRANT \
-D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE -D_REENTRANT \ -D_POSIX_PTHREAD_SEMANTICS -D_FILE_OFFSET_BITS=64 \
-DTEXT_DOMAIN=\\\"zfs-linux-user\\\" -D_LARGEFILE64_SOURCE -DTEXT_DOMAIN=\"zfs-linux-user\"
DEFAULT_INCLUDES = -I${top_srcdir}/lib/libspl/include DEFAULT_INCLUDES = -I${top_srcdir}/lib/libspl/include
zfs_SOURCES = \ zfs_SOURCES = \
zfs_iter.c \ zfs_iter.c \

View File

@ -207,9 +207,9 @@ target_vendor = @target_vendor@
AM_CFLAGS = -Wall -Wstrict-prototypes -Wshadow -Werror -Wno-switch \ AM_CFLAGS = -Wall -Wstrict-prototypes -Wshadow -Werror -Wno-switch \
-Wno-unused -Wno-missing-braces -Wno-unknown-pragmas \ -Wno-unused -Wno-missing-braces -Wno-unknown-pragmas \
-Wno-parentheses -Wno-uninitialized -fno-strict-aliasing \ -Wno-parentheses -Wno-uninitialized -fno-strict-aliasing \
-D_GNU_SOURCE -D__EXTENSIONS__ -D_POSIX_PTHREAD_SEMANTICS \ -D_GNU_SOURCE -D__EXTENSIONS__ -D_REENTRANT \
-D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE -D_REENTRANT \ -D_POSIX_PTHREAD_SEMANTICS -D_FILE_OFFSET_BITS=64 \
-DTEXT_DOMAIN=\\\"zfs-linux-user\\\" -D_LARGEFILE64_SOURCE -DTEXT_DOMAIN=\"zfs-linux-user\"
DEFAULT_INCLUDES = -I${top_srcdir}/lib/libspl/include DEFAULT_INCLUDES = -I${top_srcdir}/lib/libspl/include
zinject_SOURCES = \ zinject_SOURCES = \
translate.c \ translate.c \

View File

@ -208,9 +208,9 @@ target_vendor = @target_vendor@
AM_CFLAGS = -Wall -Wstrict-prototypes -Wshadow -Werror -Wno-switch \ AM_CFLAGS = -Wall -Wstrict-prototypes -Wshadow -Werror -Wno-switch \
-Wno-unused -Wno-missing-braces -Wno-unknown-pragmas \ -Wno-unused -Wno-missing-braces -Wno-unknown-pragmas \
-Wno-parentheses -Wno-uninitialized -fno-strict-aliasing \ -Wno-parentheses -Wno-uninitialized -fno-strict-aliasing \
-D_GNU_SOURCE -D__EXTENSIONS__ -D_POSIX_PTHREAD_SEMANTICS \ -D_GNU_SOURCE -D__EXTENSIONS__ -D_REENTRANT \
-D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE -D_REENTRANT \ -D_POSIX_PTHREAD_SEMANTICS -D_FILE_OFFSET_BITS=64 \
-DTEXT_DOMAIN=\\\"zfs-linux-user\\\" -D_LARGEFILE64_SOURCE -DTEXT_DOMAIN=\"zfs-linux-user\"
zpios_SOURCES = \ zpios_SOURCES = \
$(top_srcdir)/cmd/zpios/zpios.h \ $(top_srcdir)/cmd/zpios/zpios.h \
$(top_srcdir)/cmd/zpios/zpios_main.c \ $(top_srcdir)/cmd/zpios/zpios_main.c \

View File

@ -208,9 +208,9 @@ target_vendor = @target_vendor@
AM_CFLAGS = -Wall -Wstrict-prototypes -Wshadow -Werror -Wno-switch \ AM_CFLAGS = -Wall -Wstrict-prototypes -Wshadow -Werror -Wno-switch \
-Wno-unused -Wno-missing-braces -Wno-unknown-pragmas \ -Wno-unused -Wno-missing-braces -Wno-unknown-pragmas \
-Wno-parentheses -Wno-uninitialized -fno-strict-aliasing \ -Wno-parentheses -Wno-uninitialized -fno-strict-aliasing \
-D_GNU_SOURCE -D__EXTENSIONS__ -D_POSIX_PTHREAD_SEMANTICS \ -D_GNU_SOURCE -D__EXTENSIONS__ -D_REENTRANT \
-D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE -D_REENTRANT \ -D_POSIX_PTHREAD_SEMANTICS -D_FILE_OFFSET_BITS=64 \
-DTEXT_DOMAIN=\\\"zfs-linux-user\\\" -D_LARGEFILE64_SOURCE -DTEXT_DOMAIN=\"zfs-linux-user\"
DEFAULT_INCLUDES = -I${top_srcdir}/lib/libspl/include DEFAULT_INCLUDES = -I${top_srcdir}/lib/libspl/include
zpool_SOURCES = \ zpool_SOURCES = \
zpool_iter.c \ zpool_iter.c \

View File

@ -207,9 +207,9 @@ target_vendor = @target_vendor@
AM_CFLAGS = -Wall -Wstrict-prototypes -Wshadow -Werror -Wno-switch \ AM_CFLAGS = -Wall -Wstrict-prototypes -Wshadow -Werror -Wno-switch \
-Wno-unused -Wno-missing-braces -Wno-unknown-pragmas \ -Wno-unused -Wno-missing-braces -Wno-unknown-pragmas \
-Wno-parentheses -Wno-uninitialized -fno-strict-aliasing \ -Wno-parentheses -Wno-uninitialized -fno-strict-aliasing \
-D_GNU_SOURCE -D__EXTENSIONS__ -D_POSIX_PTHREAD_SEMANTICS \ -D_GNU_SOURCE -D__EXTENSIONS__ -D_REENTRANT \
-D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE -D_REENTRANT \ -D_POSIX_PTHREAD_SEMANTICS -D_FILE_OFFSET_BITS=64 \
-DTEXT_DOMAIN=\\\"zfs-linux-user\\\" -D_LARGEFILE64_SOURCE -DTEXT_DOMAIN=\"zfs-linux-user\"
DEFAULT_INCLUDES = -I${top_srcdir}/lib/libspl/include DEFAULT_INCLUDES = -I${top_srcdir}/lib/libspl/include
ztest_SOURCES = \ ztest_SOURCES = \
ztest.c ztest.c

View File

@ -212,9 +212,9 @@ target_vendor = @target_vendor@
AM_CFLAGS = -Wall -Wstrict-prototypes -Wshadow -Werror -Wno-switch \ AM_CFLAGS = -Wall -Wstrict-prototypes -Wshadow -Werror -Wno-switch \
-Wno-unused -Wno-missing-braces -Wno-unknown-pragmas \ -Wno-unused -Wno-missing-braces -Wno-unknown-pragmas \
-Wno-parentheses -Wno-uninitialized -fno-strict-aliasing \ -Wno-parentheses -Wno-uninitialized -fno-strict-aliasing \
-D_GNU_SOURCE -D__EXTENSIONS__ -D_POSIX_PTHREAD_SEMANTICS \ -D_GNU_SOURCE -D__EXTENSIONS__ -D_REENTRANT \
-D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE -D_REENTRANT \ -D_POSIX_PTHREAD_SEMANTICS -D_FILE_OFFSET_BITS=64 \
-DTEXT_DOMAIN=\\\"zfs-linux-user\\\" -D_LARGEFILE64_SOURCE -DTEXT_DOMAIN=\"zfs-linux-user\"
DEFAULT_INCLUDES = \ DEFAULT_INCLUDES = \
-I${top_srcdir}/module/avl/include \ -I${top_srcdir}/module/avl/include \
-I${top_srcdir}/lib/libspl/include -I${top_srcdir}/lib/libspl/include

View File

@ -212,9 +212,9 @@ target_vendor = @target_vendor@
AM_CFLAGS = -Wall -Wstrict-prototypes -Wshadow -Werror -Wno-switch \ AM_CFLAGS = -Wall -Wstrict-prototypes -Wshadow -Werror -Wno-switch \
-Wno-unused -Wno-missing-braces -Wno-unknown-pragmas \ -Wno-unused -Wno-missing-braces -Wno-unknown-pragmas \
-Wno-parentheses -Wno-uninitialized -fno-strict-aliasing \ -Wno-parentheses -Wno-uninitialized -fno-strict-aliasing \
-D_GNU_SOURCE -D__EXTENSIONS__ -D_POSIX_PTHREAD_SEMANTICS \ -D_GNU_SOURCE -D__EXTENSIONS__ -D_REENTRANT \
-D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE -D_REENTRANT \ -D_POSIX_PTHREAD_SEMANTICS -D_FILE_OFFSET_BITS=64 \
-DTEXT_DOMAIN=\\\"zfs-linux-user\\\" -D_LARGEFILE64_SOURCE -DTEXT_DOMAIN=\"zfs-linux-user\"
DEFAULT_INCLUDES = \ DEFAULT_INCLUDES = \
-I${top_srcdir}/module/nvpair/include \ -I${top_srcdir}/module/nvpair/include \
-I${top_srcdir}/lib/libnvpair/include \ -I${top_srcdir}/lib/libnvpair/include \

View File

@ -213,9 +213,9 @@ target_vendor = @target_vendor@
AM_CFLAGS = -Wall -Wstrict-prototypes -Wshadow -Werror -Wno-switch \ AM_CFLAGS = -Wall -Wstrict-prototypes -Wshadow -Werror -Wno-switch \
-Wno-unused -Wno-missing-braces -Wno-unknown-pragmas \ -Wno-unused -Wno-missing-braces -Wno-unknown-pragmas \
-Wno-parentheses -Wno-uninitialized -fno-strict-aliasing \ -Wno-parentheses -Wno-uninitialized -fno-strict-aliasing \
-D_GNU_SOURCE -D__EXTENSIONS__ -D_POSIX_PTHREAD_SEMANTICS \ -D_GNU_SOURCE -D__EXTENSIONS__ -D_REENTRANT \
-D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE -D_REENTRANT \ -D_POSIX_PTHREAD_SEMANTICS -D_FILE_OFFSET_BITS=64 \
-DTEXT_DOMAIN=\\\"zfs-linux-user\\\" -D_LARGEFILE64_SOURCE -DTEXT_DOMAIN=\"zfs-linux-user\"
DEFAULT_INCLUDES = \ DEFAULT_INCLUDES = \
-I${top_srcdir}/lib/libspl/include -I${top_srcdir}/lib/libspl/include

View File

@ -214,9 +214,9 @@ target_vendor = @target_vendor@
AM_CFLAGS = -Wall -Wstrict-prototypes -Wshadow -Werror -Wno-switch \ AM_CFLAGS = -Wall -Wstrict-prototypes -Wshadow -Werror -Wno-switch \
-Wno-unused -Wno-missing-braces -Wno-unknown-pragmas \ -Wno-unused -Wno-missing-braces -Wno-unknown-pragmas \
-Wno-parentheses -Wno-uninitialized -fno-strict-aliasing \ -Wno-parentheses -Wno-uninitialized -fno-strict-aliasing \
-D_GNU_SOURCE -D__EXTENSIONS__ -D_POSIX_PTHREAD_SEMANTICS \ -D_GNU_SOURCE -D__EXTENSIONS__ -D_REENTRANT \
-D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE -D_REENTRANT \ -D_POSIX_PTHREAD_SEMANTICS -D_FILE_OFFSET_BITS=64 \
-DTEXT_DOMAIN=\\\"zfs-linux-user\\\" -D_LARGEFILE64_SOURCE -DTEXT_DOMAIN=\"zfs-linux-user\"
DEFAULT_INCLUDES = \ DEFAULT_INCLUDES = \
-I${top_srcdir}/lib/libuutil/include \ -I${top_srcdir}/lib/libuutil/include \
-I${top_srcdir}/lib/libspl/include \ -I${top_srcdir}/lib/libspl/include \

View File

@ -213,14 +213,16 @@ target_vendor = @target_vendor@
AM_CFLAGS = -Wall -Wstrict-prototypes -Wshadow -Werror -Wno-switch \ AM_CFLAGS = -Wall -Wstrict-prototypes -Wshadow -Werror -Wno-switch \
-Wno-unused -Wno-missing-braces -Wno-unknown-pragmas \ -Wno-unused -Wno-missing-braces -Wno-unknown-pragmas \
-Wno-parentheses -Wno-uninitialized -fno-strict-aliasing \ -Wno-parentheses -Wno-uninitialized -fno-strict-aliasing \
-D_GNU_SOURCE -D__EXTENSIONS__ -D_POSIX_PTHREAD_SEMANTICS \ -D_GNU_SOURCE -D__EXTENSIONS__ -D_REENTRANT \
-D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE -D_REENTRANT \ -D_POSIX_PTHREAD_SEMANTICS -D_FILE_OFFSET_BITS=64 \
-DTEXT_DOMAIN=\\\"zfs-linux-user\\\" -D_LARGEFILE64_SOURCE -DTEXT_DOMAIN=\"zfs-linux-user\"
DEFAULT_INCLUDES = \ DEFAULT_INCLUDES = \
-I${top_srcdir}/module/zcommon/include \ -I${top_srcdir}/lib/libzpool/include \
-I${top_srcdir}/lib/libspl/include \ -I${top_srcdir}/lib/libspl/include \
-I${top_srcdir}/lib/libnvpair/include \ -I${top_srcdir}/lib/libnvpair/include \
-I${top_srcdir}/module/zcommon/include \
-I${top_srcdir}/module/nvpair/include \ -I${top_srcdir}/module/nvpair/include \
-I${top_srcdir}/module/avl/include \
-I${top_srcdir}/module/zfs/include -I${top_srcdir}/module/zfs/include
lib_LTLIBRARIES = libzcommon.la lib_LTLIBRARIES = libzcommon.la

View File

@ -215,9 +215,9 @@ target_vendor = @target_vendor@
AM_CFLAGS = -Wall -Wstrict-prototypes -Wshadow -Werror -Wno-switch \ AM_CFLAGS = -Wall -Wstrict-prototypes -Wshadow -Werror -Wno-switch \
-Wno-unused -Wno-missing-braces -Wno-unknown-pragmas \ -Wno-unused -Wno-missing-braces -Wno-unknown-pragmas \
-Wno-parentheses -Wno-uninitialized -fno-strict-aliasing \ -Wno-parentheses -Wno-uninitialized -fno-strict-aliasing \
-D_GNU_SOURCE -D__EXTENSIONS__ -D_POSIX_PTHREAD_SEMANTICS \ -D_GNU_SOURCE -D__EXTENSIONS__ -D_REENTRANT \
-D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE -D_REENTRANT \ -D_POSIX_PTHREAD_SEMANTICS -D_FILE_OFFSET_BITS=64 \
-DTEXT_DOMAIN=\\\"zfs-linux-user\\\" -D_LARGEFILE64_SOURCE -DTEXT_DOMAIN=\"zfs-linux-user\"
DEFAULT_INCLUDES = \ DEFAULT_INCLUDES = \
-I${top_srcdir}/lib/libzfs/include \ -I${top_srcdir}/lib/libzfs/include \
-I${top_srcdir}/lib/libspl/include -I${top_srcdir}/lib/libspl/include

View File

@ -212,9 +212,9 @@ target_vendor = @target_vendor@
AM_CFLAGS = -Wall -Wstrict-prototypes -Wshadow -Werror -Wno-switch \ AM_CFLAGS = -Wall -Wstrict-prototypes -Wshadow -Werror -Wno-switch \
-Wno-unused -Wno-missing-braces -Wno-unknown-pragmas \ -Wno-unused -Wno-missing-braces -Wno-unknown-pragmas \
-Wno-parentheses -Wno-uninitialized -fno-strict-aliasing \ -Wno-parentheses -Wno-uninitialized -fno-strict-aliasing \
-D_GNU_SOURCE -D__EXTENSIONS__ -D_POSIX_PTHREAD_SEMANTICS \ -D_GNU_SOURCE -D__EXTENSIONS__ -D_REENTRANT \
-D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE -D_REENTRANT \ -D_POSIX_PTHREAD_SEMANTICS -D_FILE_OFFSET_BITS=64 \
-DTEXT_DOMAIN=\\\"zfs-linux-user\\\" -D_LARGEFILE64_SOURCE -DTEXT_DOMAIN=\"zfs-linux-user\"
DEFAULT_INCLUDES = \ DEFAULT_INCLUDES = \
-I${top_srcdir}/module/zpool/include \ -I${top_srcdir}/module/zpool/include \
-I${top_srcdir}/module/zcommon/include \ -I${top_srcdir}/module/zcommon/include \