From: Goldwyn Rodrigues <rgold...@suse.com> Signed-off-by: Goldwyn Rodrigues <rgold...@suse.com> Reviewed-by: Eric Ren <z...@suse.com> --- programs/inline-data/Makefile | 9 +++++---- programs/truncate/ocfs2-tools/Makefile | 3 ++- programs/tunefs-test/remove-slot/Makefile | 3 ++- 3 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/programs/inline-data/Makefile b/programs/inline-data/Makefile index 4bfd809..8b14e2d 100644 --- a/programs/inline-data/Makefile +++ b/programs/inline-data/Makefile @@ -7,6 +7,7 @@ TESTS = inline-data inline-dirs multi-inline-data multi-inline-dirs CFLAGS = -O2 -Wall -g MPI_LINK = $(MPICC) $(CFLAGS) $(LDFLAGS) -o $@ $^ +OCFS2_LIBS = `pkg-config --cflags --libs ocfs2` 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)) @@ -18,10 +19,10 @@ BIN_PROGRAMS = inline-data inline-dirs multi-inline-data multi-inline-dirs BIN_EXTRA = single-inline-run.sh multi-inline-run.sh inline-data: inline-data.o inline-data-utils.o - $(LINK) -locfs2 + $(LINK) $(OCFS2_LIBS) inline-dirs: inline-dirs.o inline-dirs-utils.o - $(LINK) -locfs2 + $(LINK) $(OCFS2_LIBS) multi-inline-data.o: multi-inline-data.c $(MPICC) -c multi-inline-data.c @@ -30,9 +31,9 @@ multi-inline-dirs.o: multi-inline-dirs.c $(MPICC) -c multi-inline-dirs.c multi-inline-data: multi-inline-data.o inline-data-utils.o - $(MPI_LINK) -locfs2 + $(MPI_LINK) $(OCFS2_LIBS) multi-inline-dirs: multi-inline-dirs.o - $(MPI_LINK) -locfs2 + $(MPI_LINK) $(OCFS2_LIBS) include $(TOPDIR)/Postamble.make diff --git a/programs/truncate/ocfs2-tools/Makefile b/programs/truncate/ocfs2-tools/Makefile index 63fa817..18f54a9 100644 --- a/programs/truncate/ocfs2-tools/Makefile +++ b/programs/truncate/ocfs2-tools/Makefile @@ -5,6 +5,7 @@ include $(TOPDIR)/Preamble.make TESTS = test_truncate CFLAGS = -O2 -Wall -g +OCFS2_LIBS=`pkg-config --cflags --libs ocfs2` SOURCES = test_truncate.c OBJECTS = $(patsubst %.c,%.o,$(SOURCES)) @@ -16,6 +17,6 @@ BIN_PROGRAMS = test_truncate BIN_EXTRA = ocfs2_truncate.sh test_truncate: $(OBJECTS) - $(LINK) -locfs2 -lcom_err + $(LINK) $(OCFS2_LIBS) include $(TOPDIR)/Postamble.make diff --git a/programs/tunefs-test/remove-slot/Makefile b/programs/tunefs-test/remove-slot/Makefile index 97226ea..dc17c66 100644 --- a/programs/tunefs-test/remove-slot/Makefile +++ b/programs/tunefs-test/remove-slot/Makefile @@ -5,6 +5,7 @@ include $(TOPDIR)/Preamble.make TESTS = remove_slot CFLAGS = -O2 -Wall -g +OCFS2_LIBS=`pkg-config --cflags --libs ocfs2` SOURCES = remove_slot.c OBJECTS = $(patsubst %.c,%.o,$(SOURCES)) @@ -16,6 +17,6 @@ BIN_PROGRAMS = remove_slot BIN_EXTRA = remove_slot.sh corrupt_remove_slot.sh remove_slot: $(OBJECTS) - $(LINK) -locfs2 -lcom_err + $(LINK) $(OCFS2_LIBS) include $(TOPDIR)/Postamble.make -- 2.1.4 _______________________________________________ Ocfs2-users mailing list Ocfs2-users@oss.oracle.com https://oss.oracle.com/mailman/listinfo/ocfs2-users