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

Resolve conflict

This commit is contained in:
Brian Behlendorf 2008-12-23 10:16:17 -08:00
parent 8888d3d650 14807f127e
commit f53645b55c
1 changed files with 34 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
configure.ac
View File

@ -56,12 +56,12 @@ ZFS_AC_CONFIG
ZFS_AC_LICENSE ZFS_AC_LICENSE
ZFS_AC_DEBUG ZFS_AC_DEBUG
AC_CONFIG_FILES([ Makefile AC_CONFIG_FILES([
Makefile
config/Makefile config/Makefile
doc/Makefile doc/Makefile
scripts/Makefile scripts/Makefile
lib/Makefile lib/Makefile
lib/libspl/Makefile
lib/libavl/Makefile lib/libavl/Makefile
lib/libnvpair/Makefile lib/libnvpair/Makefile
lib/libuutil/Makefile lib/libuutil/Makefile
@ -75,5 +75,19 @@ AC_CONFIG_FILES([ Makefile
cmd/zpool/Makefile cmd/zpool/Makefile
cmd/ztest/Makefile cmd/ztest/Makefile
cmd/zpios/Makefile cmd/zpios/Makefile
]) module/Makefile
module/avl/Makefile
module/avl/include/Makefile
module/avl/include/sys/Makefile
module/nvpair/Makefile
module/nvpair/include/Makefile
module/nvpair/include/sys/Makefile
module/zcommon/Makefile
module/zcommon/include/Makefile
module/zcommon/include/sys/Makefile
module/zcommon/include/sys/fs/Makefile
module/zcommon/include/sys/fm/Makefile
module/zcommon/include/sys/fm/fs/Makefile
module/zfs/Makefile
])
AC_OUTPUT AC_OUTPUT