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

diff --git a/lustre/liblustre/Makefile.am b/lustre/liblustre/Makefile.am
index 665295e..66d7bf5 100644
--- a/lustre/liblustre/Makefile.am
+++ b/lustre/liblustre/Makefile.am
@@ -1,18 +1,44 @@
-# Administration utilities Makefile
+## Liblustre excecutables & libraries Makefile
 DEFS=
 
-CFLAGS:=-g -O2 -I$(top_srcdir)/utils -I$(PORTALS)/include  -I$(srcdir)/../include -Wall -L$(PORTALSLIB)
+SUBDIRS = . tests
 
-KFLAGS:=
-CPPFLAGS = $(HAVE_EFENCE)
+CFLAGS := -g -Wall -I$(top_srcdir)/utils -I$(top_srcdir)/portals/include \
+          -I$(top_srcdir)/portals/unals -I$(SYSIO)/include
+
+CPPFLAGS = $(HAVE_EFENCE) -D_LARGEFILE64_SOURCE=1
 LIBS = $(LIBEFENCE)
-LLIBS= ../lov/liblov.a ../obdecho/libobdecho.a ../osc/libosc.a ../ldlm/libldlm.a  ../ptlrpc/libptlrpc.a ../obdclass/liblustreclass.a
 
-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
+LUSTRE_LIBS = libllite.a \
+              $(top_srcdir)/lov/liblov.a \
+              $(top_srcdir)/obdecho/libobdecho.a \
+              $(top_srcdir)/osc/libosc.a \
+              $(top_srcdir)/mdc/libmdc.a \
+              $(top_srcdir)/ptlrpc/libptlrpc.a \
+              $(top_srcdir)/obdclass/liblustreclass.a \
+              $(top_srcdir)/lvfs/liblvfs.a
+
+PTL_LIBS = $(top_srcdir)/portals/utils/libuptlctl.a \
+           $(top_srcdir)/portals/unals/libtcpnal.a \
+           $(top_srcdir)/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
+
+lib_LIBRARIES = liblustre.a
+noinst_LIBRARIES = libllite.a
+
+libllite_a_SOURCES = llite_lib.c super.c namei.c rw.c file.c dir.c
+libllite_a_CFLAGS = -fPIC
+
+# for make rpms -- need cleanup
+liblustre_a_SOURCES = llite_lib.c super.c namei.c rw.c file.c dir.c
+liblustre_a_CFLAGS = -fPIC
+
+liblustre.a : $(LUSTRE_LIBS) $(PTL_LIBS) $(SYSIO_LIBS)
+	$(shell ./genlib.sh $(SYSIO) $(AR) $(LINK))
 
 include $(top_srcdir)/Rules
+