X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Fliblustre%2FMakefile.am;h=de73497d69c71ffa06e55328b8dca2e87f3ae5f7;hb=858ed9eef08c099b21220bbfc42a87ab38dabceb;hp=665295e8c87d8f377599612a6e07e914d983e59d;hpb=a4346f1ee87f221d8541ad31b2efb3bba41a4df4;p=fs%2Flustre-release.git

diff --git a/lustre/liblustre/Makefile.am b/lustre/liblustre/Makefile.am
index 665295e..de73497 100644
--- a/lustre/liblustre/Makefile.am
+++ b/lustre/liblustre/Makefile.am
@@ -1,18 +1,72 @@
-# Administration utilities Makefile
-DEFS=
+## Liblustre excecutables & libraries Makefile
+SUBDIRS = . tests
 
-CFLAGS:=-g -O2 -I$(top_srcdir)/utils -I$(PORTALS)/include  -I$(srcdir)/../include -Wall -L$(PORTALSLIB)
+AM_CPPFLAGS = $(HAVE_EFENCE) -I$(SYSIO)/include -D_LARGEFILE64_SOURCE=1 \
+              $(LLCPPFLAGS) -I$(top_srcdir)/lnet/ulnds
+AM_CFLAGS = $(LLCFLAGS)
 
-KFLAGS:=
-CPPFLAGS = $(HAVE_EFENCE)
-LIBS = $(LIBEFENCE)
-LLIBS= ../lov/liblov.a ../obdecho/libobdecho.a ../osc/libosc.a ../ldlm/libldlm.a  ../ptlrpc/libptlrpc.a ../obdclass/liblustreclass.a
+AM_LIBS = $(LIBEFENCE)
 
-libtest_LDADD := $(LIBREADLINE)  $(LLIBS) \
-                 $(PORTALS)/user/procbridge/libprocbridge.a  $(PORTALS)/user/tcpnal/libtcpnal.a \
-	         $(PORTALS)/user/util/libtcpnalutil.a $(PORTALS)/api/libptlapi.a \
-                 $(PORTALS)/lib/libptllib.a -lptlctl -lpthread 
-bin_PROGRAMS = libtest
-libtest_SOURCES = libtest.c
 
-include $(top_srcdir)/Rules
+
+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/fid/libfid.a \
+              $(top_builddir)/lustre/fld/libfld.a \
+              $(top_builddir)/lustre/lmv/liblmv.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
+
+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
+
+SYSIO_LIBS =  $(SYSIO)/lib/libsysio.a
+
+if LIBLUSTRE
+lib_LIBRARIES = liblustre.a
+noinst_LIBRARIES = libllite.a
+
+install-exec-hook: liblustre.so
+	@$(NORMAL_INSTALL)
+	$(mkinstalldirs) $(DESTDIR)$(libdir)
+	@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; \
+	  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 \
+		     lutil.c lutil.h llite_lib.h
+
+# for make rpms -- need cleanup
+liblustre_a_SOURCES = llite_lib.c llite_fid.c super.c namei.c rw.c file.c dir.c \
+		     llite_lib.h
+
+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)"
+
+EXTRA_DIST = genlib.sh
+
+CLEANFILES := liblsupport.a liblustre.so