X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=libcfs%2Flibcfs%2FautoMakefile.am;h=75ee515e41aeac7b929167dd1651ebd72f92ab43;hb=6621439c371e37268195d05fb3d6747c98c07bc5;hp=19adcecd9b91bd7e08fff126a1562bd22b452c62;hpb=4aed5234f1123efc06c5c7e702085a461a8aae12;p=fs%2Flustre-release.git

diff --git a/libcfs/libcfs/autoMakefile.am b/libcfs/libcfs/autoMakefile.am
index 19adcec..75ee515 100644
--- a/libcfs/libcfs/autoMakefile.am
+++ b/libcfs/libcfs/autoMakefile.am
@@ -15,11 +15,7 @@
 #
 # 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.
+# http://www.gnu.org/licenses/gpl-2.0.html
 #
 # GPL HEADER END
 #
@@ -33,26 +29,24 @@
 
 #
 # This file is part of Lustre, http://www.lustre.org/
-# Lustre is a trademark of Sun Microsystems, Inc.
 #
 
 SUBDIRS = linux util
 DIST_SUBDIRS = linux util
+SUBDIRS += crypto
+DIST_SUBDIRS += crypto
 
-noinst_LIBRARIES  = libcfs.a
-libcfs_a_SOURCES  := util/string.c util/nidstrings.c util/param.c
-libcfs_a_CPPFLAGS := -D_GNU_SOURCE
-libcfs_a_CPPFLAGS += -D_LARGEFILE64_SOURCE=1 -D_FILE_OFFSET_BITS=64
-libcfs_a_CFLAGS   := -fPIC
-
+noinst_LTLIBRARIES = libcfs.la
+libcfs_la_SOURCES  := util/string.c util/nidstrings.c util/param.c
 if UTILS
-lib_LIBRARIES = libcfsutil.a
-libcfsutil_a_SOURCES  := util/parser.c util/l_ioctl.c
-libcfsutil_a_CPPFLAGS := -D_GNU_SOURCE
-libcfsutil_a_CPPFLAGS += -D_LARGEFILE64_SOURCE=1 -D_FILE_OFFSET_BITS=64
-libcfsutil_a_CPPFLAGS += -DLUSTRE_UTILS=1
-libcfsutil_a_CFLAGS   := -fPIC
+libcfs_la_SOURCES  += util/parser.c util/l_ioctl.c
 endif # UTILS
+libcfs_la_CPPFLAGS := -D_GNU_SOURCE
+libcfs_la_CPPFLAGS += -D_LARGEFILE64_SOURCE=1 -D_FILE_OFFSET_BITS=64
+if UTILS
+libcfs_la_CPPFLAGS += -DLUSTRE_UTILS=1
+endif
+libcfs_la_CFLAGS := -fPIC
 
 if MODULES
 
@@ -62,7 +56,8 @@ endif # LINUX
 
 endif # MODULES
 
-MOSTLYCLEANFILES := @MOSTLYCLEANFILES@ linux-*.c linux/*.o libcfs
-EXTRA_DIST := $(libcfs-all-objs:%.o=%.c) tracefile.h prng.c \
+MOSTLYCLEANFILES := @MOSTLYCLEANFILES@ linux/*.o libcfs crypto/*.o
+EXTRA_DIST := $(libcfs-all-objs:%.o=%.c) tracefile.h \
 	      workitem.c fail.c libcfs_cpu.c \
-	      heap.c libcfs_mem.c libcfs_lock.c
+	      libcfs_mem.c libcfs_lock.c \
+	      linux-crypto.h