- minor build fixes for liblustre

diff --git a/lustre/include/liblustre.h b/lustre/include/liblustre.h
index 145d199..deb35dc 100644 (file)
--- a/lustre/include/liblustre.h
+++ b/lustre/include/liblustre.h
@@ -133,8 +133,8 @@ static inline int misc_register(void *foo)
 }
 #define misc_deregister misc_register
 
-#define __MOD_INC_USE_COUNT(m)  (m->count++)
-#define __MOD_DEC_USE_COUNT(m)  (m->count--)
+#define __MOD_INC_USE_COUNT(m)  do {int a = 1; a++; } while (0)
+#define __MOD_DEC_USE_COUNT(m)  do {int a = 1; a++; } while (0)
 #define MOD_INC_USE_COUNT  do {int a = 1; a++; } while (0)
 #define MOD_DEC_USE_COUNT  do {int a = 1; a++; } while (0)
 

diff --git a/lustre/liblustre/Makefile.am b/lustre/liblustre/Makefile.am
index 584dea7..c761a22 100644 (file)
--- a/lustre/liblustre/Makefile.am
+++ b/lustre/liblustre/Makefile.am
@@ -5,10 +5,10 @@ CFLAGS:=-g -O2 -I$(top_srcdir)/utils -I$(PORTALS)/include  -I$(srcdir)/../includ
 
 KFLAGS:=
 CPPFLAGS = $(HAVE_LIBREADLINE)
-LIBS= 
+LIBS=
+LLIBS= ../lov/liblov.a ../obdecho/libobdecho.a ../osc/libosc.a ../ldlm/libldlm.a  ../ptlrpc/libptlrpc.a ../obdclass/liblustreclass.a
 
-libtest_LDADD := $(LIBREADLINE) ../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)/user/$(PORTALS)/api/libptlapi.a \
                  $(PORTALS)/lib/libptllib.a -lptlctl -lpthread -lefence