LU-6245 libcfs: create userland and kernel string operations

[fs/lustre-release.git] / libcfs / libcfs / autoMakefile.am

diff --git a/libcfs/libcfs/autoMakefile.am b/libcfs/libcfs/autoMakefile.am
index 0e7819c..1bbe71c 100644 (file)
--- a/libcfs/libcfs/autoMakefile.am
+++ b/libcfs/libcfs/autoMakefile.am
@@ -28,7 +28,7 @@
 # Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
 # Use is subject to license terms.
 #
-# Copyright (c) 2012, Whamcloud, Inc.
+# Copyright (c) 2012, 2014, Intel Corporation.
 #
 
 #
@@ -36,33 +36,21 @@
 # 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
+DIST_SUBDIRS = linux util
 
-if LIBLUSTRE
 noinst_LIBRARIES= libcfs.a
-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_SOURCES = util/string.c util/nidstrings.c
 
 libcfs_a_CPPFLAGS = $(LLCPPFLAGS)
 libcfs_a_CFLAGS = $(LLCFLAGS)
-endif
 
+if UTILS
 lib_LIBRARIES = libcfsutil.a
-libcfsutil_a_SOURCES = nidstrings.c libcfs_string.c util/parser.c      \
-               util/l_ioctl.c util/util.c
+libcfsutil_a_SOURCES = util/parser.c util/l_ioctl.c util/util.c
 libcfsutil_a_CPPFLAGS = $(LLCPPFLAGS)
 libcfsutil_a_CFLAGS = $(LLCFLAGS) -DLUSTRE_UTILS=1
+endif
 
 if MODULES
 
@@ -70,33 +58,9 @@ 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 posix/rbtree.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)
+endif # MODULES
 
-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 \
-             libcfs_mem.c libcfs_lock.c linux/linux-tracefile.h
+MOSTLYCLEANFILES := @MOSTLYCLEANFILES@ linux-*.c linux/*.o libcfs
+EXTRA_DIST := $(libcfs-all-objs:%.o=%.c) tracefile.h prng.c \
+             workitem.c kernel_user_comm.c fail.c libcfs_cpu.c \
+             heap.c libcfs_mem.c libcfs_lock.c