config: better libtirpc detection

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

diff --git a/lib/libnvpair/Makefile.am b/lib/libnvpair/Makefile.am
index 9cac22c530457e29cb9760379f99062ed34c0645..6d59d7bfc6e2590d5934debf02be3da7402e751a 100644 (file)
--- a/lib/libnvpair/Makefile.am
+++ b/lib/libnvpair/Makefile.am
@@ -1,19 +1,34 @@
 include $(top_srcdir)/config/Rules.am
 
-AM_CFLAGS += $(DEBUG_STACKFLAGS) $(FRAME_LARGER_THAN)
+VPATH = \
+       $(top_srcdir)/module/nvpair \
+       $(top_srcdir)/lib/libnvpair
+
+# Includes kernel code, generate warnings for large stack frames
+# and required CFLAGS for libtirpc
+AM_CFLAGS += $(FRAME_LARGER_THAN) $(LIBTIRPC_CFLAGS)
 
 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
+USER_C = \
+       libnvpair.c \
+       libnvpair_json.c \
+       nvpair_alloc_system.c
+
+KERNEL_C = \
+       nvpair_alloc_fixed.c \
+       nvpair.c \
+       fnvpair.c
+
+nodist_libnvpair_la_SOURCES = \
+       $(USER_C) \
+       $(KERNEL_C)
+
+libnvpair_la_LIBADD = $(LIBTIRPC_LIBS)
+libnvpair_la_LDFLAGS = -version-info 1:1:0
+
+EXTRA_DIST = $(USER_C)