X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Fliblustre%2FMakefile.am;h=44fd10db2029976ec24db9eda8b0d079946cff53;hb=652ff7574b5e8b3e7e2655e17c63406986b022a1;hp=949c0297e7b778a67f70c98db47b18b2bf25d9ef;hpb=191061ee668400324f4505cf498f1ee2d57e4962;p=fs%2Flustre-release.git

diff --git a/lustre/liblustre/Makefile.am b/lustre/liblustre/Makefile.am
index 949c029..44fd10d 100644
--- a/lustre/liblustre/Makefile.am
+++ b/lustre/liblustre/Makefile.am
@@ -1,20 +1,23 @@
 ## Liblustre excecutables & libraries Makefile
-SUBDIRS = . tests
+
+# FIXME: we disable building any executables for this moment.
+#SUBDIRS = . tests
 
 AM_CPPFLAGS = $(HAVE_EFENCE) -I$(SYSIO)/include -D_LARGEFILE64_SOURCE=1 \
               $(LLCPPFLAGS) -I$(top_srcdir)/portals/unals
 AM_CFLAGS = $(LLCFLAGS)
 
-LIBS = $(LIBEFENCE)
+AM_LIBS = $(LIBEFENCE)
 
-LUSTRE_LIBS = liblutils.a libllite.a \
-              $(top_builddir)/lov/liblov.a \
-              $(top_builddir)/obdecho/libobdecho.a \
-              $(top_builddir)/osc/libosc.a \
-              $(top_builddir)/mdc/libmdc.a \
-              $(top_builddir)/ptlrpc/libptlrpc.a \
-              $(top_builddir)/obdclass/liblustreclass.a \
-              $(top_builddir)/lvfs/liblvfs.a
+LUSTRE_LIBS = libllite.a \
+              $(top_builddir)/lustre/lov/liblov.a \
+              $(top_builddir)/lustre/obdecho/libobdecho.a \
+              $(top_builddir)/lustre/osc/libosc.a \
+              $(top_builddir)/lustre/mdc/libmdc.a \
+              $(top_builddir)/lustre/ptlrpc/libptlrpc.a \
+              $(top_builddir)/lustre/sec/libptlrpcs.a \
+              $(top_builddir)/lustre/obdclass/liblustreclass.a \
+              $(top_builddir)/lustre/lvfs/liblvfs.a
 
 if !CRAY_PORTALS
 PTL_LIBS =    $(top_builddir)/portals/utils/libuptlctl.a \
@@ -22,14 +25,14 @@ PTL_LIBS =    $(top_builddir)/portals/utils/libuptlctl.a \
               $(top_builddir)/portals/portals/libportals.a
 else
 PTL_LIBS =    $(top_builddir)/portals/utils/libuptlctl.a \
-              $(CRAY_PORTALS_PATH)/lib_TV/snos64/libportals.a
+              $(CRAY_PORTALS_LIBS)/libportals.a
 endif
 
 SYSIO_LIBS =  $(SYSIO)/lib/libsysio.a
 
 if LIBLUSTRE
 lib_LIBRARIES = liblustre.a
-noinst_LIBRARIES = liblutils.a libllite.a
+noinst_LIBRARIES = libllite.a
 
 install-exec-hook: liblustre.so
 	@$(NORMAL_INSTALL)
@@ -45,16 +48,14 @@ else
 install-exec-hook:
 endif
 
-liblutils_a_SOURCES = lutil.c lutil.h
-
 libllite_a_SOURCES = llite_lib.c super.c namei.c rw.c file.c dir.c \
-		     llite_lib.h
+		     lutil.c lutil.h llite_lib.h
 
 # for make rpms -- need cleanup
 liblustre_a_SOURCES = llite_lib.c super.c namei.c rw.c file.c dir.c
 
 liblustre.a : $(LUSTRE_LIBS) $(PTL_LIBS) $(SYSIO_LIBS)
-	sh $(srcdir)/genlib.sh $(SYSIO) $(CRAY_PORTALS_PATH)
+	sh $(srcdir)/genlib.sh "$(SYSIO)" "$(CRAY_PORTALS_LIBS)" "$(LIBS)"
 
 EXTRA_DIST = genlib.sh