From 7b5595fcf1344a0291a006fbb6fce9523ca4ff49 Mon Sep 17 00:00:00 2001 From: Mark Huang Date: Thu, 1 Dec 2005 21:20:04 +0000 Subject: [PATCH] - merge revision 1.80 date: 2005/11/21 22:37:15; author: mlhuang; state: Exp; lines: +19 -3 - add bootcd to the automated build - also remove tmp/ directory when cleaning up --- Makefile | 22 +++++++++++++++++++--- 1 file changed, 19 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 14dba3d9..73de25a5 100644 --- a/Makefile +++ b/Makefile @@ -4,7 +4,7 @@ # Mark Huang # Copyright (C) 2003-2005 The Trustees of Princeton University # -# $Id: Makefile,v 1.79.2.4 2005/11/11 19:25:55 mlhuang Exp $ +# $Id$ # # Default target @@ -302,12 +302,28 @@ bootmanager-SPEC := bootmanager/bootmanager.spec bootmanager-RPMBUILD := sudo rpmbuild ALL += bootmanager -# bootmanager may require current packages +# bootmanager requires current packages bootmanager: $(filter-out bootmanager,$(ALL)) # ...and the yum manifest bootmanager: RPMS/yumgroups.xml +# +# bootcd +# + +bootcd-CVSROOT := :pserver:anon@cvs.planet-lab.org:/cvs +bootcd-MODULE := bootcd_v3 +bootcd-SPEC := bootcd_v3/bootcd.spec +bootcd-RPMBUILD := sudo rpmbuild +ALL += bootcd + +# bootcd requires current packages +bootcd: $(filter-out bootcd,$(ALL)) + +# ...and the yum manifest +bootcd: RPMS/yumgroups.xml + ifeq ($(findstring $(package),$(ALL)),) # Build all packages @@ -364,7 +380,7 @@ $(foreach package,$(ALL),$(package)-clean): %-clean: # Remove all generated files clean: - rm -rf BUILD RPMS SOURCES SPECS SRPMS .rpmmacros .cvsps + rm -rf BUILD RPMS SOURCES SPECS SRPMS .rpmmacros .cvsps tmp .PHONY: all $(ALL) $(foreach package,$(ALL),$(package)-clean) clean -- 2.47.0