X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=libcfs%2Flibcfs%2FMakefile.in;h=7a1c6cf733c2f7cf2991b6a14b9d330eb5eb1141;hb=refs%2Fchanges%2F15%2F44215%2F13;hp=9d5cd2df4b999f21d10e39fbc9253b497299d9e9;hpb=05d13ca333a3158a98f0c0e048a85564c6b9ed88;p=fs%2Flustre-release.git

diff --git a/libcfs/libcfs/Makefile.in b/libcfs/libcfs/Makefile.in
index 9d5cd2d..7a1c6cf 100644
--- a/libcfs/libcfs/Makefile.in
+++ b/libcfs/libcfs/Makefile.in
@@ -1,24 +1,28 @@
 MODULES = libcfs
 
-libcfs-linux-objs := linux-tracefile.o linux-debug.o
-libcfs-linux-objs += linux-prim.o linux-mem.o linux-cpu.o
-libcfs-linux-objs += linux-proc.o linux-curproc.o linux-fs.o
-libcfs-linux-objs += linux-utils.o linux-module.o
-libcfs-linux-objs += linux-crypto.o linux-crypto-adler.o
-@HAVE_CRC32_TRUE@libcfs-linux-objs += linux-crypto-crc32.o
-@HAVE_PCLMULQDQ_TRUE@@NEED_PCLMULQDQ_CRC32_TRUE@libcfs-linux-objs += linux-crypto-crc32pclmul.o crc32-pclmul_asm.o
-@HAVE_PCLMULQDQ_TRUE@@NEED_PCLMULQDQ_CRC32C_TRUE@libcfs-linux-objs += linux-crypto-crc32c-pclmul.o crc32c-pcl-intel-asm_64.o
+libcfs-linux-objs := linux-prim.o
+libcfs-linux-objs += linux-hash.o
+libcfs-linux-objs += linux-wait.o
+libcfs-linux-objs += xarray.o
+
+libcfs-crypto-objs := crypto.o fname.o hkdf.o hooks.o keyring.o
+libcfs-crypto-objs += keysetup.o keysetup_v1.o policy.o bio.o
 
 default: all
 
 libcfs-linux-objs := $(addprefix linux/,$(libcfs-linux-objs))
+libcfs-crypto-objs := $(addprefix crypto/,$(libcfs-crypto-objs))
 
-libcfs-all-objs := debug.o fail.o module.o tracefile.o watchdog.o \
-		   libcfs_string.o hash.o kernel_user_comm.o \
-		   prng.o workitem.o libcfs_cpu.o \
-		   libcfs_mem.o libcfs_lock.o heap.o
+libcfs-objs-$(CONFIG_SMP) = libcfs_cpu.o
+libcfs-all-objs := debug.o fail.o module.o tracefile.o \
+		   libcfs_string.o hash.o \
+		   workitem.o \
+		   libcfs_mem.o libcfs_lock.o \
+		   linux-crypto.o linux-crypto-adler.o \
+		   $(libcfs-objs-y)
 
 libcfs-objs := $(libcfs-linux-objs) $(libcfs-all-objs)
+@LLCRYPT_TRUE@libcfs-objs += $(libcfs-crypto-objs)
 
 EXTRA_PRE_CFLAGS := -I@LUSTRE@/../libcfs/libcfs