X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=libcfs%2Flibcfs%2FautoMakefile.am;h=252a199cf1d0ff538cf6c516cc1d0ce15dabe286;hb=da677c1c4f37886ff7b8d31396645b12365c0e88;hp=644cd57b0bb6db737616293f065cadfea4f289fe;hpb=f95393b0d0a59cf3dc2f29cffc35dcc4cc9d7728;p=fs%2Flustre-release.git

diff --git a/libcfs/libcfs/autoMakefile.am b/libcfs/libcfs/autoMakefile.am
index 644cd57..252a199 100644
--- a/libcfs/libcfs/autoMakefile.am
+++ b/libcfs/libcfs/autoMakefile.am
@@ -28,30 +28,37 @@
 # 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
-if DARWIN
-SUBDIRS += darwin
-endif
-DIST_SUBDIRS := linux util posix darwin
+SUBDIRS = linux util posix
+DIST_SUBDIRS = linux util posix
 
-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 posix/posix-proc.c heap.c user-string.c
+
+if HAVE_PCLMULQDQ
+if NEED_PCLMULQDQ_CRC32
+libcfs_a_SOURCES += user-crc32pclmul.c linux/crc32-pclmul_asm.S
+endif
+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 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
@@ -60,34 +67,10 @@ if LINUX
 modulenet_DATA := libcfs$(KMODEXT)
 endif
 
-if DARWIN
-macos_PROGRAMS := libcfs
-
-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
-
-libcfs_CFLAGS := $(EXTRA_KCFLAGS)
-libcfs_LDFLAGS := $(EXTRA_KLDFLAGS)
-libcfs_LDADD := $(EXTRA_KLIBS)
-
-plist_DATA := Info.plist
-
-install_data_hook := fix-kext-ownership
-
 endif
 
-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
+MOSTLYCLEANFILES := @MOSTLYCLEANFILES@ linux-*.c linux/*.o libcfs
+EXTRA_DIST := $(libcfs-all-objs:%.o=%.c) 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 heap.c \
+	      libcfs_mem.c libcfs_lock.c user-string.c linux/linux-tracefile.h