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

Merge commit 'refs/top-bases/linux-zfs-branch' into linux-zfs-branch

This commit is contained in:
Brian Behlendorf 2008-12-16 09:06:45 -08:00
parent 91e0b5ca89 5d9a791641
commit c0316e41c1
12 changed files with 19 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
cmd/zdb/Makefile.am
View File

@ -1,6 +1,7 @@
include $(top_srcdir)/config/Rules.am include $(top_srcdir)/config/Rules.am
DEFAULT_INCLUDES = -I${top_srcdir}/lib/libspl/include DEFAULT_INCLUDES += \
-I${top_srcdir}/lib/libspl/include
sbin_PROGRAMS = zdb sbin_PROGRAMS = zdb

3
cmd/zdump/Makefile.am
View File

@ -1,6 +1,7 @@
include $(top_srcdir)/config/Rules.am include $(top_srcdir)/config/Rules.am
DEFAULT_INCLUDES = -I${top_srcdir}/lib/libspl/include DEFAULT_INCLUDES += \
-I${top_srcdir}/lib/libspl/include
sbin_PROGRAMS = zdump sbin_PROGRAMS = zdump

3
cmd/zfs/Makefile.am
View File

@ -1,6 +1,7 @@
include $(top_srcdir)/config/Rules.am include $(top_srcdir)/config/Rules.am
DEFAULT_INCLUDES = -I${top_srcdir}/lib/libspl/include DEFAULT_INCLUDES += \
-I${top_srcdir}/lib/libspl/include
sbin_PROGRAMS = zfs sbin_PROGRAMS = zfs

3
cmd/zinject/Makefile.am
View File

@ -1,6 +1,7 @@
include $(top_srcdir)/config/Rules.am include $(top_srcdir)/config/Rules.am
DEFAULT_INCLUDES = -I${top_srcdir}/lib/libspl/include DEFAULT_INCLUDES += \
-I${top_srcdir}/lib/libspl/include
sbin_PROGRAMS = zinject sbin_PROGRAMS = zinject

3
cmd/zpool/Makefile.am
View File

@ -1,6 +1,7 @@
include $(top_srcdir)/config/Rules.am include $(top_srcdir)/config/Rules.am
DEFAULT_INCLUDES = -I${top_srcdir}/lib/libspl/include DEFAULT_INCLUDES += \
-I${top_srcdir}/lib/libspl/include
sbin_PROGRAMS = zpool sbin_PROGRAMS = zpool

3
cmd/ztest/Makefile.am
View File

@ -1,6 +1,7 @@
include $(top_srcdir)/config/Rules.am include $(top_srcdir)/config/Rules.am
DEFAULT_INCLUDES = -I${top_srcdir}/lib/libspl/include DEFAULT_INCLUDES += \
-I${top_srcdir}/lib/libspl/include
sbin_PROGRAMS = ztest sbin_PROGRAMS = ztest

2
config/Rules.am
View File

@ -1,3 +1,5 @@
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.
AM_CFLAGS = -Wall -Wstrict-prototypes -Wshadow -Werror AM_CFLAGS = -Wall -Wstrict-prototypes -Wshadow -Werror

2
lib/libavl/Makefile.am
View File

@ -1,6 +1,6 @@
include $(top_srcdir)/config/Rules.am include $(top_srcdir)/config/Rules.am
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

2
lib/libnvpair/Makefile.am
View File

@ -1,6 +1,6 @@
include $(top_srcdir)/config/Rules.am include $(top_srcdir)/config/Rules.am
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 \
-I${top_srcdir}/lib/libspl/include -I${top_srcdir}/lib/libspl/include

2
lib/libuutil/Makefile.am
View File

@ -1,6 +1,6 @@
include $(top_srcdir)/config/Rules.am include $(top_srcdir)/config/Rules.am
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 \
-I${top_srcdir}/module/avl/include -I${top_srcdir}/module/avl/include

2
lib/libzfs/Makefile.am
View File

@ -1,6 +1,6 @@
include $(top_srcdir)/config/Rules.am include $(top_srcdir)/config/Rules.am
DEFAULT_INCLUDES = \ DEFAULT_INCLUDES += \
-I${top_srcdir}/lib/libzfs/include \ -I${top_srcdir}/lib/libzfs/include \
-I${top_srcdir}/lib/libzpool/include \ -I${top_srcdir}/lib/libzpool/include \
-I${top_srcdir}/lib/libspl/include \ -I${top_srcdir}/lib/libspl/include \

2
lib/libzpool/Makefile.am
View File

@ -1,6 +1,6 @@
include $(top_srcdir)/config/Rules.am include $(top_srcdir)/config/Rules.am
DEFAULT_INCLUDES = \ DEFAULT_INCLUDES += \
-I${top_srcdir}/lib/libzpool/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 \