X-Git-Url: https://git.camperquake.de/gitweb.cgi?a=blobdiff_plain;f=module%2FMakefile.in;h=c69b8a35560e401b4392f344f65cf1210874a116;hb=b01615d5ac86913da1e092d0378bfb8f0e72af30;hp=f59f04479cd16da30f4ace7a65e041c7fe8823ec;hpb=302ef1517e5769cbe6a12d94c89f44a90721bfd4;p=zfs.git

diff --git a/module/Makefile.in b/module/Makefile.in
index f59f044..c69b8a3 100644
--- a/module/Makefile.in
+++ b/module/Makefile.in
@@ -5,48 +5,58 @@ subdir-m += zcommon
 subdir-m += zfs
 subdir-m += zpios
 
+ZFS_MODULE_CFLAGS += -include @SPL_OBJ@/spl_config.h
+ZFS_MODULE_CFLAGS += -include @abs_top_builddir@/zfs_config.h
+ZFS_MODULE_CFLAGS += -I@abs_top_srcdir@/include -I@SPL@/include -I@SPL@
+export ZFS_MODULE_CFLAGS
+
 modules:
-	# Make the exported SPL symbols available to these modules.
-	cp @SPL_OBJ@/@SPL_SYMBOLS@ .
-	$(MAKE) -C @LINUX_OBJ@ SUBDIRS=`pwd` @KERNELMAKE_PARAMS@ $@
+	@# Make the exported SPL symbols available to these modules.
+	@# They may be in the root of SPL_OBJ when building against
+	@# installed devel headers, or they may be in the module
+	@# subdirectory when building against the spl source tree.
+	@if [ -f @SPL_OBJ@/@SPL_SYMBOLS@ ]; then \
+		/bin/cp @SPL_OBJ@/@SPL_SYMBOLS@ .; \
+	elif [ -f @SPL_OBJ@/module/@SPL_SYMBOLS@ ]; then \
+		/bin/cp @SPL_OBJ@/module/@SPL_SYMBOLS@ .; \
+	else \
+		echo -e "\n" \
+		"*** Missing spl symbols ensure you have built the spl:\n" \
+		"*** - @SPL_OBJ@/@SPL_SYMBOLS@, or\n" \
+		"*** - @SPL_OBJ@/module/@SPL_SYMBOLS@\n"; \
+		exit 1; \
+	fi
+	$(MAKE) -C @LINUX_OBJ@ SUBDIRS=`pwd` @KERNELMAKE_PARAMS@ CONFIG_ZFS=m $@
 
 clean:
-	$(MAKE) -C @LINUX_OBJ@ SUBDIRS=`pwd` @KERNELMAKE_PARAMS@ $@
+	@# Only cleanup the kernel build directories when CONFIG_KERNEL
+	@# is defined.  This indicates that kernel modules should be built.
+@CONFIG_KERNEL_TRUE@	$(MAKE) -C @LINUX_OBJ@ SUBDIRS=`pwd` @KERNELMAKE_PARAMS@ $@
+
 	if [ -f @SPL_SYMBOLS@ ]; then $(RM) @SPL_SYMBOLS@; fi
 	if [ -f @LINUX_SYMBOLS@ ]; then $(RM) @LINUX_SYMBOLS@; fi
 	if [ -f Module.markers ]; then $(RM) Module.markers; fi
 
 modules_install:
-	# Install the kernel modules
+	@# Install the kernel modules
 	$(MAKE) -C @LINUX_OBJ@ SUBDIRS=`pwd` \
 		INSTALL_MOD_PATH=$(DESTDIR) \
 		INSTALL_MOD_DIR=addon/zfs $@
-	find ${DESTDIR}/lib/modules/ -name 'modules.*' | xargs ${RM}
-	sysmap=${DESTDIR}/boot/System.map-@LINUX_VERSION@; \
+	@# Remove extraneous build products when packaging
+	if [ -n "$(DESTDIR)" ]; then \
+		find $(DESTDIR)/lib/modules/@LINUX_VERSION@ \
+			-name 'modules.*' | xargs $(RM); \
+	fi
+	sysmap=$(DESTDIR)/boot/System.map-@LINUX_VERSION@; \
 	if [ -f $$sysmap ]; then \
 		depmod -ae -F $$sysmap @LINUX_VERSION@; \
 	fi
-	# Install the required headers in to the kernel source
-	destname=zfs-@ZFS_META_VERSION@/@LINUX_VERSION@; \
-	instdest=$(DESTDIR)/usr/src/$$destname; \
-	(find . -mindepth 3 -name '*.h' | xargs -Ihdr sh -c \
-	 "DEST=hdr && install -D hdr $$instdest/\$${DEST#*/*/*/}") || exit 1
 
 modules_uninstall:
-	# Uninstall the kernel modules
-	$(RM) -R ${DESTDIR}/lib/modules/@LINUX_VERSION@/addon/zfs
-	# Uninstall the required headers from the kernel source
-	destname=zfs-@ZFS_META_VERSION@/@LINUX_VERSION@; \
-	instdest=$(DESTDIR)/usr/src/$$destname; \
-	$(RM) -R $$instdest
+	@# Uninstall the kernel modules
+	$(RM) -R $(DESTDIR)/lib/modules/@LINUX_VERSION@/addon/zfs
 
 distdir:
-	distfiles=`find . -name '*.c' -o -name '*.h'`; \
-	for distfile in $$distfiles; do \
-		distpath=`dirname $$distdir/$$distfile`; \
-		(/bin/mkdir -p $$distpath && \
-		 /bin/cp $$distfile $$distdir/$$distfile) || exit 1; \
-	done
 
 distclean maintainer-clean: clean
 install: modules_install