From: Mark Huang <mlhuang@cs.princeton.edu>
Date: Wed, 4 May 2005 21:47:39 +0000 (+0000)
Subject: - move plc junk to plc.mk
X-Git-Tag: planetlab-3_1-branch-point~4
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=fe65ccbe7cdaa5e6c7ec946b5e2e6ede46eb47c1;hp=0834c97897770e35a69809b0e9e3f5815dbc1d24;p=build.git

- move plc junk to plc.mk
---

diff --git a/Makefile b/Makefile
index 789d5be9..eaa8ab7b 100644
--- a/Makefile
+++ b/Makefile
@@ -4,7 +4,7 @@
 # Mark Huang <mlhuang@cs.princeton.edu>
 # Copyright (C) 2003-2005 The Trustees of Princeton University
 #
-# $Id: Makefile,v 1.67 2005/05/04 20:05:53 mlhuang Exp $
+# $Id: Makefile,v 1.68 2005/05/04 20:35:27 mlhuang Exp $
 #
 
 # Default target
@@ -273,40 +273,7 @@ kexec-tools-MODULE := kexec-tools
 kexec-tools-SPEC := kexec-tools/kexec-tools.spec
 ALL += kexec-tools
 
-#
-# Request Tracker 3
-#
-
-rt3-CVSROOT := :pserver:anon@cvs.planet-lab.org:/cvs
-rt3-MODULE := rt3
-rt3-SPEC := rt3/etc/rt.spec
-ALL += rt3
-
-#
-# Mail::SpamAssassin
-#
-
-spamassassin-CVSROOT := :pserver:anon@cvs.planet-lab.org:/cvs
-spamassassin-MODULE := spamassassin
-spamassassin-SPEC := spamassassin/spamassassin.spec
-ALL += spamassassin
-
-PACKAGES := $(ALL)
-
-#
-# Non-default packages
-#
-
-#
-# PlanetLab Central Server Management
-#
-
-plc-CVSROOT := :ext:cvs.planet-lab.org:/cvs
-plc-MODULE := plc
-plc-SPEC := plc/plc.spec
-PACKAGES += plc
-
-ifeq ($(findstring $(package),$(PACKAGES)),)
+ifeq ($(findstring $(package),$(ALL)),)
 
 # Build all packages
 all: $(ALL)
@@ -316,7 +283,7 @@ all: $(ALL)
 	sh ./packages.sh -b "http://build.planet-lab.org/$(subst $(HOME)/,,$(shell pwd))/SRPMS" SRPMS > SRPMS/packages.xml
 
 # Recurse
-$(PACKAGES):
+$(ALL):
 	$(MAKE) package=$@
 
 # Upload packages to boot server
@@ -354,14 +321,14 @@ endif
 endif
 
 # Remove files generated by this package
-$(foreach package,$(PACKAGES),$(package)-clean): %-clean:
+$(foreach package,$(ALL),$(package)-clean): %-clean:
 	$(MAKE) package=$* clean
 
 # Remove all generated files
 clean:
 	rm -rf BUILD RPMS SOURCES SPECS SRPMS .rpmmacros .cvsps
 
-.PHONY: all $(PACKAGES) $(foreach package,$(PACKAGES),$(package)-clean) clean
+.PHONY: all $(ALL) $(foreach package,$(ALL),$(package)-clean) clean
 
 else