X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=libcfs%2Flibcfs%2FautoMakefile.am;h=b09c7a163701721941894cdc7a544d284c1d3ecb;hb=406b1720df422cf0a020b7a0e529683e9f262672;hp=1f2b97f7da55c49fb3e118057b0162055a242a84;hpb=a7f5b2e19d5645c3a54e957bdc20fa10cacf0724;p=fs%2Flustre-release.git

diff --git a/libcfs/libcfs/autoMakefile.am b/libcfs/libcfs/autoMakefile.am
index 1f2b97f..b09c7a1 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,67 +24,38 @@
 # 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 := linux util posix darwin
+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 \
-                  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)
+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 util/util.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 \
-	kernel_user_comm.c hash.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 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
+MOSTLYCLEANFILES := @MOSTLYCLEANFILES@ linux-*.c 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