[Ocfs2-tools-devel] [PATCH 29/39] libo2cb: Build client_proto unconditionally

Joel Becker joel.becker at oracle.com
Fri Mar 14 16:52:52 PDT 2008


The client_proto code was only being built when HAVE_CMAN was true.  It
should always be built.

Signed-off-by: Joel Becker <joel.becker at oracle.com>
---
 libo2cb/Makefile |    8 +++-----
 1 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/libo2cb/Makefile b/libo2cb/Makefile
index 9aa27c2..76799b7 100644
--- a/libo2cb/Makefile
+++ b/libo2cb/Makefile
@@ -31,9 +31,8 @@ endif
 
 CFILES = 		\
 	o2cb_abi.c	\
-	o2cb_crc32.c
-
-PROTO_CFILES = client_proto.c
+	o2cb_crc32.c	\
+	client_proto.c
 
 HFILES =			\
 	o2cb_abi.h		\
@@ -46,7 +45,6 @@ OBJS = $(subst .c,.o,$(CFILES)) \
 
 ifneq ($(BUILD_CMAN_SUPPORT),)
 DEFINES += -DHAVE_CMAN
-OBJS += $(subst .c,.o,$(PROTO_CFILES))
 endif
 
 $(OBJS): $(HFILES_GEN)
@@ -59,7 +57,7 @@ libo2cb.a: $(OBJS)
 	$(AR) r $@ $^
 	$(RANLIB) $@
 
-DIST_FILES = $(CFILES) $(PROTO_CFILES) $(HFILES) o2cb_err.et
+DIST_FILES = $(CFILES) $(HFILES) o2cb_err.et
 
 CLEAN_RULES = clean-err
 
-- 
1.5.3.8




More information about the Ocfs2-tools-devel mailing list