X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=libcfs%2Flibcfs%2FautoMakefile.am;h=b7a41ebff35ac808b9caae173ffe5dc6216c38ae;hb=984f4ce51fd38caaf0bd2b706a130f7f17c51638;hp=c7596658268acf5fc30bfd693c57ab81421f273e;hpb=8af5baa172ae9520b91436792996c7d8df52561d;p=fs%2Flustre-release.git

diff --git a/libcfs/libcfs/autoMakefile.am b/libcfs/libcfs/autoMakefile.am
index c759665..b7a41eb 100644
--- a/libcfs/libcfs/autoMakefile.am
+++ b/libcfs/libcfs/autoMakefile.am
@@ -25,32 +25,41 @@
 #
 
 #
-# Copyright  2008 Sun Microsystems, Inc. All rights reserved
+# Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2012, Whamcloud, Inc.
+#
 
 #
 # 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 \
-                 user-bitops.c user-mem.c hash.c kernel_user_comm.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 \
+		  posix/rbtree.c user-crypto.c posix/posix-crc32.c          \
+		  posix/posix-adler.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 util/parser.c util/parser.h util/platform.h util/l_ioctl.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
@@ -60,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
 
 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
 
@@ -84,9 +93,8 @@ endif
 
 install-data-hook: $(install_data_hook)
 
-EXTRA_DIST := Info.plist
-
 MOSTLYCLEANFILES := @MOSTLYCLEANFILES@ linux-*.c linux/*.o darwin/*.o libcfs
-DIST_SOURCES := $(libcfs-all-objs:%.o=%.c) tracefile.h user-prim.c \
-      user-lock.c user-tcpip.c user-bitops.c\
-      user-mem.c kernel_user_comm.c linux/linux-tracefile.h
+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 \
+	      libcfs_mem.c libcfs_lock.c linux/linux-tracefile.h