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

This commit is contained in:
Brian Behlendorf 2009-03-11 22:33:08 -07:00
commit e37c32070a
14 changed files with 71 additions and 129 deletions

View File

@ -222,18 +222,14 @@ DEFAULT_INCLUDES = -I${top_srcdir} -I${top_srcdir}/lib/libspl/include \
-I${top_srcdir}/module/avl/include \ -I${top_srcdir}/module/avl/include \
-I${top_srcdir}/module/unicode/include -I${top_srcdir}/module/unicode/include
# FIXME: Quiet warnings not covered by the gcc-* patches. We should
# FIXME: consider removing this as soon as we reasonably can.
#
# FIXME: Add -Wshadow once everything is working # FIXME: Add -Wshadow once everything is working
#
# Expected defines not covered by zfs_config.h or spl_config.h # Expected defines not covered by zfs_config.h or spl_config.h
AM_CFLAGS = -Wall -Wstrict-prototypes -Werror -Wno-switch -Wno-unused \ AM_CFLAGS = -Wall -Wstrict-prototypes -Werror -Wno-switch \
-Wno-missing-braces -Wno-uninitialized -fno-strict-aliasing \ -Wno-uninitialized -fno-strict-aliasing -D_GNU_SOURCE \
-D_GNU_SOURCE -D__EXTENSIONS__ -D_REENTRANT \ -D__EXTENSIONS__ -D_REENTRANT -D_POSIX_PTHREAD_SEMANTICS \
-D_POSIX_PTHREAD_SEMANTICS -D_FILE_OFFSET_BITS=64 \ -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE \
-D_LARGEFILE64_SOURCE -DTEXT_DOMAIN=\"zfs-linux-user\" -DTEXT_DOMAIN=\"zfs-linux-user\"
zdb_SOURCES = \ zdb_SOURCES = \
${top_srcdir}/cmd/zdb/zdb.c \ ${top_srcdir}/cmd/zdb/zdb.c \
${top_srcdir}/cmd/zdb/zdb_il.c ${top_srcdir}/cmd/zdb/zdb_il.c

View File

@ -221,18 +221,14 @@ DEFAULT_INCLUDES = -I${top_srcdir} -I${top_srcdir}/lib/libspl/include \
-I${top_srcdir}/module/avl/include \ -I${top_srcdir}/module/avl/include \
-I${top_srcdir}/module/unicode/include -I${top_srcdir}/module/unicode/include
# FIXME: Quiet warnings not covered by the gcc-* patches. We should
# FIXME: consider removing this as soon as we reasonably can.
#
# FIXME: Add -Wshadow once everything is working # FIXME: Add -Wshadow once everything is working
#
# Expected defines not covered by zfs_config.h or spl_config.h # Expected defines not covered by zfs_config.h or spl_config.h
AM_CFLAGS = -Wall -Wstrict-prototypes -Werror -Wno-switch -Wno-unused \ AM_CFLAGS = -Wall -Wstrict-prototypes -Werror -Wno-switch \
-Wno-missing-braces -Wno-uninitialized -fno-strict-aliasing \ -Wno-uninitialized -fno-strict-aliasing -D_GNU_SOURCE \
-D_GNU_SOURCE -D__EXTENSIONS__ -D_REENTRANT \ -D__EXTENSIONS__ -D_REENTRANT -D_POSIX_PTHREAD_SEMANTICS \
-D_POSIX_PTHREAD_SEMANTICS -D_FILE_OFFSET_BITS=64 \ -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE \
-D_LARGEFILE64_SOURCE -DTEXT_DOMAIN=\"zfs-linux-user\" -DTEXT_DOMAIN=\"zfs-linux-user\"
zfs_SOURCES = \ zfs_SOURCES = \
${top_srcdir}/cmd/zfs/zfs_iter.c \ ${top_srcdir}/cmd/zfs/zfs_iter.c \
${top_srcdir}/cmd/zfs/zfs_iter.h \ ${top_srcdir}/cmd/zfs/zfs_iter.h \

View File

@ -223,18 +223,14 @@ DEFAULT_INCLUDES = -I${top_srcdir} -I${top_srcdir}/lib/libspl/include \
-I${top_srcdir}/module/avl/include \ -I${top_srcdir}/module/avl/include \
-I${top_srcdir}/module/unicode/include -I${top_srcdir}/module/unicode/include
# FIXME: Quiet warnings not covered by the gcc-* patches. We should
# FIXME: consider removing this as soon as we reasonably can.
#
# FIXME: Add -Wshadow once everything is working # FIXME: Add -Wshadow once everything is working
#
# Expected defines not covered by zfs_config.h or spl_config.h # Expected defines not covered by zfs_config.h or spl_config.h
AM_CFLAGS = -Wall -Wstrict-prototypes -Werror -Wno-switch -Wno-unused \ AM_CFLAGS = -Wall -Wstrict-prototypes -Werror -Wno-switch \
-Wno-missing-braces -Wno-uninitialized -fno-strict-aliasing \ -Wno-uninitialized -fno-strict-aliasing -D_GNU_SOURCE \
-D_GNU_SOURCE -D__EXTENSIONS__ -D_REENTRANT \ -D__EXTENSIONS__ -D_REENTRANT -D_POSIX_PTHREAD_SEMANTICS \
-D_POSIX_PTHREAD_SEMANTICS -D_FILE_OFFSET_BITS=64 \ -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE \
-D_LARGEFILE64_SOURCE -DTEXT_DOMAIN=\"zfs-linux-user\" -DTEXT_DOMAIN=\"zfs-linux-user\"
zinject_SOURCES = \ zinject_SOURCES = \
${top_srcdir}/cmd/zinject/translate.c \ ${top_srcdir}/cmd/zinject/translate.c \
${top_srcdir}/cmd/zinject/zinject.c \ ${top_srcdir}/cmd/zinject/zinject.c \

View File

@ -209,18 +209,14 @@ target_vendor = @target_vendor@
DEFAULT_INCLUDES = -I${top_srcdir} \ DEFAULT_INCLUDES = -I${top_srcdir} \
-I${top_srcdir}/module/zpios/include -I${top_srcdir}/module/zpios/include
# FIXME: Quiet warnings not covered by the gcc-* patches. We should
# FIXME: consider removing this as soon as we reasonably can.
#
# FIXME: Add -Wshadow once everything is working # FIXME: Add -Wshadow once everything is working
#
# Expected defines not covered by zfs_config.h or spl_config.h # Expected defines not covered by zfs_config.h or spl_config.h
AM_CFLAGS = -Wall -Wstrict-prototypes -Werror -Wno-switch -Wno-unused \ AM_CFLAGS = -Wall -Wstrict-prototypes -Werror -Wno-switch \
-Wno-missing-braces -Wno-uninitialized -fno-strict-aliasing \ -Wno-uninitialized -fno-strict-aliasing -D_GNU_SOURCE \
-D_GNU_SOURCE -D__EXTENSIONS__ -D_REENTRANT \ -D__EXTENSIONS__ -D_REENTRANT -D_POSIX_PTHREAD_SEMANTICS \
-D_POSIX_PTHREAD_SEMANTICS -D_FILE_OFFSET_BITS=64 \ -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE \
-D_LARGEFILE64_SOURCE -DTEXT_DOMAIN=\"zfs-linux-user\" -DTEXT_DOMAIN=\"zfs-linux-user\"
zpios_SOURCES = \ zpios_SOURCES = \
$(top_srcdir)/cmd/zpios/zpios_main.c \ $(top_srcdir)/cmd/zpios/zpios_main.c \
$(top_srcdir)/cmd/zpios/zpios_util.c \ $(top_srcdir)/cmd/zpios/zpios_util.c \

View File

@ -222,18 +222,14 @@ DEFAULT_INCLUDES = -I${top_srcdir} -I${top_srcdir}/lib/libspl/include \
-I${top_srcdir}/module/avl/include \ -I${top_srcdir}/module/avl/include \
-I${top_srcdir}/module/unicode/include -I${top_srcdir}/module/unicode/include
# FIXME: Quiet warnings not covered by the gcc-* patches. We should
# FIXME: consider removing this as soon as we reasonably can.
#
# FIXME: Add -Wshadow once everything is working # FIXME: Add -Wshadow once everything is working
#
# Expected defines not covered by zfs_config.h or spl_config.h # Expected defines not covered by zfs_config.h or spl_config.h
AM_CFLAGS = -Wall -Wstrict-prototypes -Werror -Wno-switch -Wno-unused \ AM_CFLAGS = -Wall -Wstrict-prototypes -Werror -Wno-switch \
-Wno-missing-braces -Wno-uninitialized -fno-strict-aliasing \ -Wno-uninitialized -fno-strict-aliasing -D_GNU_SOURCE \
-D_GNU_SOURCE -D__EXTENSIONS__ -D_REENTRANT \ -D__EXTENSIONS__ -D_REENTRANT -D_POSIX_PTHREAD_SEMANTICS \
-D_POSIX_PTHREAD_SEMANTICS -D_FILE_OFFSET_BITS=64 \ -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE \
-D_LARGEFILE64_SOURCE -DTEXT_DOMAIN=\"zfs-linux-user\" -DTEXT_DOMAIN=\"zfs-linux-user\"
zpool_SOURCES = \ zpool_SOURCES = \
${top_srcdir}/cmd/zpool/zpool_iter.c \ ${top_srcdir}/cmd/zpool/zpool_iter.c \
${top_srcdir}/cmd/zpool/zpool_main.c \ ${top_srcdir}/cmd/zpool/zpool_main.c \

View File

@ -223,18 +223,14 @@ DEFAULT_INCLUDES = -I${top_srcdir} -I${top_srcdir}/lib/libspl/include \
-I${top_srcdir}/module/avl/include \ -I${top_srcdir}/module/avl/include \
-I${top_srcdir}/module/unicode/include -I${top_srcdir}/module/unicode/include
# FIXME: Quiet warnings not covered by the gcc-* patches. We should
# FIXME: consider removing this as soon as we reasonably can.
#
# FIXME: Add -Wshadow once everything is working # FIXME: Add -Wshadow once everything is working
#
# Expected defines not covered by zfs_config.h or spl_config.h # Expected defines not covered by zfs_config.h or spl_config.h
AM_CFLAGS = -Wall -Wstrict-prototypes -Werror -Wno-switch -Wno-unused \ AM_CFLAGS = -Wall -Wstrict-prototypes -Werror -Wno-switch \
-Wno-missing-braces -Wno-uninitialized -fno-strict-aliasing \ -Wno-uninitialized -fno-strict-aliasing -D_GNU_SOURCE \
-D_GNU_SOURCE -D__EXTENSIONS__ -D_REENTRANT \ -D__EXTENSIONS__ -D_REENTRANT -D_POSIX_PTHREAD_SEMANTICS \
-D_POSIX_PTHREAD_SEMANTICS -D_FILE_OFFSET_BITS=64 \ -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE \
-D_LARGEFILE64_SOURCE -DTEXT_DOMAIN=\"zfs-linux-user\" -DTEXT_DOMAIN=\"zfs-linux-user\"
ztest_SOURCES = \ ztest_SOURCES = \
${top_srcdir}/cmd/ztest/ztest.c ${top_srcdir}/cmd/ztest/ztest.c

18
configure vendored
View File

@ -19195,15 +19195,12 @@ echo "${ECHO_T}$ZFS_CONFIG" >&6;
kernel) kernel)
KERNELMAKE_PARAMS="V=1" KERNELMAKE_PARAMS="V=1"
# FIXME: Quiet warnings not covered by the gcc-* patches. We should
# FIXME: consider removing this as soon as we reasonably can
KERNELCPPFLAGS="$KERNELCPPFLAGS -Wall -Wstrict-prototypes -Werror" KERNELCPPFLAGS="$KERNELCPPFLAGS -Wall -Wstrict-prototypes -Werror"
KERNELCPPFLAGS="$KERNELCPPFLAGS -Wno-switch -Wno-unused" KERNELCPPFLAGS="$KERNELCPPFLAGS -Wno-switch"
KERNELCPPFLAGS="$KERNELCPPFLAGS -Wno-missing-braces"
KERNELCPPFLAGS="$KERNELCPPFLAGS -Wno-uninitialized -fno-strict-aliasing" KERNELCPPFLAGS="$KERNELCPPFLAGS -Wno-uninitialized -fno-strict-aliasing"
KERNELCPPFLAGS="$KERNELCPPFLAGS -DHAVE_SPL -D_KERNEL " KERNELCPPFLAGS="$KERNELCPPFLAGS -DHAVE_SPL -D_KERNEL"
KERNELCPPFLAGS="$KERNELCPPFLAGS -DTEXT_DOMAIN=\\\"zfs-linux-kernel\\\" " KERNELCPPFLAGS="$KERNELCPPFLAGS -DTEXT_DOMAIN=\\\"zfs-linux-kernel\\\""
KERNELCPPFLAGS="$KERNELCPPFLAGS -I$splsrc -I$splsrc/include -I$TOPDIR" KERNELCPPFLAGS="$KERNELCPPFLAGS -I$splsrc -I$splsrc/include -I$TOPDIR"
@ -19605,15 +19602,12 @@ echo "${ECHO_T}yes" >&6
all) all)
KERNELMAKE_PARAMS="V=1" KERNELMAKE_PARAMS="V=1"
# FIXME: Quiet warnings not covered by the gcc-* patches. We should
# FIXME: consider removing this as soon as we reasonably can
KERNELCPPFLAGS="$KERNELCPPFLAGS -Wall -Wstrict-prototypes -Werror" KERNELCPPFLAGS="$KERNELCPPFLAGS -Wall -Wstrict-prototypes -Werror"
KERNELCPPFLAGS="$KERNELCPPFLAGS -Wno-switch -Wno-unused" KERNELCPPFLAGS="$KERNELCPPFLAGS -Wno-switch"
KERNELCPPFLAGS="$KERNELCPPFLAGS -Wno-missing-braces"
KERNELCPPFLAGS="$KERNELCPPFLAGS -Wno-uninitialized -fno-strict-aliasing" KERNELCPPFLAGS="$KERNELCPPFLAGS -Wno-uninitialized -fno-strict-aliasing"
KERNELCPPFLAGS="$KERNELCPPFLAGS -DHAVE_SPL -D_KERNEL " KERNELCPPFLAGS="$KERNELCPPFLAGS -DHAVE_SPL -D_KERNEL"
KERNELCPPFLAGS="$KERNELCPPFLAGS -DTEXT_DOMAIN=\\\"zfs-linux-kernel\\\" " KERNELCPPFLAGS="$KERNELCPPFLAGS -DTEXT_DOMAIN=\\\"zfs-linux-kernel\\\""
KERNELCPPFLAGS="$KERNELCPPFLAGS -I$splsrc -I$splsrc/include -I$TOPDIR" KERNELCPPFLAGS="$KERNELCPPFLAGS -I$splsrc -I$splsrc/include -I$TOPDIR"

View File

@ -214,18 +214,14 @@ target_vendor = @target_vendor@
DEFAULT_INCLUDES = -I${top_srcdir} -I${top_srcdir}/module/avl/include \ DEFAULT_INCLUDES = -I${top_srcdir} -I${top_srcdir}/module/avl/include \
-I${top_srcdir}/lib/libspl/include -I${top_srcdir}/lib/libspl/include
# FIXME: Quiet warnings not covered by the gcc-* patches. We should
# FIXME: consider removing this as soon as we reasonably can.
#
# FIXME: Add -Wshadow once everything is working # FIXME: Add -Wshadow once everything is working
#
# Expected defines not covered by zfs_config.h or spl_config.h # Expected defines not covered by zfs_config.h or spl_config.h
AM_CFLAGS = -Wall -Wstrict-prototypes -Werror -Wno-switch -Wno-unused \ AM_CFLAGS = -Wall -Wstrict-prototypes -Werror -Wno-switch \
-Wno-missing-braces -Wno-uninitialized -fno-strict-aliasing \ -Wno-uninitialized -fno-strict-aliasing -D_GNU_SOURCE \
-D_GNU_SOURCE -D__EXTENSIONS__ -D_REENTRANT \ -D__EXTENSIONS__ -D_REENTRANT -D_POSIX_PTHREAD_SEMANTICS \
-D_POSIX_PTHREAD_SEMANTICS -D_FILE_OFFSET_BITS=64 \ -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE \
-D_LARGEFILE64_SOURCE -DTEXT_DOMAIN=\"zfs-linux-user\" -DTEXT_DOMAIN=\"zfs-linux-user\"
lib_LTLIBRARIES = libavl.la lib_LTLIBRARIES = libavl.la
libavl_la_SOURCES = \ libavl_la_SOURCES = \
${top_srcdir}/module/avl/avl.c \ ${top_srcdir}/module/avl/avl.c \

View File

@ -217,18 +217,14 @@ DEFAULT_INCLUDES = -I${top_srcdir} \
-I${top_srcdir}/lib/libnvpair/include \ -I${top_srcdir}/lib/libnvpair/include \
-I${top_srcdir}/lib/libspl/include -I${top_srcdir}/lib/libspl/include
# FIXME: Quiet warnings not covered by the gcc-* patches. We should
# FIXME: consider removing this as soon as we reasonably can.
#
# FIXME: Add -Wshadow once everything is working # FIXME: Add -Wshadow once everything is working
#
# Expected defines not covered by zfs_config.h or spl_config.h # Expected defines not covered by zfs_config.h or spl_config.h
AM_CFLAGS = -Wall -Wstrict-prototypes -Werror -Wno-switch -Wno-unused \ AM_CFLAGS = -Wall -Wstrict-prototypes -Werror -Wno-switch \
-Wno-missing-braces -Wno-uninitialized -fno-strict-aliasing \ -Wno-uninitialized -fno-strict-aliasing -D_GNU_SOURCE \
-D_GNU_SOURCE -D__EXTENSIONS__ -D_REENTRANT \ -D__EXTENSIONS__ -D_REENTRANT -D_POSIX_PTHREAD_SEMANTICS \
-D_POSIX_PTHREAD_SEMANTICS -D_FILE_OFFSET_BITS=64 \ -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE \
-D_LARGEFILE64_SOURCE -DTEXT_DOMAIN=\"zfs-linux-user\" -DTEXT_DOMAIN=\"zfs-linux-user\"
lib_LTLIBRARIES = libnvpair.la lib_LTLIBRARIES = libnvpair.la
libnvpair_la_SOURCES = \ libnvpair_la_SOURCES = \
${top_srcdir}/lib/libnvpair/libnvpair.c \ ${top_srcdir}/lib/libnvpair/libnvpair.c \

View File

@ -225,18 +225,14 @@ target_os = @target_os@
target_vendor = @target_vendor@ target_vendor = @target_vendor@
DEFAULT_INCLUDES = -I${top_srcdir} -I${top_srcdir}/lib/libspl/include DEFAULT_INCLUDES = -I${top_srcdir} -I${top_srcdir}/lib/libspl/include
# FIXME: Quiet warnings not covered by the gcc-* patches. We should
# FIXME: consider removing this as soon as we reasonably can.
#
# FIXME: Add -Wshadow once everything is working # FIXME: Add -Wshadow once everything is working
#
# Expected defines not covered by zfs_config.h or spl_config.h # Expected defines not covered by zfs_config.h or spl_config.h
AM_CFLAGS = -Wall -Wstrict-prototypes -Werror -Wno-switch -Wno-unused \ AM_CFLAGS = -Wall -Wstrict-prototypes -Werror -Wno-switch \
-Wno-missing-braces -Wno-uninitialized -fno-strict-aliasing \ -Wno-uninitialized -fno-strict-aliasing -D_GNU_SOURCE \
-D_GNU_SOURCE -D__EXTENSIONS__ -D_REENTRANT \ -D__EXTENSIONS__ -D_REENTRANT -D_POSIX_PTHREAD_SEMANTICS \
-D_POSIX_PTHREAD_SEMANTICS -D_FILE_OFFSET_BITS=64 \ -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE \
-D_LARGEFILE64_SOURCE -DTEXT_DOMAIN=\"zfs-linux-user\" -DTEXT_DOMAIN=\"zfs-linux-user\"
SUBDIRS = asm-i686 asm-x86_64 include SUBDIRS = asm-i686 asm-x86_64 include
AM_CCASFLAGS = \ AM_CCASFLAGS = \
-I${top_srcdir}/lib/libspl/include -I${top_srcdir}/lib/libspl/include

View File

@ -215,18 +215,14 @@ DEFAULT_INCLUDES = -I${top_srcdir} \
-I${top_srcdir}/module/unicode/include \ -I${top_srcdir}/module/unicode/include \
-I${top_srcdir}/lib/libspl/include -I${top_srcdir}/lib/libspl/include
# FIXME: Quiet warnings not covered by the gcc-* patches. We should
# FIXME: consider removing this as soon as we reasonably can.
#
# FIXME: Add -Wshadow once everything is working # FIXME: Add -Wshadow once everything is working
#
# Expected defines not covered by zfs_config.h or spl_config.h # Expected defines not covered by zfs_config.h or spl_config.h
AM_CFLAGS = -Wall -Wstrict-prototypes -Werror -Wno-switch -Wno-unused \ AM_CFLAGS = -Wall -Wstrict-prototypes -Werror -Wno-switch \
-Wno-missing-braces -Wno-uninitialized -fno-strict-aliasing \ -Wno-uninitialized -fno-strict-aliasing -D_GNU_SOURCE \
-D_GNU_SOURCE -D__EXTENSIONS__ -D_REENTRANT \ -D__EXTENSIONS__ -D_REENTRANT -D_POSIX_PTHREAD_SEMANTICS \
-D_POSIX_PTHREAD_SEMANTICS -D_FILE_OFFSET_BITS=64 \ -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE \
-D_LARGEFILE64_SOURCE -DTEXT_DOMAIN=\"zfs-linux-user\" -DTEXT_DOMAIN=\"zfs-linux-user\"
lib_LTLIBRARIES = libunicode.la lib_LTLIBRARIES = libunicode.la
libunicode_la_SOURCES = \ libunicode_la_SOURCES = \
${top_srcdir}/module/unicode/u8_textprep.c \ ${top_srcdir}/module/unicode/u8_textprep.c \

View File

@ -218,18 +218,14 @@ DEFAULT_INCLUDES = -I${top_srcdir} \
-I${top_srcdir}/lib/libspl/include \ -I${top_srcdir}/lib/libspl/include \
-I${top_srcdir}/module/avl/include -I${top_srcdir}/module/avl/include
# FIXME: Quiet warnings not covered by the gcc-* patches. We should
# FIXME: consider removing this as soon as we reasonably can.
#
# FIXME: Add -Wshadow once everything is working # FIXME: Add -Wshadow once everything is working
#
# Expected defines not covered by zfs_config.h or spl_config.h # Expected defines not covered by zfs_config.h or spl_config.h
AM_CFLAGS = -Wall -Wstrict-prototypes -Werror -Wno-switch -Wno-unused \ AM_CFLAGS = -Wall -Wstrict-prototypes -Werror -Wno-switch \
-Wno-missing-braces -Wno-uninitialized -fno-strict-aliasing \ -Wno-uninitialized -fno-strict-aliasing -D_GNU_SOURCE \
-D_GNU_SOURCE -D__EXTENSIONS__ -D_REENTRANT \ -D__EXTENSIONS__ -D_REENTRANT -D_POSIX_PTHREAD_SEMANTICS \
-D_POSIX_PTHREAD_SEMANTICS -D_FILE_OFFSET_BITS=64 \ -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE \
-D_LARGEFILE64_SOURCE -DTEXT_DOMAIN=\"zfs-linux-user\" -DTEXT_DOMAIN=\"zfs-linux-user\"
lib_LTLIBRARIES = libuutil.la lib_LTLIBRARIES = libuutil.la
libuutil_la_SOURCES = \ libuutil_la_SOURCES = \
${top_srcdir}/lib/libuutil/uu_alloc.c \ ${top_srcdir}/lib/libuutil/uu_alloc.c \

View File

@ -225,18 +225,14 @@ DEFAULT_INCLUDES = -I${top_srcdir} -I${top_srcdir}/lib/libzfs/include \
-I${top_srcdir}/module/avl/include \ -I${top_srcdir}/module/avl/include \
-I${top_srcdir}/module/unicode/include -I${top_srcdir}/module/unicode/include
# FIXME: Quiet warnings not covered by the gcc-* patches. We should
# FIXME: consider removing this as soon as we reasonably can.
#
# FIXME: Add -Wshadow once everything is working # FIXME: Add -Wshadow once everything is working
#
# Expected defines not covered by zfs_config.h or spl_config.h # Expected defines not covered by zfs_config.h or spl_config.h
AM_CFLAGS = -Wall -Wstrict-prototypes -Werror -Wno-switch -Wno-unused \ AM_CFLAGS = -Wall -Wstrict-prototypes -Werror -Wno-switch \
-Wno-missing-braces -Wno-uninitialized -fno-strict-aliasing \ -Wno-uninitialized -fno-strict-aliasing -D_GNU_SOURCE \
-D_GNU_SOURCE -D__EXTENSIONS__ -D_REENTRANT \ -D__EXTENSIONS__ -D_REENTRANT -D_POSIX_PTHREAD_SEMANTICS \
-D_POSIX_PTHREAD_SEMANTICS -D_FILE_OFFSET_BITS=64 \ -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE \
-D_LARGEFILE64_SOURCE -DTEXT_DOMAIN=\"zfs-linux-user\" -DTEXT_DOMAIN=\"zfs-linux-user\"
lib_LTLIBRARIES = libzfs.la lib_LTLIBRARIES = libzfs.la
libzfs_la_SOURCES = \ libzfs_la_SOURCES = \
${top_srcdir}/lib/libzfs/libzfs_changelist.c \ ${top_srcdir}/lib/libzfs/libzfs_changelist.c \

View File

@ -241,18 +241,14 @@ DEFAULT_INCLUDES = -I${top_srcdir} \
-I${top_srcdir}/module/unicode/include \ -I${top_srcdir}/module/unicode/include \
-I${top_srcdir}/module/zfs/include -I${top_srcdir}/module/zfs/include
# FIXME: Quiet warnings not covered by the gcc-* patches. We should
# FIXME: consider removing this as soon as we reasonably can.
#
# FIXME: Add -Wshadow once everything is working # FIXME: Add -Wshadow once everything is working
#
# Expected defines not covered by zfs_config.h or spl_config.h # Expected defines not covered by zfs_config.h or spl_config.h
AM_CFLAGS = -Wall -Wstrict-prototypes -Werror -Wno-switch -Wno-unused \ AM_CFLAGS = -Wall -Wstrict-prototypes -Werror -Wno-switch \
-Wno-missing-braces -Wno-uninitialized -fno-strict-aliasing \ -Wno-uninitialized -fno-strict-aliasing -D_GNU_SOURCE \
-D_GNU_SOURCE -D__EXTENSIONS__ -D_REENTRANT \ -D__EXTENSIONS__ -D_REENTRANT -D_POSIX_PTHREAD_SEMANTICS \
-D_POSIX_PTHREAD_SEMANTICS -D_FILE_OFFSET_BITS=64 \ -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE \
-D_LARGEFILE64_SOURCE -DTEXT_DOMAIN=\"zfs-linux-user\" -DTEXT_DOMAIN=\"zfs-linux-user\"
SUBDIRS = include SUBDIRS = include
lib_LTLIBRARIES = libzpool.la lib_LTLIBRARIES = libzpool.la
libzpool_la_SOURCES = \ libzpool_la_SOURCES = \