From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 19418 invoked by alias); 16 Jul 2008 08:38:36 -0000 Received: (qmail 19385 invoked by uid 9702); 16 Jul 2008 08:38:34 -0000 Date: Wed, 16 Jul 2008 08:38:00 -0000 Message-ID: <20080716083833.19367.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.06-8-g0f4b1a9 X-Git-Refname: refs/heads/master X-Git-Reftype: branch X-Git-Oldrev: da4f93ba9b9b1328934fa9ca86c4bd03f0e1bf76 X-Git-Newrev: 0f4b1a92d539318065e7c2d9797b53bba0a6cbcb 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-q3/txt/msg00076.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=0f4b1a92d539318065e7c2d9797b53bba0a6cbcb The branch, master has been updated via 0f4b1a92d539318065e7c2d9797b53bba0a6cbcb (commit) from da4f93ba9b9b1328934fa9ca86c4bd03f0e1bf76 (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 0f4b1a92d539318065e7c2d9797b53bba0a6cbcb Author: Fabio M. Di Nitto Date: Wed Jul 16 10:37:57 2008 +0200 [BUILD] Add ccs_test replacement when building legacy_code Signed-off-by: Fabio M. Di Nitto ----------------------------------------------------------------------- Summary of changes: ccs/ccs_tool/Makefile | 24 ++++++++++++++++++------ 1 files changed, 18 insertions(+), 6 deletions(-) diff --git a/ccs/ccs_tool/Makefile b/ccs/ccs_tool/Makefile index f984206..9732a15 100644 --- a/ccs/ccs_tool/Makefile +++ b/ccs/ccs_tool/Makefile @@ -1,10 +1,17 @@ -TARGET= ccs_tool +TARGET1 = ccs_tool -SBINDIRT=$(TARGET) - -all: depends ${TARGET} +SBINDIRT = $(TARGET1) include ../../make/defines.mk + +ifdef legacy_code +TARGET2 = ccs_test +SBINDIRT += $(TARGET2) +all: depends ${TARGET1} ${TARGET2} +else +all: ${TARGET1} +endif + include $(OBJDIR)/make/cobj.mk include $(OBJDIR)/make/clean.mk include $(OBJDIR)/make/install.mk @@ -29,14 +36,19 @@ else LDFLAGS += -L${ccslibdir} -lccs endif -${TARGET}: ${OBJS} +${TARGET1}: ${OBJS} $(CC) -o $@ $^ $(LDFLAGS) +ifdef legacy_code +${TARGET2}: ${TARGET1} + ln -sf ${TARGET1} ${TARGET2} + depends: $(MAKE) -C ../libccscompat all +endif clean: generalclean -.PHONY: all ${TARGET} +.PHONY: all ${TARGET1} -include $(OBJS:.o=.d) hooks/post-receive -- Cluster Project