#
#
-# 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.
#
# Lustre is a trademark of Sun Microsystems, Inc.
#
-SUBDIRS := linux util posix ulinux
+SUBDIRS := linux util posix
if DARWIN
SUBDIRS += darwin
endif
-DIST_SUBDIRS := $(SUBDIRS)
+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 ulinux/ulinux-kernelcomm.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
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_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
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 \
- ulinux/ulinux-kernelcomm.c
+ kernel_user_comm.c hash.c
libcfs_CFLAGS := $(EXTRA_KCFLAGS)
libcfs_LDFLAGS := $(EXTRA_KLDFLAGS)
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 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