* Landed b_cray_portals_merge (3148, 3158)

[fs/lustre-release.git] / lustre / liblustre / Makefile.am

diff --git a/lustre/liblustre/Makefile.am b/lustre/liblustre/Makefile.am
index 6648aa8..b831bd8 100644 (file)
--- a/lustre/liblustre/Makefile.am
+++ b/lustre/liblustre/Makefile.am
@@ -1,30 +1,40 @@
-# 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)/portals/unals
+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
 
-lib_LIBRARIES = libllite.a
-libllite_a_SOURCES = llite_lib.c super.c file.c rw.c
+LUSTRE_LIBS = libllite.a \
+              $(top_builddir)/lov/liblov.a \
+              $(top_builddir)/obdecho/libobdecho.a \
+              $(top_builddir)/osc/libosc.a \
+              $(top_builddir)/mdc/libmdc.a \
+              $(top_builddir)/ptlrpc/libptlrpc.a \
+              $(top_builddir)/obdclass/liblustreclass.a \
+              $(top_builddir)/lvfs/liblvfs.a
 
-bin_PROGRAMS = libtest lltest
+PTL_LIBS =    $(top_builddir)/portals/utils/libuptlctl.a \
+              $(top_builddir)/portals/unals/libtcpnal.a \
+              $(top_builddir)/portals/portals/libportals.a
 
-libtest_LDADD := $(LIBREADLINE)  $(LLIBS) \
-                 ../portals/unals/libtpcnal.a \
-                 ../portals/portals/libportals.a\
-                 -lptlctl -lpthread 
-libtest_SOURCES = libtest.c
+SYSIO_LIBS =  $(SYSIO)/drivers/native/libsysio_native.a \
+              $(SYSIO)/drivers/sockets/libsysio_sockets.a \
+              $(SYSIO)/src/libsysio.a \
+              $(SYSIO)/dev/stdfd/libsysio_stdfd.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
+if LIBLUSTRE
+lib_LIBRARIES = liblustre.a
+noinst_LIBRARIES = libllite.a
+endif
 
-include $(top_srcdir)/Rules
+libllite_a_SOURCES = llite_lib.c super.c namei.c rw.c file.c dir.c llite_lib.h
 
+# for make rpms -- need cleanup
+liblustre_a_SOURCES = llite_lib.c super.c namei.c rw.c file.c dir.c
+
+liblustre.a : $(LUSTRE_LIBS) $(PTL_LIBS) $(SYSIO_LIBS)
+       $(srcdir)/genlib.sh $(SYSIO) $(AR) $(LINK) || ( rm -f $@; exit 1 )
+
+EXTRA_DIST = genlib.sh