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

diff --git a/libcfs/libcfs/Makefile.in b/libcfs/libcfs/Makefile.in
index 0f7913b..71852cc 100644
--- a/libcfs/libcfs/Makefile.in
+++ b/libcfs/libcfs/Makefile.in
@@ -1,33 +1,40 @@
 MODULES = libcfs
 
 libcfs-linux-objs := linux-tracefile.o linux-debug.o
-libcfs-linux-objs += linux-prim.o linux-mem.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-crypto.o linux-crypto-crc32.o
+libcfs-linux-objs += linux-crypto-adler.o
 
-ifeq ($(PATCHLEVEL),6)
-libcfs-linux-objs := $(addprefix linux/,$(libcfs-linux-objs))
+libcfs-pclmul-obj :=
+
+ifeq ($(ARCH),x86)
+libcfs-linux-objs += linux-crypto-crc32pclmul.o
+libcfs-pclmul-obj += crc32-pclmul_asm.o
+endif
+ifeq ($(ARCH),i386)
+libcfs-linux-objs += linux-crypto-crc32pclmul.o
+libcfs-pclmul-obj += crc32-pclmul_asm.o
+endif
+ifeq ($(ARCH),x86_64)
+libcfs-linux-objs += linux-crypto-crc32pclmul.o
+libcfs-pclmul-obj += crc32-pclmul_asm.o
 endif
 
 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-all-objs := debug.o nidstrings.o lwt.o module.o tracefile.o watchdog.o \
-	libcfs_string.o hash.o kernel_user_comm.o
+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 heap.o
 
-libcfs-objs := $(libcfs-linux-objs) $(libcfs-all-objs)
+libcfs-objs := $(libcfs-linux-objs) $(libcfs-all-objs) $(libcfs-pclmul-obj)
 
 EXTRA_PRE_CFLAGS := -I@LUSTRE@/../libcfs/libcfs