LU-455 Replace DIST_SOURCES with EXTRA_DIST

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

diff --git a/libcfs/libcfs/autoMakefile.am b/libcfs/libcfs/autoMakefile.am
index e70e5ce..fc5f4f1 100644 (file)
--- a/libcfs/libcfs/autoMakefile.am
+++ b/libcfs/libcfs/autoMakefile.am
@@ -1,21 +1,60 @@
-# Copyright (C) 2001, 2002 Cluster File Systems, Inc.
 #
-# This code is issued under the GNU General Public License.
-# See the file COPYING in this distribution
+# GPL HEADER START
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License version 2 only,
+# as published by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# General Public License version 2 for more details (a copy is included
+# in the LICENSE file that accompanied this code).
+#
+# You should have received a copy of the GNU General Public License
+# version 2 along with this program; If not, see
+# http://www.sun.com/software/products/lustre/docs/GPLv2.pdf
+#
+# Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+# CA 95054 USA or visit www.sun.com if you need additional information or
+# have any questions.
+#
+# GPL HEADER END
+#
 
-SUBDIRS := linux
+#
+# Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
+# Use is subject to license terms.
+#
+
+#
+# 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 := $(SUBDIRS)
+DIST_SUBDIRS := linux util posix darwin
 
 if LIBLUSTRE
 noinst_LIBRARIES= libcfs.a
-libcfs_a_SOURCES= debug.c user-prim.c user-lock.c user-tcpip.c user-bitops.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_a_CPPFLAGS = $(LLCPPFLAGS)
 libcfs_a_CFLAGS = $(LLCFLAGS)
 endif
 
+lib_LIBRARIES = libcfsutil.a
+libcfsutil_a_SOURCES = nidstrings.c util/parser.c \
+                       util/l_ioctl.c util/util.c
+libcfsutil_a_CPPFLAGS = $(LLCPPFLAGS) 
+libcfsutil_a_CFLAGS = $(LLCFLAGS) -DLUSTRE_UTILS=1
+
 if MODULES
 
 if LINUX
@@ -30,7 +69,8 @@ nodist_libcfs_SOURCES := darwin/darwin-sync.c darwin/darwin-mem.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                \
-       debug.c module.c tracefile.c nidstrings.c watchdog.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)
@@ -46,8 +86,7 @@ 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
+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 linux/linux-tracefile.h