X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Fosd-zfs%2FMakefile.in;h=a43df420f524c4d072b75689cc6fa424414e545b;hb=9fb6818fe3d1e0130e147c5cf740e5e9a2631166;hp=2d8e190483cd70286eee4c090c87ff9d1c3a62c1;hpb=f1c56a55d453855f8fa57d5aded8800dfb53f060;p=fs%2Flustre-release.git

diff --git a/lustre/osd-zfs/Makefile.in b/lustre/osd-zfs/Makefile.in
index 2d8e190..a43df42 100644
--- a/lustre/osd-zfs/Makefile.in
+++ b/lustre/osd-zfs/Makefile.in
@@ -1,10 +1,12 @@
 MODULES := osd_zfs
-osd_zfs-objs := osd_handler.o osd_lproc.o udmu.o osd_quota.o
+osd_zfs-objs := osd_handler.o osd_lproc.o osd_quota.o
 osd_zfs-objs += osd_object.o osd_io.o osd_oi.o osd_xattr.o osd_index.o
+osd_zfs-objs += osd_scrub.o
 
-EXTRA_PRE_CFLAGS += -I@SPL_DIR@ -I@SPL_DIR@/include
-EXTRA_PRE_CFLAGS += -include @SPL_OBJ@/spl_config.h
-EXTRA_PRE_CFLAGS += -I@ZFS_DIR@ -I@ZFS_DIR@/include
+@SPL_ENABLED_TRUE@EXTRA_PRE_CFLAGS += -include @SPL_OBJ@/spl_config.h
+@SPL_ENABLED_TRUE@EXTRA_PRE_CFLAGS += -I@SPL@ -I@SPL@/include
 EXTRA_PRE_CFLAGS += -include @ZFS_OBJ@/zfs_config.h
+EXTRA_PRE_CFLAGS += -I@ZFS@ -I@ZFS@/include
+@SPL_ENABLED_FALSE@EXTRA_PRE_CFLAGS += -I@ZFS@/include/spl
 
 @INCLUDE_RULES@