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:18:54 -08:00
parent 2475a871b0 4a8619da5f
commit 34e0918846
1 changed files with 34 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
configure.ac
View File

@ -56,7 +56,8 @@ ZFS_AC_CONFIG
ZFS_AC_LICENSE
ZFS_AC_DEBUG
AC_CONFIG_FILES([ Makefile
AC_CONFIG_FILES([
Makefile
config/Makefile
doc/Makefile
scripts/Makefile
@ -74,5 +75,19 @@ AC_CONFIG_FILES([ Makefile
cmd/zpool/Makefile
cmd/ztest/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