X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=lnet%2Flibcfs%2FautoMakefile.am;h=e70e5cefea0c8ba00133ab95ec8dbf889c5c7baa;hp=824ab1a32f3272ae0c5ffb3c21082de61038bf93;hb=51eda54f7c9a5bcacf945851c1cc36601eee041a;hpb=00f255b8c00dff66481a6ab22391869217b5d8af

diff --git a/lnet/libcfs/autoMakefile.am b/lnet/libcfs/autoMakefile.am
index 824ab1a..e70e5ce 100644
--- a/lnet/libcfs/autoMakefile.am
+++ b/lnet/libcfs/autoMakefile.am
@@ -3,7 +3,18 @@
 # This code is issued under the GNU General Public License.
 # See the file COPYING in this distribution
 
-SUBDIRS := darwin linux
+SUBDIRS := linux
+if DARWIN
+SUBDIRS += darwin
+endif
+DIST_SUBDIRS := $(SUBDIRS)
+
+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_CPPFLAGS = $(LLCPPFLAGS)
+libcfs_a_CFLAGS = $(LLCFLAGS)
+endif
 
 if MODULES
 
@@ -14,11 +25,12 @@ endif
 if DARWIN
 macos_PROGRAMS := libcfs
 
-libcfs_SOURCES := debug.c module.c tracefile.c darwin/darwin-debug.c	\
-	darwin/darwin-fs.c darwin/darwin-mem.c darwin/darwin-module.c	\
-	darwin/darwin-prim.c darwin/darwin-proc.c			\
-	darwin/darwin-tracefile.c darwin/darwin-utils.c			\
-	darwin/darwin-sync.c darwin/darwin-curproc.c user-prim.c user-lock.c
+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 		\
+	debug.c module.c tracefile.c nidstrings.c watchdog.c
 
 libcfs_CFLAGS := $(EXTRA_KCFLAGS)
 libcfs_LDFLAGS := $(EXTRA_KLDFLAGS)
@@ -26,13 +38,16 @@ libcfs_LDADD := $(EXTRA_KLIBS)
 
 plist_DATA := Info.plist
 
-install-data-hook: fix-kext-ownership
+install_data_hook := fix-kext-ownership
 
 endif
 
 endif
 
+install-data-hook: $(install_data_hook)
+
 EXTRA_DIST := Info.plist
 
-MOSTLYCLEANFILES = *.o *.ko *.mod.c linux-*.c linux/*.o darwin/*.o libcfs
-DIST_SOURCES = $(libcfs-all-objs:%.o=%.c) tracefile.h
+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