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 2008-12-16 09:13:23 -08:00
parent 3ce253b758 d918e8e97d
commit 2d921b948c
13 changed files with 35 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/zdb/Makefile.in
View File

@ -203,6 +203,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@
DEFAULT_INCLUDES = -I${top_srcdir} -I${top_srcdir}/lib/libspl/include
# FIXME: Quiet warnings not covered by the gcc-* patches. We should # FIXME: Quiet warnings not covered by the gcc-* patches. We should
# FIXME: consider removing this as soon as we reasonably can. # FIXME: consider removing this as soon as we reasonably can.
@ -214,7 +215,6 @@ AM_CFLAGS = -Wall -Wstrict-prototypes -Wshadow -Werror -Wno-switch \
-D_GNU_SOURCE -D__EXTENSIONS__ -D_REENTRANT \ -D_GNU_SOURCE -D__EXTENSIONS__ -D_REENTRANT \
-D_POSIX_PTHREAD_SEMANTICS -D_FILE_OFFSET_BITS=64 \ -D_POSIX_PTHREAD_SEMANTICS -D_FILE_OFFSET_BITS=64 \
-D_LARGEFILE64_SOURCE -DTEXT_DOMAIN=\"zfs-linux-user\" -D_LARGEFILE64_SOURCE -DTEXT_DOMAIN=\"zfs-linux-user\"
DEFAULT_INCLUDES = -I${top_srcdir}/lib/libspl/include
zdb_SOURCES = \ zdb_SOURCES = \
zdb.c \ zdb.c \
zdb_il.c zdb_il.c

2
cmd/zdump/Makefile.in
View File

@ -203,6 +203,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@
DEFAULT_INCLUDES = -I${top_srcdir} -I${top_srcdir}/lib/libspl/include
# FIXME: Quiet warnings not covered by the gcc-* patches. We should # FIXME: Quiet warnings not covered by the gcc-* patches. We should
# FIXME: consider removing this as soon as we reasonably can. # FIXME: consider removing this as soon as we reasonably can.
@ -214,7 +215,6 @@ AM_CFLAGS = -Wall -Wstrict-prototypes -Wshadow -Werror -Wno-switch \
-D_GNU_SOURCE -D__EXTENSIONS__ -D_REENTRANT \ -D_GNU_SOURCE -D__EXTENSIONS__ -D_REENTRANT \
-D_POSIX_PTHREAD_SEMANTICS -D_FILE_OFFSET_BITS=64 \ -D_POSIX_PTHREAD_SEMANTICS -D_FILE_OFFSET_BITS=64 \
-D_LARGEFILE64_SOURCE -DTEXT_DOMAIN=\"zfs-linux-user\" -D_LARGEFILE64_SOURCE -DTEXT_DOMAIN=\"zfs-linux-user\"
DEFAULT_INCLUDES = -I${top_srcdir}/lib/libspl/include
zdump_SOURCES = \ zdump_SOURCES = \
zdump.c zdump.c

2
cmd/zfs/Makefile.in
View File

@ -203,6 +203,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@
DEFAULT_INCLUDES = -I${top_srcdir} -I${top_srcdir}/lib/libspl/include
# FIXME: Quiet warnings not covered by the gcc-* patches. We should # FIXME: Quiet warnings not covered by the gcc-* patches. We should
# FIXME: consider removing this as soon as we reasonably can. # FIXME: consider removing this as soon as we reasonably can.
@ -214,7 +215,6 @@ AM_CFLAGS = -Wall -Wstrict-prototypes -Wshadow -Werror -Wno-switch \
-D_GNU_SOURCE -D__EXTENSIONS__ -D_REENTRANT \ -D_GNU_SOURCE -D__EXTENSIONS__ -D_REENTRANT \
-D_POSIX_PTHREAD_SEMANTICS -D_FILE_OFFSET_BITS=64 \ -D_POSIX_PTHREAD_SEMANTICS -D_FILE_OFFSET_BITS=64 \
-D_LARGEFILE64_SOURCE -DTEXT_DOMAIN=\"zfs-linux-user\" -D_LARGEFILE64_SOURCE -DTEXT_DOMAIN=\"zfs-linux-user\"
DEFAULT_INCLUDES = -I${top_srcdir}/lib/libspl/include
zfs_SOURCES = \ zfs_SOURCES = \
zfs_iter.c \ zfs_iter.c \
zfs_iter.h \ zfs_iter.h \

2
cmd/zinject/Makefile.in
View File

@ -203,6 +203,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@
DEFAULT_INCLUDES = -I${top_srcdir} -I${top_srcdir}/lib/libspl/include
# FIXME: Quiet warnings not covered by the gcc-* patches. We should # FIXME: Quiet warnings not covered by the gcc-* patches. We should
# FIXME: consider removing this as soon as we reasonably can. # FIXME: consider removing this as soon as we reasonably can.
@ -214,7 +215,6 @@ AM_CFLAGS = -Wall -Wstrict-prototypes -Wshadow -Werror -Wno-switch \
-D_GNU_SOURCE -D__EXTENSIONS__ -D_REENTRANT \ -D_GNU_SOURCE -D__EXTENSIONS__ -D_REENTRANT \
-D_POSIX_PTHREAD_SEMANTICS -D_FILE_OFFSET_BITS=64 \ -D_POSIX_PTHREAD_SEMANTICS -D_FILE_OFFSET_BITS=64 \
-D_LARGEFILE64_SOURCE -DTEXT_DOMAIN=\"zfs-linux-user\" -D_LARGEFILE64_SOURCE -DTEXT_DOMAIN=\"zfs-linux-user\"
DEFAULT_INCLUDES = -I${top_srcdir}/lib/libspl/include
zinject_SOURCES = \ zinject_SOURCES = \
translate.c \ translate.c \
zinject.ci \ zinject.ci \

2
cmd/zpios/Makefile.in
View File

@ -61,7 +61,6 @@ PROGRAMS = $(sbin_PROGRAMS)
am_zpios_OBJECTS = zpios_main.$(OBJEXT) zpios_util.$(OBJEXT) am_zpios_OBJECTS = zpios_main.$(OBJEXT) zpios_util.$(OBJEXT)
zpios_OBJECTS = $(am_zpios_OBJECTS) zpios_OBJECTS = $(am_zpios_OBJECTS)
zpios_LDADD = $(LDADD) zpios_LDADD = $(LDADD)
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
depcomp = $(SHELL) $(top_srcdir)/config/depcomp depcomp = $(SHELL) $(top_srcdir)/config/depcomp
am__depfiles_maybe = depfiles am__depfiles_maybe = depfiles
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
@ -204,6 +203,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@
DEFAULT_INCLUDES = -I${top_srcdir}
# FIXME: Quiet warnings not covered by the gcc-* patches. We should # FIXME: Quiet warnings not covered by the gcc-* patches. We should
# FIXME: consider removing this as soon as we reasonably can. # FIXME: consider removing this as soon as we reasonably can.

2
cmd/zpool/Makefile.in
View File

@ -204,6 +204,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@
DEFAULT_INCLUDES = -I${top_srcdir} -I${top_srcdir}/lib/libspl/include
# FIXME: Quiet warnings not covered by the gcc-* patches. We should # FIXME: Quiet warnings not covered by the gcc-* patches. We should
# FIXME: consider removing this as soon as we reasonably can. # FIXME: consider removing this as soon as we reasonably can.
@ -215,7 +216,6 @@ AM_CFLAGS = -Wall -Wstrict-prototypes -Wshadow -Werror -Wno-switch \
-D_GNU_SOURCE -D__EXTENSIONS__ -D_REENTRANT \ -D_GNU_SOURCE -D__EXTENSIONS__ -D_REENTRANT \
-D_POSIX_PTHREAD_SEMANTICS -D_FILE_OFFSET_BITS=64 \ -D_POSIX_PTHREAD_SEMANTICS -D_FILE_OFFSET_BITS=64 \
-D_LARGEFILE64_SOURCE -DTEXT_DOMAIN=\"zfs-linux-user\" -D_LARGEFILE64_SOURCE -DTEXT_DOMAIN=\"zfs-linux-user\"
DEFAULT_INCLUDES = -I${top_srcdir}/lib/libspl/include
zpool_SOURCES = \ zpool_SOURCES = \
zpool_iter.c \ zpool_iter.c \
zpool_main.c \ zpool_main.c \

2
cmd/ztest/Makefile.in
View File

@ -203,6 +203,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@
DEFAULT_INCLUDES = -I${top_srcdir} -I${top_srcdir}/lib/libspl/include
# FIXME: Quiet warnings not covered by the gcc-* patches. We should # FIXME: Quiet warnings not covered by the gcc-* patches. We should
# FIXME: consider removing this as soon as we reasonably can. # FIXME: consider removing this as soon as we reasonably can.
@ -214,7 +215,6 @@ AM_CFLAGS = -Wall -Wstrict-prototypes -Wshadow -Werror -Wno-switch \
-D_GNU_SOURCE -D__EXTENSIONS__ -D_REENTRANT \ -D_GNU_SOURCE -D__EXTENSIONS__ -D_REENTRANT \
-D_POSIX_PTHREAD_SEMANTICS -D_FILE_OFFSET_BITS=64 \ -D_POSIX_PTHREAD_SEMANTICS -D_FILE_OFFSET_BITS=64 \
-D_LARGEFILE64_SOURCE -DTEXT_DOMAIN=\"zfs-linux-user\" -D_LARGEFILE64_SOURCE -DTEXT_DOMAIN=\"zfs-linux-user\"
DEFAULT_INCLUDES = -I${top_srcdir}/lib/libspl/include
ztest_SOURCES = \ ztest_SOURCES = \
ztest.c ztest.c

6
lib/libavl/Makefile.in
View File

@ -208,6 +208,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@
DEFAULT_INCLUDES = -I${top_srcdir} -I${top_srcdir}/module/avl/include \
-I${top_srcdir}/lib/libspl/include
# FIXME: Quiet warnings not covered by the gcc-* patches. We should # FIXME: Quiet warnings not covered by the gcc-* patches. We should
# FIXME: consider removing this as soon as we reasonably can. # FIXME: consider removing this as soon as we reasonably can.
@ -219,10 +221,6 @@ AM_CFLAGS = -Wall -Wstrict-prototypes -Wshadow -Werror -Wno-switch \
-D_GNU_SOURCE -D__EXTENSIONS__ -D_REENTRANT \ -D_GNU_SOURCE -D__EXTENSIONS__ -D_REENTRANT \
-D_POSIX_PTHREAD_SEMANTICS -D_FILE_OFFSET_BITS=64 \ -D_POSIX_PTHREAD_SEMANTICS -D_FILE_OFFSET_BITS=64 \
-D_LARGEFILE64_SOURCE -DTEXT_DOMAIN=\"zfs-linux-user\" -D_LARGEFILE64_SOURCE -DTEXT_DOMAIN=\"zfs-linux-user\"
DEFAULT_INCLUDES = \
-I${top_srcdir}/module/avl/include \
-I${top_srcdir}/lib/libspl/include
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 \

9
lib/libnvpair/Makefile.in
View File

@ -208,6 +208,10 @@ 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@
DEFAULT_INCLUDES = -I${top_srcdir} \
-I${top_srcdir}/module/nvpair/include \
-I${top_srcdir}/lib/libnvpair/include \
-I${top_srcdir}/lib/libspl/include
# FIXME: Quiet warnings not covered by the gcc-* patches. We should # FIXME: Quiet warnings not covered by the gcc-* patches. We should
# FIXME: consider removing this as soon as we reasonably can. # FIXME: consider removing this as soon as we reasonably can.
@ -219,11 +223,6 @@ AM_CFLAGS = -Wall -Wstrict-prototypes -Wshadow -Werror -Wno-switch \
-D_GNU_SOURCE -D__EXTENSIONS__ -D_REENTRANT \ -D_GNU_SOURCE -D__EXTENSIONS__ -D_REENTRANT \
-D_POSIX_PTHREAD_SEMANTICS -D_FILE_OFFSET_BITS=64 \ -D_POSIX_PTHREAD_SEMANTICS -D_FILE_OFFSET_BITS=64 \
-D_LARGEFILE64_SOURCE -DTEXT_DOMAIN=\"zfs-linux-user\" -D_LARGEFILE64_SOURCE -DTEXT_DOMAIN=\"zfs-linux-user\"
DEFAULT_INCLUDES = \
-I${top_srcdir}/module/nvpair/include \
-I${top_srcdir}/lib/libnvpair/include \
-I${top_srcdir}/lib/libspl/include
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 \

4
lib/libspl/Makefile.in
View File

@ -209,6 +209,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@
DEFAULT_INCLUDES = -I${top_srcdir} -I${top_srcdir}/lib/libspl/include
# FIXME: Quiet warnings not covered by the gcc-* patches. We should # FIXME: Quiet warnings not covered by the gcc-* patches. We should
# FIXME: consider removing this as soon as we reasonably can. # FIXME: consider removing this as soon as we reasonably can.
@ -220,9 +221,6 @@ AM_CFLAGS = -Wall -Wstrict-prototypes -Wshadow -Werror -Wno-switch \
-D_GNU_SOURCE -D__EXTENSIONS__ -D_REENTRANT \ -D_GNU_SOURCE -D__EXTENSIONS__ -D_REENTRANT \
-D_POSIX_PTHREAD_SEMANTICS -D_FILE_OFFSET_BITS=64 \ -D_POSIX_PTHREAD_SEMANTICS -D_FILE_OFFSET_BITS=64 \
-D_LARGEFILE64_SOURCE -DTEXT_DOMAIN=\"zfs-linux-user\" -D_LARGEFILE64_SOURCE -DTEXT_DOMAIN=\"zfs-linux-user\"
DEFAULT_INCLUDES = \
-I${top_srcdir}/lib/libspl/include
lib_LTLIBRARIES = libspl.la lib_LTLIBRARIES = libspl.la
libspl_la_SOURCES = \ libspl_la_SOURCES = \
${top_srcdir}/lib/libspl/list.c \ ${top_srcdir}/lib/libspl/list.c \

9
lib/libuutil/Makefile.in
View File

@ -210,6 +210,10 @@ 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@
DEFAULT_INCLUDES = -I${top_srcdir} \
-I${top_srcdir}/lib/libuutil/include \
-I${top_srcdir}/lib/libspl/include \
-I${top_srcdir}/module/avl/include
# FIXME: Quiet warnings not covered by the gcc-* patches. We should # FIXME: Quiet warnings not covered by the gcc-* patches. We should
# FIXME: consider removing this as soon as we reasonably can. # FIXME: consider removing this as soon as we reasonably can.
@ -221,11 +225,6 @@ AM_CFLAGS = -Wall -Wstrict-prototypes -Wshadow -Werror -Wno-switch \
-D_GNU_SOURCE -D__EXTENSIONS__ -D_REENTRANT \ -D_GNU_SOURCE -D__EXTENSIONS__ -D_REENTRANT \
-D_POSIX_PTHREAD_SEMANTICS -D_FILE_OFFSET_BITS=64 \ -D_POSIX_PTHREAD_SEMANTICS -D_FILE_OFFSET_BITS=64 \
-D_LARGEFILE64_SOURCE -DTEXT_DOMAIN=\"zfs-linux-user\" -D_LARGEFILE64_SOURCE -DTEXT_DOMAIN=\"zfs-linux-user\"
DEFAULT_INCLUDES = \
-I${top_srcdir}/lib/libuutil/include \
-I${top_srcdir}/lib/libspl/include \
-I${top_srcdir}/module/avl/include
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 \

20
lib/libzfs/Makefile.in
View File

@ -211,6 +211,15 @@ 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@
DEFAULT_INCLUDES = -I${top_srcdir} -I${top_srcdir}/lib/libzfs/include \
-I${top_srcdir}/lib/libzpool/include \
-I${top_srcdir}/lib/libspl/include \
-I${top_srcdir}/lib/libnvpair/include \
-I${top_srcdir}/lib/libuutil/include \
-I${top_srcdir}/module/zfs/include \
-I${top_srcdir}/module/zcommon/include \
-I${top_srcdir}/module/nvpair/include \
-I${top_srcdir}/module/avl/include
# FIXME: Quiet warnings not covered by the gcc-* patches. We should # FIXME: Quiet warnings not covered by the gcc-* patches. We should
# FIXME: consider removing this as soon as we reasonably can. # FIXME: consider removing this as soon as we reasonably can.
@ -222,17 +231,6 @@ AM_CFLAGS = -Wall -Wstrict-prototypes -Wshadow -Werror -Wno-switch \
-D_GNU_SOURCE -D__EXTENSIONS__ -D_REENTRANT \ -D_GNU_SOURCE -D__EXTENSIONS__ -D_REENTRANT \
-D_POSIX_PTHREAD_SEMANTICS -D_FILE_OFFSET_BITS=64 \ -D_POSIX_PTHREAD_SEMANTICS -D_FILE_OFFSET_BITS=64 \
-D_LARGEFILE64_SOURCE -DTEXT_DOMAIN=\"zfs-linux-user\" -D_LARGEFILE64_SOURCE -DTEXT_DOMAIN=\"zfs-linux-user\"
DEFAULT_INCLUDES = \
-I${top_srcdir}/lib/libzfs/include \
-I${top_srcdir}/lib/libzpool/include \
-I${top_srcdir}/lib/libspl/include \
-I${top_srcdir}/lib/libnvpair/include \
-I${top_srcdir}/lib/libuutil/include \
-I${top_srcdir}/module/zfs/include \
-I${top_srcdir}/module/zcommon/include \
-I${top_srcdir}/module/nvpair/include \
-I${top_srcdir}/module/avl/include
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 \

17
lib/libzpool/Makefile.in
View File

@ -210,6 +210,14 @@ 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@
DEFAULT_INCLUDES = -I${top_srcdir} \
-I${top_srcdir}/lib/libzpool/include \
-I${top_srcdir}/lib/libspl/include \
-I${top_srcdir}/lib/libnvpair/include \
-I${top_srcdir}/module/zcommon/include \
-I${top_srcdir}/module/nvpair/include \
-I${top_srcdir}/module/avl/include \
-I${top_srcdir}/module/zfs/include
# FIXME: Quiet warnings not covered by the gcc-* patches. We should # FIXME: Quiet warnings not covered by the gcc-* patches. We should
# FIXME: consider removing this as soon as we reasonably can. # FIXME: consider removing this as soon as we reasonably can.
@ -221,15 +229,6 @@ AM_CFLAGS = -Wall -Wstrict-prototypes -Wshadow -Werror -Wno-switch \
-D_GNU_SOURCE -D__EXTENSIONS__ -D_REENTRANT \ -D_GNU_SOURCE -D__EXTENSIONS__ -D_REENTRANT \
-D_POSIX_PTHREAD_SEMANTICS -D_FILE_OFFSET_BITS=64 \ -D_POSIX_PTHREAD_SEMANTICS -D_FILE_OFFSET_BITS=64 \
-D_LARGEFILE64_SOURCE -DTEXT_DOMAIN=\"zfs-linux-user\" -D_LARGEFILE64_SOURCE -DTEXT_DOMAIN=\"zfs-linux-user\"
DEFAULT_INCLUDES = \
-I${top_srcdir}/lib/libzpool/include \
-I${top_srcdir}/lib/libspl/include \
-I${top_srcdir}/lib/libnvpair/include \
-I${top_srcdir}/module/zcommon/include \
-I${top_srcdir}/module/nvpair/include \
-I${top_srcdir}/module/avl/include \
-I${top_srcdir}/module/zfs/include
lib_LTLIBRARIES = libzpool.la lib_LTLIBRARIES = libzpool.la
libzpool_la_SOURCES = \ libzpool_la_SOURCES = \
${top_srcdir}/lib/libzpool/kernel.c \ ${top_srcdir}/lib/libzpool/kernel.c \