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

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

Conflicts:

	lib/Makefile.am
This commit is contained in:
Brian Behlendorf 2009-10-09 16:06:51 -07:00
parent 67fc15510b aed86aa54e
commit a740d2a8f7
3 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
cmd/zpool/Makefile.am
View File

@ -22,6 +22,7 @@ zpool_SOURCES = \
zpool_LDADD = \
$(top_builddir)/lib/libspl/libspl.la \
$(top_builddir)/lib/libavl/libavl.la \
$(top_builddir)/lib/libefi/libefi.la \
$(top_builddir)/lib/libnvpair/libnvpair.la \
$(top_builddir)/lib/libunicode/libunicode.la \
$(top_builddir)/lib/libuutil/libuutil.la \

2
lib/Makefile.am
View File

@ -1 +1 @@
SUBDIRS = libspl libavl libnvpair libunicode libuutil libzfs libzpool
SUBDIRS = libspl libavl libefi libnvpair libunicode libuutil libzfs libzpool

12
lib/libefi/Makefile.am Normal file
View File

@ -0,0 +1,12 @@
include $(top_srcdir)/config/Rules.am
DEFAULT_INCLUDES += \
-I${top_srcdir}/lib/libefi/include \
-I${top_srcdir}/lib/libspl/include
lib_LTLIBRARIES = libefi.la
libefi_la_SOURCES = \
${top_srcdir}/lib/libefi/rdwr_efi.c \
${top_srcdir}/lib/libefi/include/sys/efi_partition.h \
${top_srcdir}/lib/libefi/include/sys/uuid.h