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

diff --git a/lustre/liblustre/Makefile.am b/lustre/liblustre/Makefile.am
index ef4fa2f..6473813 100644
--- a/lustre/liblustre/Makefile.am
+++ b/lustre/liblustre/Makefile.am
@@ -1,63 +1,70 @@
 ## Liblustre excecutables & libraries Makefile
-DEFS=
-
-CFLAGS := -g -Wall -I$(top_srcdir)/utils -I$(top_srcdir)/portals/include \
-          -I$(top_srcdir)/portals/unals -I$(SYSIO)/include \
-          -I/opt/lam/include -L/opt/lam/lib
-
-KFLAGS:=
-CPPFLAGS = $(HAVE_EFENCE) -D_LARGEFILE64_SOURCE=1
-LIBS = $(LIBEFENCE)
-
-## lustre components libs
-LLIBS := ./libllite.a \
-         ../lov/liblov.a \
-         ../obdecho/libobdecho.a \
-         ../osc/libosc.a \
-         ../mdc/libmdc.a \
-         ../ldlm/libldlm.a \
-         ../ptlrpc/libptlrpc.a \
-         ../obdclass/liblustreclass.a \
-	 ../lvfs/liblvfs.a
-
-## portals components libs
-PTLLIBS := ../portals/utils/libptlctl.a \
-	   ../portals/unals/libtcpnal.a \
-           ../portals/portals/libportals.a
-
-## sysio components libs
-SYSIOLIBS := $(SYSIO)/drivers/native/libsysio_native.a \
-             $(SYSIO)/drivers/sockets/libsysio_sockets.a \
-             $(SYSIO)/src/libsysio.a \
-             $(SYSIO)/dev/stdfd/libsysio_stdfd.a
-
-LLIB_EXEC= $(PTLLIBS) $(SYSIOLIBS) -lpthread
-
-lib_LIBRARIES = 
-noinst_LIBRARIES = libllite.a libtestcommon.a
-libllite_a_SOURCES = llite_lib.c super.c namei.c rw.c file.c
-libtestcommon_a_SOURCES = test_common.c
-
-bin_PROGRAMS = libtest lltest recovery_small replay_single #test_lock_cancel
-
-libtest_SOURCES = libtest.c  ../utils/parser.c ../utils/obd.c ../utils/lustre_cfg.c
-libtest_LDADD := $(LLIBS) $(PTLLIBS) \
-                 $(LIBREADLINE) -lpthread 
-
-liblustre.a : libllite.a
-	$(shell ./genlib.sh $(SYSIO) $(AR) $(LINK))
-
-lltest_SOURCES = lltest.c
-lltest_LDADD := ./libtestcommon.a $(LLIBS) $(LLIB_EXEC) $(LIBREADLINE)
-
-recovery_small_SOURCES = recovery_small.c
-recovery_small_LDADD := ./libtestcommon.a $(LLIBS) $(LLIB_EXEC) $(LIBREADLINE)
-
-replay_single_SOURCES = replay_single.c
-replay_single_LDADD := ./libtestcommon.a $(LLIBS) $(LLIB_EXEC) $(LIBREADLINE)
-
-#test_lock_cancel_SOURCES = test_lock_cancel.c
-#test_lock_cancel_LDADD :=  $(LLIBS) $(LLIB_EXEC) -lmpi -llam
-
-include $(top_srcdir)/Rules
-
+SUBDIRS = . tests
+
+AM_CPPFLAGS = $(HAVE_EFENCE) -I$(SYSIO)/include \
+              $(LLCPPFLAGS) -I$(top_srcdir)/lnet/ulnds
+AM_CFLAGS = $(LLCFLAGS)
+
+AM_LIBS = $(LIBEFENCE)
+
+
+
+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
+
+LND_LIBS =
+if BUILD_USOCKLND
+LND_LIBS +=    $(top_builddir)/lnet/ulnds/socklnd/libsocklnd.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 " $(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)"
+
+EXTRA_DIST = genlib.sh
+
+CLEANFILES = liblsupport.a liblustre.so