- simplify how PACKAGES and ALL are defined

diff --git a/Makefile b/Makefile
index 4eabce8..789d5be 100644 (file)
--- 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.66 2005/05/04 20:01:59 mlhuang Exp $
+# $Id: Makefile,v 1.67 2005/05/04 20:05:53 mlhuang Exp $
 #
 
 # Default target
@@ -291,6 +291,12 @@ spamassassin-MODULE := spamassassin
 spamassassin-SPEC := spamassassin/spamassassin.spec
 ALL += spamassassin
 
+PACKAGES := $(ALL)
+
+#
+# Non-default packages
+#
+
 #
 # PlanetLab Central Server Management
 #
@@ -298,11 +304,9 @@ ALL += spamassassin
 plc-CVSROOT := :ext:cvs.planet-lab.org:/cvs
 plc-MODULE := plc
 plc-SPEC := plc/plc.spec
-# Do not build by default
-# ALL += plc
 PACKAGES += plc
 
-ifeq ($(findstring $(package),$(ALL) $(PACKAGES)),)
+ifeq ($(findstring $(package),$(PACKAGES)),)
 
 # Build all packages
 all: $(ALL)
@@ -312,7 +316,7 @@ all: $(ALL)
        sh ./packages.sh -b "http://build.planet-lab.org/$(subst $(HOME)/,,$(shell pwd))/SRPMS" SRPMS > SRPMS/packages.xml
 
 # Recurse
-$(ALL) $(PACKAGES):
+$(PACKAGES):
        $(MAKE) package=$@
 
 # Upload packages to boot server
@@ -336,7 +340,7 @@ endif
         # Populate repository
        ssh $(SERVER) mkdir -p $(ARCHIVE)/$(BASE)/RPMS $(ARCHIVE)/$(BASE)/SRPMS
        rsync --links --perms --times --group --compress --rsh=ssh \
-           RPMS/yumgroups.xml $(sort $(subst -debuginfo,,$(wildcard RPMS/*/*))) $(SERVER):$(ARCHIVE)/$(BASE)/RPMS/
+           $(sort $(subst -debuginfo,,$(wildcard RPMS/yumgroups.xml RPMS/*/*))) $(SERVER):$(ARCHIVE)/$(BASE)/RPMS/
        ssh $(SERVER) yum-arch $(ARCHIVE)/$(BASE)/RPMS >/dev/null
        rsync --links --perms --times --group --compress --rsh=ssh \
            $(wildcard SRPMS/*) $(SERVER):$(ARCHIVE)/$(BASE)/SRPMS/
@@ -350,14 +354,14 @@ endif
 endif
 
 # Remove files generated by this package
-$(foreach package,$(ALL),$(package)-clean): %-clean:
+$(foreach package,$(PACKAGES),$(package)-clean): %-clean:
        $(MAKE) package=$* clean
 
 # Remove all generated files
 clean:
        rm -rf BUILD RPMS SOURCES SPECS SRPMS .rpmmacros .cvsps
 
-.PHONY: all $(ALL) $(foreach package,$(ALL),$(package)-clean) clean
+.PHONY: all $(PACKAGES) $(foreach package,$(PACKAGES),$(package)-clean) clean
 
 else