From mboxrd@z Thu Jan 1 00:00:00 1970 From: cfeist@sourceware.org Date: 5 Mar 2008 00:09:52 -0000 Subject: [Cluster-devel] Cluster Project branch, RHEL4, updated. gfs-kernel_2_6_9_76-8-g1befab3 Message-ID: <20080305000952.5976.qmail@sourceware.org> List-Id: To: cluster-devel.redhat.com MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Cluster Project". http://sources.redhat.com/git/gitweb.cgi?p=cluster.git;a=commitdiff;h=1befab3b0e83584f08b06b816adbc0f8b9dc11ab The branch, RHEL4 has been updated via 1befab3b0e83584f08b06b816adbc0f8b9dc11ab (commit) via 2a08798bc9b438789e315e638f1911223863ed4f (commit) from 595e3cad6ac837bd37a7bd6b9280d1ca0c1e868c (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 1befab3b0e83584f08b06b816adbc0f8b9dc11ab Merge: 2a08798bc9b438789e315e638f1911223863ed4f 595e3cad6ac837bd37a7bd6b9280d1ca0c1e868c Author: Chris Feist Date: Tue Mar 4 18:08:41 2008 -0600 Merge branch 'RHEL4' of ssh://sources.redhat.com/git/cluster into r4 commit 2a08798bc9b438789e315e638f1911223863ed4f Author: Chris Feist Date: Tue Mar 4 17:49:04 2008 -0600 Fixed makefiles to build. ----------------------------------------------------------------------- Summary of changes: cman/Makefile | 2 +- cman/cman_tool/Makefile | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/cman/Makefile b/cman/Makefile index 3d96ef1..06043ed 100644 --- a/cman/Makefile +++ b/cman/Makefile @@ -12,8 +12,8 @@ ############################################################################### all: - cd cman_tool && ${MAKE} all cd lib && ${MAKE} all + cd cman_tool && ${MAKE} all cd qdisk && ${MAKE} all copytobin: diff --git a/cman/cman_tool/Makefile b/cman/cman_tool/Makefile index a83f2e0..8c3a692 100644 --- a/cman/cman_tool/Makefile +++ b/cman/cman_tool/Makefile @@ -28,6 +28,8 @@ else CFLAGS += -I${incdir}/cluster endif +CFLAGS += -I../lib + TARGET=cman_tool @@ -37,7 +39,7 @@ copytobin: all cp ${TARGET} ${top_srcdir}/bin cman_tool: main.o join.o join_ccs.o - $(CC) $(LDFLAGS) -L$(libdir) -o $@ $^ -lccs -lcman + $(CC) $(LDFLAGS) -L$(libdir) -L../lib -o $@ $^ -lccs -lcman main.o: main.c cman_tool.h $(CC) $(CFLAGS) -c -o $@ $< hooks/post-receive -- Cluster Project