Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
This commit is contained in:
commit
040e6c020f
|
@ -22,6 +22,7 @@ zpool_SOURCES = \
|
||||||
zpool_LDADD = \
|
zpool_LDADD = \
|
||||||
$(top_builddir)/lib/libspl/libspl.la \
|
$(top_builddir)/lib/libspl/libspl.la \
|
||||||
$(top_builddir)/lib/libavl/libavl.la \
|
$(top_builddir)/lib/libavl/libavl.la \
|
||||||
|
$(top_builddir)/lib/libefi/libefi.la \
|
||||||
$(top_builddir)/lib/libnvpair/libnvpair.la \
|
$(top_builddir)/lib/libnvpair/libnvpair.la \
|
||||||
$(top_builddir)/lib/libunicode/libunicode.la \
|
$(top_builddir)/lib/libunicode/libunicode.la \
|
||||||
$(top_builddir)/lib/libuutil/libuutil.la \
|
$(top_builddir)/lib/libuutil/libuutil.la \
|
||||||
|
|
|
@ -1 +1 @@
|
||||||
SUBDIRS = libavl libnvpair libunicode libuutil libzfs libzpool
|
SUBDIRS = libavl libefi libnvpair libunicode libuutil libzfs libzpool
|
||||||
|
|
|
@ -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
|
Loading…
Reference in New Issue