X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;ds=sidebyside;f=libcfs%2Flibcfs%2FMakefile.in;h=ad9ac74b9d74b75db42723973f3146ddc91a2780;hb=a813e81870096bcfecbe12aeeed8e1b0114cd474;hp=026dcabd1720361230dd6f7223872b387d39606c;hpb=c8da7bfbe0505175869973b25281b152940774b0;p=fs%2Flustre-release.git

diff --git a/libcfs/libcfs/Makefile.in b/libcfs/libcfs/Makefile.in
index 026dcab..ad9ac74 100644
--- a/libcfs/libcfs/Makefile.in
+++ b/libcfs/libcfs/Makefile.in
@@ -1,33 +1,27 @@
 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-fs.o linux-sync.o linux-tcpip.o
-libcfs-linux-objs += linux-lwt.o linux-proc.o linux-curproc.o
-libcfs-linux-objs += linux-utils.o linux-module.o
+libcfs-linux-objs := linux-prim.o
+libcfs-linux-objs += linux-curproc.o
+libcfs-linux-objs += linux-hash.o
+libcfs-linux-objs += linux-wait.o
 
-default: all
-
-ifeq (@linux25@,no)
-sources:
-	@for i in $(libcfs-linux-objs:%.o=%.c) ; do \
-		echo "ln -s @srcdir@/linux/$$i ." ; \
-		ln -sf @srcdir@/linux/$$i . || exit 1 ; \
-	done
+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
 
-else
-sources:
+default: all
 
 libcfs-linux-objs := $(addprefix linux/,$(libcfs-linux-objs))
+libcfs-crypto-objs := $(addprefix crypto/,$(libcfs-crypto-objs))
 
-endif
-
-libcfs-all-objs := debug.o fail.o nidstrings.o lwt.o module.o tracefile.o \
-		   watchdog.o libcfs_string.o hash.o kernel_user_comm.o \
-		   prng.o workitem.o upcall_cache.o libcfs_cpu.o \
-		   libcfs_mem.o libcfs_lock.o
+libcfs-all-objs := debug.o fail.o module.o tracefile.o \
+		   libcfs_string.o hash.o heap.o \
+		   workitem.o libcfs_cpu.o \
+		   libcfs_mem.o libcfs_lock.o \
+		   linux-crypto.o linux-crypto-adler.o \
+		   linux-debug.o linux-tracefile.o
 
 libcfs-objs := $(libcfs-linux-objs) $(libcfs-all-objs)
+@LLCRYPT_TRUE@libcfs-objs += $(libcfs-crypto-objs)
 
 EXTRA_PRE_CFLAGS := -I@LUSTRE@/../libcfs/libcfs