From: Mark Huang <mlhuang@cs.princeton.edu>
Date: Tue, 6 Feb 2007 21:35:46 +0000 (+0000)
Subject: merge changes from HEAD
X-Git-Tag: planetlab-4_0-rc1~10
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=bcf6238269ac5998a2183b4df68035d538a408db;p=build.git

merge changes from HEAD
---

diff --git a/planetlab.mk b/planetlab.mk
index 078a1a01..abeba0f2 100644
--- a/planetlab.mk
+++ b/planetlab.mk
@@ -4,7 +4,7 @@
 # Mark Huang <mlhuang@cs.princeton.edu>
 # Copyright (C) 2003-2006 The Trustees of Princeton University
 #
-# $Id$
+# $Id: planetlab.mk,v 1.46 2007/02/06 21:33:55 mlhuang Exp $
 #
 
 #
@@ -106,14 +106,6 @@ util-vserver-SPEC := util-vserver/util-vserver.spec
 util-vserver-RPMFLAGS:= --without dietlibc
 ALL += util-vserver
 
-#
-# yum
-#
-
-yum-MODULE := yum
-yum-SPEC := yum/yum.spec
-ALL += yum
-
 #
 # PlanetLabAccounts
 #
@@ -274,14 +266,6 @@ kexec-tools-MODULE := kexec-tools
 kexec-tools-SPEC := kexec-tools/kexec-tools.spec
 ALL += kexec-tools
 
-#
-# dhcp
-#
-
-dhcp-MODULE := dhcp
-dhcp-SPEC := dhcp/dhcp.spec
-ALL += dhcp
-
 #
 # util-python
 #
@@ -295,22 +279,6 @@ proper: util-python
 util-vserver: util-python
 PlanetLabAuth: util-python
 
-#
-# PlanetLabAuth
-#
-
-PlanetLabAuth-MODULE := pl_auth
-PlanetLabAuth-SPEC := pl_auth/pl_auth.spec
-ALL += PlanetLabAuth
-
-#
-# plcapilib
-#
-
-plcapilib-MODULE := plcmdline
-plcapilib-SPEC := plcmdline/plcapilib.spec
-ALL += plcapilib
-
 #
 # PLCAPI
 #