From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 2843 invoked by alias); 29 May 2008 07:42:22 -0000 Received: (qmail 2805 invoked by uid 9702); 29 May 2008 07:42:21 -0000 Date: Thu, 29 May 2008 07:42:00 -0000 Message-ID: <20080529074220.2786.qmail@sourceware.org> From: fabbione@sourceware.org To: cluster-cvs@sources.redhat.com, cluster-devel@redhat.com Subject: Cluster Project branch, master, updated. cluster-2.99.02-35-g50f7819 X-Git-Refname: refs/heads/master X-Git-Reftype: branch X-Git-Oldrev: 3a37c3f5d88469d9f6de80d84a6f8664cc1a285c X-Git-Newrev: 50f7819a6013081bf5ffe01222004b3b693cef17 Mailing-List: contact cluster-cvs-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Post: List-Help: , Sender: cluster-cvs-owner@sourceware.org X-SW-Source: 2008-q2/txt/msg00405.txt.bz2 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=50f7819a6013081bf5ffe01222004b3b693cef17 The branch, master has been updated via 50f7819a6013081bf5ffe01222004b3b693cef17 (commit) via 9bbdef6722d9e869012d8d52c2f819dd987650c2 (commit) from 3a37c3f5d88469d9f6de80d84a6f8664cc1a285c (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 50f7819a6013081bf5ffe01222004b3b693cef17 Author: Fabio M. Di Nitto Date: Thu May 29 09:39:28 2008 +0200 [BUILD] Fix mount.gfs2 build Remove unrequired SHAREDOBJS since there is only one target. Fix CFLAGS to use gfscontrolincdir. Statically link mount.gfs2 with libgfscontrol. While this is absolutely ugly, it is the best way to prevent a few tons of other problems. Signed-off-by: Fabio M. Di Nitto commit 9bbdef6722d9e869012d8d52c2f819dd987650c2 Author: Fabio M. Di Nitto Date: Thu May 29 09:39:06 2008 +0200 [BUILD] gfs2 requires group to build Signed-off-by: Fabio M. Di Nitto ----------------------------------------------------------------------- Summary of changes: Makefile | 2 +- gfs2/mount/Makefile | 18 +++++++----------- 2 files changed, 8 insertions(+), 12 deletions(-) diff --git a/Makefile b/Makefile index c524a9b..4d2ad5a 100644 --- a/Makefile +++ b/Makefile @@ -53,7 +53,7 @@ fence/libfenced: group: cman dlm fence/libfenced fence: group gfs: -gfs2: +gfs2: group gnbd: cman rgmanager: cman dlm diff --git a/gfs2/mount/Makefile b/gfs2/mount/Makefile index 191431f..0c1b73b 100644 --- a/gfs2/mount/Makefile +++ b/gfs2/mount/Makefile @@ -18,22 +18,19 @@ include ../../make/defines.mk include $(OBJDIR)/make/cobj.mk include $(OBJDIR)/make/clean.mk -OBJS1= mount.gfs2.o - -SHAREDOBJS= ondisk1.o \ - util.o \ - mtab.o +OBJS1= mount.gfs2.o \ + ondisk1.o \ + util.o \ + mtab.o CFLAGS += -DHELPER_PROGRAM -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE CFLAGS += -I${gfskincdir} CFLAGS += -I${KERNEL_SRC}/fs/gfs2/ -I${KERNEL_SRC}/include/ -CFLAGS += -I$(S)/../include -I../../group/libgfscontrol/ +CFLAGS += -I${gfscontrolincdir} +CFLAGS += -I$(S)/../include CFLAGS += -I${incdir} -LDFLAGS += -L../../group/libgfscontrol/ -lgfscontrol - - -${TARGET1}: ${SHAREDOBJS} ${OBJS1} +${TARGET1}: ${OBJS1} ${gfscontrollibdir}/libgfscontrol.a $(CC) -o $@ $^ $(LDFLAGS) install: all @@ -46,4 +43,3 @@ uninstall: clean: generalclean -include $(OBJS1:.o=.d) --include $(SHAREDOBJS:.o=.d) hooks/post-receive -- Cluster Project