X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=libcfs%2Flibcfs%2FMakefile.in;h=ae6b8c9616db426db41c41ee42c9dd1fb3ad88c5;hb=d328818a456daf30c20c8df0aa0be9dd2a2b6a9e;hp=0f7913be935b087668e88edefb62a6b2beb6398f;hpb=d70db3335f52cc49f5e01858d27b0ccd61036c62;p=fs%2Flustre-release.git

diff --git a/libcfs/libcfs/Makefile.in b/libcfs/libcfs/Makefile.in
index 0f7913b..ae6b8c9 100644
--- a/libcfs/libcfs/Makefile.in
+++ b/libcfs/libcfs/Makefile.in
@@ -1,33 +1,30 @@
 MODULES = libcfs
 
-libcfs-linux-objs := linux-tracefile.o linux-debug.o
-libcfs-linux-objs += linux-prim.o linux-mem.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-hash.o
+libcfs-linux-objs += linux-wait.o
+libcfs-linux-objs += generic-radix-tree.o
+libcfs-linux-objs += glob.o
+libcfs-linux-objs += xarray.o
 
-ifeq ($(PATCHLEVEL),6)
-libcfs-linux-objs := $(addprefix linux/,$(libcfs-linux-objs))
-endif
+libcfs-crypto-objs := crypto.o fname.o hkdf.o hooks.o keyring.o
+libcfs-crypto-objs += keysetup.o keysetup_v1.o policy.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
-
-else
-sources:
-
-endif
+libcfs-linux-objs := $(addprefix linux/,$(libcfs-linux-objs))
+libcfs-crypto-objs := $(addprefix crypto/,$(libcfs-crypto-objs))
 
-libcfs-all-objs := debug.o nidstrings.o lwt.o module.o tracefile.o watchdog.o \
-	libcfs_string.o hash.o kernel_user_comm.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