X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Fliblustre%2FMakefile.am;h=e0d75b161278277653b06fd60e27e1050997c41c;hb=93fe562c5dd3829939e3bc0533918f66b19776a4;hp=6648aa8e8eb227e5f48c02398f9e26bdc24abb58;hpb=96ec6856f91f7f9031cfce4273c714d72cfe59ae;p=fs%2Flustre-release.git

diff --git a/lustre/liblustre/Makefile.am b/lustre/liblustre/Makefile.am
index 6648aa8..e0d75b1 100644
--- a/lustre/liblustre/Makefile.am
+++ b/lustre/liblustre/Makefile.am
@@ -1,30 +1,70 @@
-# Administration utilities Makefile
-DEFS=
+## Liblustre excecutables & libraries Makefile
+SUBDIRS = . tests
 
-CFLAGS:=-g -I$(top_srcdir)/utils -I$(top_srcdir)/portals/include  -I$(srcdir)/../include -I$(top_srcdir)/../libsysio/include -Wall -L../portals/utils
+AM_CPPFLAGS = $(HAVE_EFENCE) -I$(SYSIO)/include -D_LARGEFILE64_SOURCE=1 \
+              $(LLCPPFLAGS) -I$(top_srcdir)/lnet/ulnds
+AM_CFLAGS = $(LLCFLAGS)
 
-KFLAGS:=
-CPPFLAGS = $(HAVE_EFENCE) -D_LARGEFILE64_SOURCE=1
-LIBS = $(LIBEFENCE)
-LLIBS= ./libllite.a ../lov/liblov.a ../obdecho/libobdecho.a ../osc/libosc.a ../ldlm/libldlm.a  ../ptlrpc/libptlrpc.a ../obdclass/liblustreclass.a ../mdc/libmdc.a
+AM_LIBS = $(LIBEFENCE)
 
-lib_LIBRARIES = libllite.a
-libllite_a_SOURCES = llite_lib.c super.c file.c rw.c
 
-bin_PROGRAMS = libtest lltest
 
-libtest_LDADD := $(LIBREADLINE)  $(LLIBS) \
-                 ../portals/unals/libtpcnal.a \
-                 ../portals/portals/libportals.a\
-	          -lptlctl -lpthread 
-libtest_SOURCES = libtest.c
+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
 
-lltest_LDADD := $(LIBREADLINE)  $(LLIBS) \
-                ../../libsysio/src/libsysio.a ../../libsysio/dev/stdfd/libsysio_stdfd.a \
-                -lc \
-                ../portals/unals/libtcpnal.a ../portals/portals/libportals.a \
-		-lptlctl -lpthread
-lltest_SOURCES = lltest.c
+LND_LIBS =
+if BUILD_USOCKLND
+LND_LIBS +=    $(top_builddir)/lnet/ulnds/socklnd/libsocklnd.a
+endif
 
-include $(top_srcdir)/Rules
+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 " $(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 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_misc.c
+
+# for make rpms -- need cleanup
+liblustre_a_SOURCES = llite_lib.c super.c namei.c rw.c file.c dir.c \
+		     llite_lib.h llite_cl.c
+
+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
+
+CLEANFILES = liblsupport.a liblustre.so