X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=lustre%2Fliblustre%2FMakefile.am;h=64738132d44d1ec14b88b5541b00058796eda38f;hp=116d0c957c8b015f001175f7ed6a895a0254c2b9;hb=9d72ec94b56590ad5da7003e93dd268d81fc8d14;hpb=fbf5870b9848929d352460f1f005b79c0b5ccc5a

diff --git a/lustre/liblustre/Makefile.am b/lustre/liblustre/Makefile.am
index 116d0c9..6473813 100644
--- a/lustre/liblustre/Makefile.am
+++ b/lustre/liblustre/Makefile.am
@@ -1,7 +1,7 @@
 ## Liblustre excecutables & libraries Makefile
 SUBDIRS = . tests
 
-AM_CPPFLAGS = $(HAVE_EFENCE) -I$(SYSIO)/include -D_LARGEFILE64_SOURCE=1 \
+AM_CPPFLAGS = $(HAVE_EFENCE) -I$(SYSIO)/include \
               $(LLCPPFLAGS) -I$(top_srcdir)/lnet/ulnds
 AM_CFLAGS = $(LLCFLAGS)
 
@@ -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 QUOTA
-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
 
@@ -50,25 +41,30 @@ install-exec-hook: liblustre.so
 	@list=$< ; for p in $$list; do \
 	  if test -f $$p; then \
 	    f="`echo $$p | sed -e 's|^.*/||'`"; \
-	    echo " $(libLIBRARIES_INSTALL) $$p $(DESTDIR)$(libdir)/$$f"; \
-	    $(libLIBRARIES_INSTALL) $$p $(DESTDIR)$(libdir)/$$f; \
+	    echo " $(INSTALL_DATA) $$p $(DESTDIR)$(libdir)/$$f"; \
+	    $(INSTALL_DATA) $$p $(DESTDIR)$(libdir)/$$f; \
 	  else :; fi; \
 	done
 else
 install-exec-hook:
 endif
 
-libllite_a_SOURCES = llite_lib.c llite_fid.c super.c namei.c rw.c file.c dir.c \
+libllite_a_SOURCES = llite_lib.c super.c namei.c rw.c file.c dir.c \
 		     lutil.c lutil.h llite_lib.h llite_cl.c \
-                     ../lclient/lcommon_cl.c ../lclient/glimpse.c
+                     ../lclient/lcommon_cl.c ../lclient/glimpse.c ../lclient/lcommon_misc.c
 
 # for make rpms -- need cleanup
-liblustre_a_SOURCES = llite_lib.c llite_fid.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)"
 
 EXTRA_DIST = genlib.sh
 
-CLEANFILES := liblsupport.a liblustre.so
+CLEANFILES = liblsupport.a liblustre.so