Update build system and packaging

[zfs] / module / Makefile.in

diff --git a/module/Makefile.in b/module/Makefile.in
index 093cf2286cef0261c257a9cac01cdfa97165d4ed..82d155dd31ac4341c5bb8cbfdc8867ffb09b8684 100644 (file)
--- a/module/Makefile.in
+++ b/module/Makefile.in
@@ -1,52 +1,46 @@
 subdir-m += avl
+subdir-m += icp
+subdir-m += lua
 subdir-m += nvpair
+subdir-m += spl
 subdir-m += unicode
 subdir-m += zcommon
 subdir-m += zfs
-subdir-m += zpios
-subdir-m += icp
 
 INSTALL_MOD_DIR ?= extra
 
-ZFS_MODULE_CFLAGS += -include @SPL_OBJ@/spl_config.h
+ZFS_MODULE_CFLAGS += -std=gnu99 -Wno-declaration-after-statement
+ZFS_MODULE_CFLAGS += @KERNEL_DEBUG_CFLAGS@
 ZFS_MODULE_CFLAGS += -include @abs_top_builddir@/zfs_config.h
-ZFS_MODULE_CFLAGS += -I@abs_top_srcdir@/include -I@SPL@/include -I@SPL@
+ZFS_MODULE_CFLAGS += -I@abs_top_srcdir@/include/spl
+ZFS_MODULE_CFLAGS += -I@abs_top_srcdir@/include
+
+ZFS_MODULE_CPPFLAGS += -D_KERNEL
+ZFS_MODULE_CPPFLAGS += @KERNEL_DEBUG_CPPFLAGS@
+
 @CONFIG_QAT_TRUE@ZFS_MODULE_CFLAGS += -I@QAT_SRC@/include
 @CONFIG_QAT_TRUE@KBUILD_EXTRA_SYMBOLS += @QAT_SYMBOLS@
-export ZFS_MODULE_CFLAGS
 
-SUBDIR_TARGETS = icp
+export ZFS_MODULE_CFLAGS ZFS_MODULE_CPPFLAGS
+
+SUBDIR_TARGETS = icp lua
 
 modules:
-       @# 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 \
-               cp @SPL_OBJ@/@SPL_SYMBOLS@ .; \
-       elif [ -f @SPL_OBJ@/module/@SPL_SYMBOLS@ ]; then \
-               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
        list='$(SUBDIR_TARGETS)'; for targetdir in $$list; do \
                $(MAKE) -C $$targetdir; \
        done
-       $(MAKE) -C @LINUX_OBJ@ SUBDIRS=`pwd` @KERNELMAKE_PARAMS@ CONFIG_ZFS=m $@
+       $(MAKE) -C @LINUX_OBJ@ SUBDIRS=`pwd` @KERNEL_MAKE@ CONFIG_ZFS=m $@
 
 clean:
        @# 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@ $@
+@CONFIG_KERNEL_TRUE@   $(MAKE) -C @LINUX_OBJ@ SUBDIRS=`pwd` @KERNEL_MAKE@ $@
 
-       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
 
+       find . -name '*.ur-safe' -type f -print | xargs $(RM)
+
 modules_install:
        @# Install the kernel modules
        $(MAKE) -C @LINUX_OBJ@ SUBDIRS=`pwd` $@ \