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

Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw

This commit is contained in:
Brian Behlendorf 2008-12-12 10:38:11 -08:00
parent d1b07069fa 1cce2945a5
commit 07f84cad28
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/libuutil/Makefile.am
View File

@ -6,7 +6,7 @@ DEFAULT_INCLUDES = \
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 \
${top_srcdir}/lib/libuutil/uu_avl.c \ ${top_srcdir}/lib/libuutil/uu_avl.c \
${top_srcdir}/lib/libuutil/uu_dprintf.c \ ${top_srcdir}/lib/libuutil/uu_dprintf.c \

4
lib/libzcommon/Makefile.am
View File

@ -2,8 +2,10 @@ include $(top_srcdir)/config/Rules.am
DEFAULT_INCLUDES = \ DEFAULT_INCLUDES = \
-I${top_srcdir}/module/zcommon/include \ -I${top_srcdir}/module/zcommon/include \
-I${top_srcdir}/lib/libspl/include \
-I${top_srcdir}/lib/libnvpair/include \
-I${top_srcdir}/module/nvpair/include \ -I${top_srcdir}/module/nvpair/include \
-I${top_srcdir}/lib/libspl/include -I${top_srcdir}/module/zfs/include
lib_LTLIBRARIES = libzcommon.la lib_LTLIBRARIES = libzcommon.la