X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Fliblustre%2FMakefile.am;h=e0d75b161278277653b06fd60e27e1050997c41c;hb=ffc62b1d8a51f53d51fc4e77375e0400accfdde5;hp=edf3126a8945901eedfa2e1bbbd693000d11f24f;hpb=6697349ea92c2c61a40b8f23655f66de60ca1501;p=fs%2Flustre-release.git

diff --git a/lustre/liblustre/Makefile.am b/lustre/liblustre/Makefile.am
index edf3126..e0d75b1 100644
--- a/lustre/liblustre/Makefile.am
+++ b/lustre/liblustre/Makefile.am
@@ -19,24 +19,15 @@ LUSTRE_LIBS = libllite.a \
               $(top_builddir)/lustre/mdc/libmdc.a \
               $(top_builddir)/lustre/mgc/libmgc.a \
               $(top_builddir)/lustre/ptlrpc/libptlrpc.a \
-              $(top_builddir)/lustre/obdclass/liblustreclass.a \
-              $(top_builddir)/lustre/lvfs/liblvfs.a
-
-if LIBLUSTRE
-QUOTA_LIBS = $(top_builddir)/lustre/quota/libquota.a
-endif
+	      $(top_builddir)/lustre/obdclass/liblustreclass.a
 
 LND_LIBS =
 if BUILD_USOCKLND
 LND_LIBS +=    $(top_builddir)/lnet/ulnds/socklnd/libsocklnd.a
 endif
-if BUILD_UPTLLND
-LND_LIBS +=   $(top_builddir)/lnet/ulnds/ptllnd/libptllnd.a
-endif
 
 LNET_LIBS =   $(top_builddir)/lnet/utils/libuptlctl.a \
-              $(top_builddir)/lnet/lnet/liblnet.a \
-              $(top_builddir)/libcfs/libcfs/libcfsutil.a
+              $(top_builddir)/lnet/lnet/liblnet.a
 
 SYSIO_LIBS =  $(SYSIO)/lib/libsysio.a
 
@@ -66,8 +57,13 @@ libllite_a_SOURCES = llite_lib.c super.c namei.c rw.c file.c dir.c \
 liblustre_a_SOURCES = llite_lib.c super.c namei.c rw.c file.c dir.c \
 		     llite_lib.h llite_cl.c
 
-liblustre.a : $(LUSTRE_LIBS) $(LND_LIBS) $(LNET_LIBS) $(SYSIO_LIBS) $(QUOTA_LIBS)
-	sh $(srcdir)/genlib.sh "$(SYSIO)" "$(LIBS)" "$(LND_LIBS)" "$(PTHREAD_LIBS)" "$(QUOTA_LIBS)" "$(CAP_LIBS)" "$(ZLIB)"
+export CC
+export LDFLAGS
+export AR
+export RANLIB
+
+liblustre.a : $(LUSTRE_LIBS) $(LND_LIBS) $(LNET_LIBS) $(SYSIO_LIBS)
+	sh $(srcdir)/genlib.sh "$(SYSIO)" "$(LIBS)" "$(LND_LIBS)" "$(PTHREAD_LIBS)" "$(CAP_LIBS)" "$(ZLIB)"
 
 EXTRA_DIST = genlib.sh