Revert "Make taskq_member() use ->journal_info"

[mirror_spl.git] / include / Makefile.am

diff --git a/include/Makefile.am b/include/Makefile.am
index 3388ce8d950b550f9436f3a48e6ec63bd783e1eb..3200222dbb0ad4b375da8ed609086aae45c9edc1 100644 (file)
--- a/include/Makefile.am
+++ b/include/Makefile.am
@@ -1,24 +1,18 @@
-# All headers are referenced by this top level Makefile.am are
-# noinst_HEADERS because they are not installed in the usual include
-# location.  We do not want to be using $includedir for this.
-# Installation is handled by the custom install-data-local rule.
-noinst_HEADERS  = *.h
-noinst_HEADERS += asm/*.h
-noinst_HEADERS += fs/*.h
-noinst_HEADERS += linux/*.h
-noinst_HEADERS += rpc/*.h
-noinst_HEADERS += sharefs/*.h
-noinst_HEADERS += sys/fm/*.h
-noinst_HEADERS += sys/fs/*.h
-noinst_HEADERS += sys/sysevent/*.h
-noinst_HEADERS += sys/*.h
-noinst_HEADERS += util/*.h
-noinst_HEADERS += vm/*.h
+SUBDIRS = fs linux rpc sharefs sys util vm
 
-install-data-local:
-       destname=spl-$(SPL_META_VERSION)/$(LINUX_VERSION); \
-       instdest=$(DESTDIR)/${prefix}/src/$$destname; \
-       instfiles=`find . -name '*.h'`; \
-        for instfile in $$instfiles; do \
-               $(INSTALL) -D $$instfile $$instdest/$$instfile; \
-        done
+COMMON_H =
+
+KERNEL_H = \
+       $(top_srcdir)/include/splat-ctl.h \
+       $(top_srcdir)/include/spl-ctl.h \
+       $(top_srcdir)/include/strings.h \
+       $(top_srcdir)/include/unistd.h
+
+USER_H =
+
+EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H)
+
+if CONFIG_KERNEL
+kerneldir = @prefix@/src/spl-$(VERSION)/include
+kernel_HEADERS = $(KERNEL_H)
+endif