X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=libcfs%2Flibcfs%2FautoMakefile.am;h=92c7564bb1a4d9bf4e89671c71ff9b227119baf4;hp=92d1618a0ffb7bb30a11ebe394c4b71b594dd65b;hb=09a53f30e40e4897318698742f87cfe4f03d2e20;hpb=7fb1d1d55d0f9a247e9d18ab99032a35306e7be9

diff --git a/libcfs/libcfs/autoMakefile.am b/libcfs/libcfs/autoMakefile.am
index 92d1618..92c7564 100644
--- a/libcfs/libcfs/autoMakefile.am
+++ b/libcfs/libcfs/autoMakefile.am
@@ -15,76 +15,48 @@
 #
 # 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
 #
 
 #
-# 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.
 #
+# Copyright (c) 2012, 2014, Intel Corporation.
+#
 
 #
 # 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)
+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 user-bitops.c user-mem.c
-libcfs_a_CPPFLAGS = $(LLCPPFLAGS)
-libcfs_a_CFLAGS = $(LLCFLAGS)
+noinst_LTLIBRARIES = libcfs.la
+libcfs_la_SOURCES  := util/string.c util/nidstrings.c util/param.c
+if UTILS
+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
-
-lib_LIBRARIES = libcfsutil.a
-libcfsutil_a_SOURCES = nidstrings.c util/parser.c util/parser.h util/platform.h util/l_ioctl.c
-libcfsutil_a_CPPFLAGS = $(LLCPPFLAGS) 
-libcfsutil_a_CFLAGS = $(LLCFLAGS) -DLUSTRE_UTILS=1
+libcfs_la_CFLAGS := -fPIC
 
 if MODULES
 
 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
-
-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 # LINUX
 
-EXTRA_DIST := Info.plist
+endif # MODULES
 
-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
+MOSTLYCLEANFILES := @MOSTLYCLEANFILES@ linux/*.o libcfs
+EXTRA_DIST := $(libcfs-all-objs:%.o=%.c) tracefile.h \
+	      workitem.c fail.c libcfs_cpu.c \
+	      heap.c libcfs_mem.c libcfs_lock.c \
+	      linux-crypto.h