X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=libcfs%2Flibcfs%2FautoMakefile.am;h=66b2030648bb159f8092e82d09b569ac82596fe2;hb=0c00b4a10c951a7a5cba075a3e8181662dab50b8;hp=e29230da890f1ffc1c515947c120bbde2cc264d0;hpb=84a3fd67356c8073a917ea6abd63928055e38156;p=fs%2Flustre-release.git

diff --git a/libcfs/libcfs/autoMakefile.am b/libcfs/libcfs/autoMakefile.am
index e29230d..66b2030 100644
--- a/libcfs/libcfs/autoMakefile.am
+++ b/libcfs/libcfs/autoMakefile.am
@@ -28,32 +28,38 @@
 # Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2012, Intel Corporation.
+#
 
 #
 # This file is part of Lustre, http://www.lustre.org/
 # Lustre is a trademark of Sun Microsystems, Inc.
 #
 
-SUBDIRS := linux util posix
+SUBDIRS = linux util posix
 if DARWIN
 SUBDIRS += darwin
 endif
-DIST_SUBDIRS := linux util posix darwin
+DIST_SUBDIRS = linux util posix darwin
 
-if LIBLUSTRE
 noinst_LIBRARIES= libcfs.a
-libcfs_a_SOURCES= posix/posix-debug.c user-prim.c user-lock.c user-tcpip.c \
+libcfs_a_SOURCES= posix/posix-debug.c user-prim.c user-lock.c user-tcpip.c  \
 		  prng.c user-bitops.c user-mem.c hash.c kernel_user_comm.c \
 		  workitem.c fail.c libcfs_cpu.c libcfs_mem.c libcfs_lock.c \
-		  user-crypto.c posix/posix-crc32.c posix/posix-adler.c
+		  posix/rbtree.c user-crypto.c posix/posix-crc32.c          \
+		  posix/posix-adler.c heap.c
+
+if ARCH_x86
+libcfs_a_SOURCES += user-crc32pclmul.c crc32-pclmul_asm.S
+endif
+
 libcfs_a_CPPFLAGS = $(LLCPPFLAGS)
 libcfs_a_CFLAGS = $(LLCFLAGS)
-endif
 
 lib_LIBRARIES = libcfsutil.a
-libcfsutil_a_SOURCES = nidstrings.c libcfs_string.c util/parser.c \
-                       util/l_ioctl.c util/util.c
-libcfsutil_a_CPPFLAGS = $(LLCPPFLAGS) 
+libcfsutil_a_SOURCES = nidstrings.c libcfs_string.c util/parser.c	\
+		util/l_ioctl.c util/util.c
+libcfsutil_a_CPPFLAGS = $(LLCPPFLAGS)
 libcfsutil_a_CFLAGS = $(LLCFLAGS) -DLUSTRE_UTILS=1
 
 if MODULES
@@ -63,23 +69,23 @@ modulenet_DATA := libcfs$(KMODEXT)
 endif
 
 if DARWIN
-macos_PROGRAMS := libcfs
+macos_PROGRAMS = libcfs
 
-nodist_libcfs_SOURCES := darwin/darwin-sync.c darwin/darwin-mem.c	\
+nodist_libcfs_SOURCES = darwin/darwin-sync.c darwin/darwin-mem.c	\
 	darwin/darwin-prim.c darwin/darwin-fs.c darwin/darwin-curproc.c	\
 	darwin/darwin-tcpip.c darwin/darwin-utils.c 			\
 	darwin/darwin-debug.c darwin/darwin-proc.c 			\
 	darwin/darwin-tracefile.c darwin/darwin-module.c 		\
 	posix/posix-debug.c module.c tracefile.c nidstrings.c watchdog.c \
-	kernel_user_comm.c hash.c
+	kernel_user_comm.c hash.c posix/rbtree.c heap.c
 
 libcfs_CFLAGS := $(EXTRA_KCFLAGS)
 libcfs_LDFLAGS := $(EXTRA_KLDFLAGS)
 libcfs_LDADD := $(EXTRA_KLIBS)
 
-plist_DATA := Info.plist
+plist_DATA = Info.plist
 
-install_data_hook := fix-kext-ownership
+install_data_hook = fix-kext-ownership
 
 endif
 
@@ -90,5 +96,5 @@ install-data-hook: $(install_data_hook)
 MOSTLYCLEANFILES := @MOSTLYCLEANFILES@ linux-*.c linux/*.o darwin/*.o libcfs
 EXTRA_DIST := $(libcfs-all-objs:%.o=%.c) Info.plist tracefile.h prng.c \
 	      user-lock.c user-tcpip.c user-bitops.c user-prim.c workitem.c \
-	      user-mem.c kernel_user_comm.c fail.c libcfs_cpu.c \
+	      user-mem.c kernel_user_comm.c fail.c libcfs_cpu.c heap.c \
 	      libcfs_mem.c libcfs_lock.c linux/linux-tracefile.h