From d918e8e97d7f87879b6ab334a224b32e92f7bbad Mon Sep 17 00:00:00 2001 From: Brian Behlendorf Date: Tue, 16 Dec 2008 09:12:43 -0800 Subject: [PATCH] Refresh autogen products --- cmd/zdb/Makefile.in | 2 +- cmd/zdump/Makefile.in | 2 +- cmd/zfs/Makefile.in | 2 +- cmd/zinject/Makefile.in | 2 +- cmd/zpios/Makefile.in | 2 +- cmd/zpool/Makefile.in | 2 +- cmd/ztest/Makefile.in | 2 +- lib/libavl/Makefile.in | 6 ++---- lib/libnvpair/Makefile.in | 9 ++++----- lib/libspl/Makefile.in | 4 +--- lib/libuutil/Makefile.in | 9 ++++----- lib/libzfs/Makefile.in | 20 +++++++++----------- lib/libzpool/Makefile.in | 17 ++++++++--------- 13 files changed, 35 insertions(+), 44 deletions(-) diff --git a/cmd/zdb/Makefile.in b/cmd/zdb/Makefile.in index f9ed03f48d..d17465875a 100644 --- a/cmd/zdb/Makefile.in +++ b/cmd/zdb/Makefile.in @@ -203,6 +203,7 @@ target_alias = @target_alias@ target_cpu = @target_cpu@ target_os = @target_os@ 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: 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_POSIX_PTHREAD_SEMANTICS -D_FILE_OFFSET_BITS=64 \ -D_LARGEFILE64_SOURCE -DTEXT_DOMAIN=\"zfs-linux-user\" -DEFAULT_INCLUDES = -I${top_srcdir}/lib/libspl/include zdb_SOURCES = \ zdb.c \ zdb_il.c diff --git a/cmd/zdump/Makefile.in b/cmd/zdump/Makefile.in index 960904d73e..8cac57a0a3 100644 --- a/cmd/zdump/Makefile.in +++ b/cmd/zdump/Makefile.in @@ -203,6 +203,7 @@ target_alias = @target_alias@ target_cpu = @target_cpu@ target_os = @target_os@ 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: 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_POSIX_PTHREAD_SEMANTICS -D_FILE_OFFSET_BITS=64 \ -D_LARGEFILE64_SOURCE -DTEXT_DOMAIN=\"zfs-linux-user\" -DEFAULT_INCLUDES = -I${top_srcdir}/lib/libspl/include zdump_SOURCES = \ zdump.c diff --git a/cmd/zfs/Makefile.in b/cmd/zfs/Makefile.in index e1ebaebd68..4d80933402 100644 --- a/cmd/zfs/Makefile.in +++ b/cmd/zfs/Makefile.in @@ -203,6 +203,7 @@ target_alias = @target_alias@ target_cpu = @target_cpu@ target_os = @target_os@ 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: 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_POSIX_PTHREAD_SEMANTICS -D_FILE_OFFSET_BITS=64 \ -D_LARGEFILE64_SOURCE -DTEXT_DOMAIN=\"zfs-linux-user\" -DEFAULT_INCLUDES = -I${top_srcdir}/lib/libspl/include zfs_SOURCES = \ zfs_iter.c \ zfs_iter.h \ diff --git a/cmd/zinject/Makefile.in b/cmd/zinject/Makefile.in index a477cfa612..1789320ce1 100644 --- a/cmd/zinject/Makefile.in +++ b/cmd/zinject/Makefile.in @@ -203,6 +203,7 @@ target_alias = @target_alias@ target_cpu = @target_cpu@ target_os = @target_os@ 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: 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_POSIX_PTHREAD_SEMANTICS -D_FILE_OFFSET_BITS=64 \ -D_LARGEFILE64_SOURCE -DTEXT_DOMAIN=\"zfs-linux-user\" -DEFAULT_INCLUDES = -I${top_srcdir}/lib/libspl/include zinject_SOURCES = \ translate.c \ zinject.ci \ diff --git a/cmd/zpios/Makefile.in b/cmd/zpios/Makefile.in index 123f7154c1..43b073c57b 100644 --- a/cmd/zpios/Makefile.in +++ b/cmd/zpios/Makefile.in @@ -61,7 +61,6 @@ PROGRAMS = $(sbin_PROGRAMS) am_zpios_OBJECTS = zpios_main.$(OBJEXT) zpios_util.$(OBJEXT) zpios_OBJECTS = $(am_zpios_OBJECTS) zpios_LDADD = $(LDADD) -DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/config/depcomp am__depfiles_maybe = depfiles COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ @@ -204,6 +203,7 @@ target_alias = @target_alias@ target_cpu = @target_cpu@ target_os = @target_os@ target_vendor = @target_vendor@ +DEFAULT_INCLUDES = -I${top_srcdir} # FIXME: Quiet warnings not covered by the gcc-* patches. We should # FIXME: consider removing this as soon as we reasonably can. diff --git a/cmd/zpool/Makefile.in b/cmd/zpool/Makefile.in index 5a2abd24d1..fd8dbe2640 100644 --- a/cmd/zpool/Makefile.in +++ b/cmd/zpool/Makefile.in @@ -204,6 +204,7 @@ target_alias = @target_alias@ target_cpu = @target_cpu@ target_os = @target_os@ 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: 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_POSIX_PTHREAD_SEMANTICS -D_FILE_OFFSET_BITS=64 \ -D_LARGEFILE64_SOURCE -DTEXT_DOMAIN=\"zfs-linux-user\" -DEFAULT_INCLUDES = -I${top_srcdir}/lib/libspl/include zpool_SOURCES = \ zpool_iter.c \ zpool_main.c \ diff --git a/cmd/ztest/Makefile.in b/cmd/ztest/Makefile.in index 9837be2b82..86fc653380 100644 --- a/cmd/ztest/Makefile.in +++ b/cmd/ztest/Makefile.in @@ -203,6 +203,7 @@ target_alias = @target_alias@ target_cpu = @target_cpu@ target_os = @target_os@ 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: 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_POSIX_PTHREAD_SEMANTICS -D_FILE_OFFSET_BITS=64 \ -D_LARGEFILE64_SOURCE -DTEXT_DOMAIN=\"zfs-linux-user\" -DEFAULT_INCLUDES = -I${top_srcdir}/lib/libspl/include ztest_SOURCES = \ ztest.c diff --git a/lib/libavl/Makefile.in b/lib/libavl/Makefile.in index 1d22a23ec7..f0aa4c4281 100644 --- a/lib/libavl/Makefile.in +++ b/lib/libavl/Makefile.in @@ -208,6 +208,8 @@ target_alias = @target_alias@ target_cpu = @target_cpu@ target_os = @target_os@ 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: 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_POSIX_PTHREAD_SEMANTICS -D_FILE_OFFSET_BITS=64 \ -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 libavl_la_SOURCES = \ ${top_srcdir}/module/avl/avl.c \ diff --git a/lib/libnvpair/Makefile.in b/lib/libnvpair/Makefile.in index ec454f1b94..23a3ec4826 100644 --- a/lib/libnvpair/Makefile.in +++ b/lib/libnvpair/Makefile.in @@ -208,6 +208,10 @@ target_alias = @target_alias@ target_cpu = @target_cpu@ target_os = @target_os@ 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: 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_POSIX_PTHREAD_SEMANTICS -D_FILE_OFFSET_BITS=64 \ -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 libnvpair_la_SOURCES = \ ${top_srcdir}/lib/libnvpair/libnvpair.c \ diff --git a/lib/libspl/Makefile.in b/lib/libspl/Makefile.in index affdebb313..63679c1ffa 100644 --- a/lib/libspl/Makefile.in +++ b/lib/libspl/Makefile.in @@ -209,6 +209,7 @@ target_alias = @target_alias@ target_cpu = @target_cpu@ target_os = @target_os@ 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: 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_POSIX_PTHREAD_SEMANTICS -D_FILE_OFFSET_BITS=64 \ -D_LARGEFILE64_SOURCE -DTEXT_DOMAIN=\"zfs-linux-user\" -DEFAULT_INCLUDES = \ - -I${top_srcdir}/lib/libspl/include - lib_LTLIBRARIES = libspl.la libspl_la_SOURCES = \ ${top_srcdir}/lib/libspl/list.c \ diff --git a/lib/libuutil/Makefile.in b/lib/libuutil/Makefile.in index eb47200a26..5350b77253 100644 --- a/lib/libuutil/Makefile.in +++ b/lib/libuutil/Makefile.in @@ -210,6 +210,10 @@ target_alias = @target_alias@ target_cpu = @target_cpu@ target_os = @target_os@ 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: 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_POSIX_PTHREAD_SEMANTICS -D_FILE_OFFSET_BITS=64 \ -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 libuutil_la_SOURCES = \ ${top_srcdir}/lib/libuutil/uu_alloc.c \ diff --git a/lib/libzfs/Makefile.in b/lib/libzfs/Makefile.in index 5c61643b35..ae8e950dc7 100644 --- a/lib/libzfs/Makefile.in +++ b/lib/libzfs/Makefile.in @@ -211,6 +211,15 @@ target_alias = @target_alias@ target_cpu = @target_cpu@ target_os = @target_os@ 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: 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_POSIX_PTHREAD_SEMANTICS -D_FILE_OFFSET_BITS=64 \ -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 libzfs_la_SOURCES = \ ${top_srcdir}/lib/libzfs/libzfs_changelist.c \ diff --git a/lib/libzpool/Makefile.in b/lib/libzpool/Makefile.in index 047310991e..d7bda93465 100644 --- a/lib/libzpool/Makefile.in +++ b/lib/libzpool/Makefile.in @@ -210,6 +210,14 @@ target_alias = @target_alias@ target_cpu = @target_cpu@ target_os = @target_os@ 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: 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_POSIX_PTHREAD_SEMANTICS -D_FILE_OFFSET_BITS=64 \ -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 libzpool_la_SOURCES = \ ${top_srcdir}/lib/libzpool/kernel.c \