Support custom build directories and move includes

[zfs.git] / lib / libnvpair / Makefile.am

diff --git a/lib/libnvpair/Makefile.am b/lib/libnvpair/Makefile.am
index 9cac22c..33edf3b 100644 (file)
--- a/lib/libnvpair/Makefile.am
+++ b/lib/libnvpair/Makefile.am
@@ -3,17 +3,16 @@ include $(top_srcdir)/config/Rules.am
 AM_CFLAGS += $(DEBUG_STACKFLAGS) $(FRAME_LARGER_THAN)
 
 DEFAULT_INCLUDES += \
-       -I${top_srcdir}/module/nvpair/include \
-       -I${top_srcdir}/lib/libnvpair/include \
-       -I${top_srcdir}/lib/libspl/include
+       -I$(top_srcdir)/include \
+       -I$(top_srcdir)/lib/libspl/include
 
 lib_LTLIBRARIES = libnvpair.la
 
 libnvpair_la_SOURCES = \
-       ${top_srcdir}/lib/libnvpair/libnvpair.c \
-       ${top_srcdir}/lib/libnvpair/nvpair_alloc_system.c \
-       ${top_srcdir}/lib/libnvpair/include/libnvpair.h \
-       ${top_srcdir}/module/nvpair/nvpair_alloc_fixed.c \
-       ${top_srcdir}/module/nvpair/nvpair.c \
-       ${top_srcdir}/module/nvpair/include/sys/nvpair.h \
-       ${top_srcdir}/module/nvpair/include/sys/nvpair_impl.h
+       $(top_srcdir)/lib/libnvpair/libnvpair.c \
+       $(top_srcdir)/lib/libnvpair/nvpair_alloc_system.c \
+       $(top_srcdir)/module/nvpair/nvpair_alloc_fixed.c \
+       $(top_srcdir)/module/nvpair/nvpair.c
+
+EXTRA_DIST = \
+       $(top_srcdir)/module/nvpair/nvpair_alloc_spl.c