Land b_smallfix onto HEAD (20040416_1638) (more 2.6 build fixes)

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

diff --git a/lustre/liblustre/Makefile.am b/lustre/liblustre/Makefile.am
index c761a22..b831bd8 100644 (file)
--- a/lustre/liblustre/Makefile.am
+++ b/lustre/liblustre/Makefile.am
@@ -1,18 +1,40 @@
-# 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)/portals/unals
+AM_CFLAGS = $(LLCFLAGS)
 
-KFLAGS:=
-CPPFLAGS = $(HAVE_LIBREADLINE)
-LIBS=
-LLIBS= ../lov/liblov.a ../obdecho/libobdecho.a ../osc/libosc.a ../ldlm/libldlm.a  ../ptlrpc/libptlrpc.a ../obdclass/liblustreclass.a
+LIBS = $(LIBEFENCE)
 
-libtest_LDADD := $(LIBREADLINE)  $(LLIBS) \
-                 $(PORTALS)/user/procbridge/libprocbridge.a  $(PORTALS)/user/tcpnal/libtcpnal.a \
-                $(PORTALS)/user/util/libtcpnalutil.a $(PORTALS)/user/$(PORTALS)/api/libptlapi.a \
-                 $(PORTALS)/lib/libptllib.a -lptlctl -lpthread -lefence
-bin_PROGRAMS = libtest
-libtest_SOURCES = libtest.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
 
-include $(top_srcdir)/Rules
+PTL_LIBS =    $(top_builddir)/portals/utils/libuptlctl.a \
+              $(top_builddir)/portals/unals/libtcpnal.a \
+              $(top_builddir)/portals/portals/libportals.a
+
+SYSIO_LIBS =  $(SYSIO)/drivers/native/libsysio_native.a \
+              $(SYSIO)/drivers/sockets/libsysio_sockets.a \
+              $(SYSIO)/src/libsysio.a \
+              $(SYSIO)/dev/stdfd/libsysio_stdfd.a
+
+if LIBLUSTRE
+lib_LIBRARIES = liblustre.a
+noinst_LIBRARIES = libllite.a
+endif
+
+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