4 files changed, 32 insertions, 24 deletions
diff --git a/lib/libspl/Makefile.am b/lib/libspl/Makefile.am
index dbf85c40f..a56944623 100644
--- a/lib/libspl/Makefile.am
+++ b/lib/libspl/Makefile.am
@@ -1,5 +1,9 @@
 include $(top_srcdir)/config/Rules.am
 
+VPATH = \
+	$(top_srcdir)/lib/libspl \
+	$(top_srcdir)/lib/libspl/$(TARGET_ASM_DIR)
+
 AM_CFLAGS += $(DEBUG_STACKFLAGS) $(FRAME_LARGER_THAN)
 
 SUBDIRS = include $(TARGET_ASM_DIR)
@@ -13,21 +17,31 @@ AM_CCASFLAGS = \
 
 noinst_LTLIBRARIES = libspl.la
 
-libspl_la_SOURCES = \
-	$(top_srcdir)/lib/libspl/getexecname.c \
-	$(top_srcdir)/lib/libspl/gethrtime.c \
-	$(top_srcdir)/lib/libspl/gethrestime.c \
-	$(top_srcdir)/lib/libspl/getmntany.c \
-	$(top_srcdir)/lib/libspl/list.c \
-	$(top_srcdir)/lib/libspl/mkdirp.c \
-	$(top_srcdir)/lib/libspl/strlcat.c \
-	$(top_srcdir)/lib/libspl/strlcpy.c \
-	$(top_srcdir)/lib/libspl/strnlen.c \
-	$(top_srcdir)/lib/libspl/timestamp.c \
-	$(top_srcdir)/lib/libspl/zone.c \
-	$(top_srcdir)/lib/libspl/xdr.c \
-	$(top_srcdir)/lib/libspl/$(TARGET_ASM_DIR)/atomic.S \
-	$(top_srcdir)/lib/libspl/include/sys/list.h \
-	$(top_srcdir)/lib/libspl/include/sys/list_impl.h
+USER_C = \
+	getexecname.c \
+	gethrtime.c \
+	gethrestime.c \
+	getmntany.c \
+	list.c \
+	mkdirp.c \
+	strlcat.c \
+	strlcpy.c \
+	strnlen.c \
+	timestamp.c \
+	zone.c \
+	xdr.c \
+	include/sys/list.h \
+	include/sys/list_impl.h
+
+USER_ASM = atomic.S
+
+KERNEL_C =
+
+nodist_libspl_la_SOURCES = \
+	$(USER_C) \
+	$(USER_ASM) \
+	$(KERNEL_C)
 
 libspl_la_LIBADD = -lrt
+
+EXTRA_DIST = $(USER_C)
diff --git a/lib/libspl/asm-generic/atomic.S b/lib/libspl/asm-generic/atomic.S
deleted file mode 100644
index 7550fd92b..000000000
--- a/lib/libspl/asm-generic/atomic.S
+++ /dev/null
@@ -1,6 +0,0 @@
-Stub file for 'make dist' distdir rule.
-
-This file is directly referenced by ../Makefile.am as a source
-file and thus will be expected by 'make dist'.  To avoid this
-being a problem this stub file was added.  It will be overwritten
-at build time based on assmebly generated from atomic.c.
diff --git a/lib/libspl/asm-i386/Makefile.am b/lib/libspl/asm-i386/Makefile.am
index 417b640bc..e1126102f 100644
--- a/lib/libspl/asm-i386/Makefile.am
+++ b/lib/libspl/asm-i386/Makefile.am
@@ -1 +1 @@
-noinst_HEADERS = $(top_srcdir)/lib/libspl/asm-i386/*.S
+noinst_HEADERS = atomic.S
diff --git a/lib/libspl/asm-x86_64/Makefile.am b/lib/libspl/asm-x86_64/Makefile.am
index 339c18d7c..e1126102f 100644
--- a/lib/libspl/asm-x86_64/Makefile.am
+++ b/lib/libspl/asm-x86_64/Makefile.am
@@ -1 +1 @@
-noinst_HEADERS = $(top_srcdir)/lib/libspl/asm-x86_64/*.S
+noinst_HEADERS = atomic.S