From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 12770 invoked by alias); 4 Aug 2008 04:01:50 -0000 Received: (qmail 12754 invoked by alias); 4 Aug 2008 04:01:49 -0000 X-Spam-Status: No, hits=-0.8 required=5.0 tests=AWL,BAYES_05,J_CHICKENPOX_43,KAM_MX,SPF_HELO_PASS X-Spam-Check-By: sourceware.org X-Spam-Checker-Version: SpamAssassin 3.2.4 (2008-01-01) on bastion.fedora.phx.redhat.com X-Spam-Level: Subject: master - build: drop "all" dependency from install: targets To: cluster-cvs-relay@redhat.com X-Project: Cluster Project X-Git-Module: cluster.git X-Git-Refname: refs/heads/master X-Git-Reftype: branch X-Git-Oldrev: 565ee3fec31ecfb16b1984a2582f8cc962df4d78 X-Git-Newrev: 324bde4df67558329fa9acaa9062edd090f05bab From: "Fabio M. Di Nitto" Message-Id: <20080804040039.DA21BA8256@lists.fedorahosted.org> Date: Mon, 04 Aug 2008 07:36:00 -0000 X-Scanned-By: MIMEDefang 2.58 on 172.16.52.254 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/msg00210.txt.bz2 Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=324bde4df67558329fa9acaa9062edd090f05bab Commit: 324bde4df67558329fa9acaa9062edd090f05bab Parent: 565ee3fec31ecfb16b1984a2582f8cc962df4d78 Author: Fabio M. Di Nitto AuthorDate: Fri Aug 1 07:22:06 2008 +0200 Committer: Fabio M. Di Nitto CommitterDate: Mon Aug 4 06:00:00 2008 +0200 build: drop "all" dependency from install: targets this change should address the last problem reported by Joel. Signed-off-by: Fabio M. Di Nitto --- Makefile | 2 +- cman/tests/Makefile | 2 +- gfs2/mount/Makefile | 2 +- make/install.mk | 2 +- make/perl-binding-common.mk | 2 +- rgmanager/src/resources/Makefile | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Makefile b/Makefile index 27f5c5a..260235a 100644 --- a/Makefile +++ b/Makefile @@ -52,7 +52,7 @@ oldconfig: echo "No old configure data found"; \ fi -install: all +install: set -e && for i in ${SUBDIRS}; do ${MAKE} -C $$i $@; done uninstall: diff --git a/cman/tests/Makefile b/cman/tests/Makefile index b3ca253..8ad441d 100644 --- a/cman/tests/Makefile +++ b/cman/tests/Makefile @@ -18,6 +18,6 @@ depends: %: %.o $(CC) -o $@ $^ $(LDFLAGS) -install: all +install: clean: generalclean diff --git a/gfs2/mount/Makefile b/gfs2/mount/Makefile index e02bf7b..1692855 100644 --- a/gfs2/mount/Makefile +++ b/gfs2/mount/Makefile @@ -25,7 +25,7 @@ LDDEPS += ../../group/libgfscontrol/libgfscontrol.a ${TARGET1}: ${OBJS1} ${LDDEPS} $(CC) -o $@ $^ $(LDFLAGS) -install: all +install: mkdir -p ${DESTDIR}/sbin install ${TARGET1} ${DESTDIR}/sbin diff --git a/make/install.mk b/make/install.mk index 6c95d56..60eb764 100644 --- a/make/install.mk +++ b/make/install.mk @@ -1,4 +1,4 @@ -install: all +install: ifdef LIBDIRT install -d ${libdir} install -m644 ${LIBDIRT} ${libdir} diff --git a/make/perl-binding-common.mk b/make/perl-binding-common.mk index f7e6007..d51520c 100644 --- a/make/perl-binding-common.mk +++ b/make/perl-binding-common.mk @@ -19,7 +19,7 @@ all: $(TARGET) Makefile: META.yml $(PMTARGET) perl Makefile.PL INC='$(CFLAGS)' LIBS='$(LDFLAGS)' INSTALLDIRS=vendor -install: $(TARGET) +install: ${MAKE} -f Makefile install uninstall: diff --git a/rgmanager/src/resources/Makefile b/rgmanager/src/resources/Makefile index 8462c4a..e6880e3 100644 --- a/rgmanager/src/resources/Makefile +++ b/rgmanager/src/resources/Makefile @@ -30,7 +30,7 @@ $(TARGET): -e 's#@CONFFILE@#${CONFFILE}#g' \ > $(TARGET) -install: all +install: install -d ${sharedir}/utils for i in $(RESOURCES); do \ install -m755 $(S)/$$i ${sharedir}; \