[Ocfs2-tools-devel] [PATCH 9/9] Ocfs2-test: Modify Makefile for inline-data test.

Tristan Ye tristan.ye at oracle.com
Thu Sep 4 03:01:35 PDT 2008


Should adjust the Makefile for the newly added and MPI files.

Signed-off-by: Tristan Ye <tristan.ye at oracle.com>
---
 programs/inline-data/Makefile |   28 +++++++++++++++++++++-------
 1 files changed, 21 insertions(+), 7 deletions(-)

diff --git a/programs/inline-data/Makefile b/programs/inline-data/Makefile
index b2a385f..46d3ba3 100644
--- a/programs/inline-data/Makefile
+++ b/programs/inline-data/Makefile
@@ -2,21 +2,35 @@ TOPDIR = ../..
 
 include $(TOPDIR)/Preamble.make
 
-TESTS = inline-data inline-dirs
+TESTS = inline-data inline-dirs multi-inline-data multi-inline-dirs
 
 CFLAGS = -O2 -Wall -g
 
-SOURCES = inline-data.c inline-dirs.c
+MPI_LINK = $(MPICC) $(CFLAGS) $(LDFLAGS) -o $@ $^
+
+SOURCES = inline-data.c inline-dirs.c inline-data-utils.c inline-dirs-utils.c multi-inline-data.c multi-inline-dirs.c
 OBJECTS = $(patsubst %.c,%.o,$(SOURCES))
 
 DIST_FILES = $(SOURCES)
 
-BIN_PROGRAMS = inline-data inline-dirs
+BIN_PROGRAMS = inline-data inline-dirs multi-inline-data multi-inline-dirs
+
+inline-data: inline-data.o inline-data-utils.o
+	$(LINK) -locfs2
+
+inline-dirs: inline-dirs.o inline-dirs-utils.o
+	$(LINK) -locfs2
+
+multi-inline-data.o: multi-inline-data.c
+	$(MPICC) -c multi-inline-data.c
+
+multi-inline-dirs.o: multi-inline-dirs.c
+	$(MPICC) -c multi-inline-dirs.c
 
-inline-data: inline-data.o
-	$(LINK)
+multi-inline-data: multi-inline-data.o inline-data-utils.o
+	$(MPI_LINK) -locfs2
 
-inline-dirs: inline-dirs.o
-	$(LINK)
+multi-inline-dirs: multi-inline-dirs.o
+	$(MPI_LINK) -locfs2
 
 include $(TOPDIR)/Postamble.make
-- 
1.5.5




More information about the Ocfs2-tools-devel mailing list