X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=libcfs%2Flibcfs%2FautoMakefile.am;h=8f256140157df297c04d7a9a64377d5da4919ab0;hb=4f6be250fdfa6530886597d13d3d1377c90e20a7;hp=604ed126128f60eb0a51c1a9fec7a92ea5ed4088;hpb=adf2e9d9ab987b46fa0269038f348cf2a17fd0e0;p=fs%2Flustre-release.git

diff --git a/libcfs/libcfs/autoMakefile.am b/libcfs/libcfs/autoMakefile.am
index 604ed12..8f25614 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
 #
@@ -28,7 +24,7 @@
 # Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
 # Use is subject to license terms.
 #
-# Copyright (c) 2012, Intel Corporation.
+# Copyright (c) 2012, 2014, Intel Corporation.
 #
 
 #
@@ -36,43 +32,30 @@
 # Lustre is a trademark of Sun Microsystems, Inc.
 #
 
-SUBDIRS = linux util posix
-DIST_SUBDIRS = linux util posix
-
-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 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)
+SUBDIRS = linux util
+DIST_SUBDIRS = linux util
 
+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 = 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
+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
 
 if LINUX
 modulenet_DATA := libcfs$(KMODEXT)
-endif
+endif # LINUX
 
 endif # MODULES
 
 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
+	      workitem.c fail.c libcfs_cpu.c \
+	      heap.c libcfs_mem.c libcfs_lock.c