- merge 0.7rc1 from b_devel to HEAD (20030612 merge point)

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

diff --git a/lustre/liblustre/Makefile.am b/lustre/liblustre/Makefile.am
index 665295e..6648aa8 100644 (file)
--- a/lustre/liblustre/Makefile.am
+++ b/lustre/liblustre/Makefile.am
@@ -1,18 +1,30 @@
 # Administration utilities Makefile
 DEFS=
 
-CFLAGS:=-g -O2 -I$(top_srcdir)/utils -I$(PORTALS)/include  -I$(srcdir)/../include -Wall -L$(PORTALSLIB)
+CFLAGS:=-g -I$(top_srcdir)/utils -I$(top_srcdir)/portals/include  -I$(srcdir)/../include -I$(top_srcdir)/../libsysio/include -Wall -L../portals/utils
 
 KFLAGS:=
-CPPFLAGS = $(HAVE_EFENCE)
+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
+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
+
+bin_PROGRAMS = libtest lltest
 
 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
+                 ../portals/unals/libtpcnal.a \
+                 ../portals/portals/libportals.a\
+                 -lptlctl -lpthread 
 libtest_SOURCES = libtest.c
 
+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
+
 include $(top_srcdir)/Rules
+