From: Mark Huang <mlhuang@cs.princeton.edu>
Date: Thu, 30 Mar 2006 16:34:04 +0000 (+0000)
Subject: - merge revision 1.9
X-Git-Tag: planetlab-3_3-rc1~7
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=7472a814746c5ee6976e148f4d03e99a59e2b90e;p=build.git

- merge revision 1.9
date: 2006/03/30 16:32:59;  author: mlhuang;  state: Exp;  lines: +0 -8
- remove deprecated resman package from build
- merge revision 1.8
date: 2006/03/29 16:21:23;  author: mlhuang;  state: Exp;  lines: +0 -8
- remove deprecated PlanetLabKeys package from build
---

diff --git a/planetlab.mk b/planetlab.mk
index e7c2e26e..68a1f60c 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.7 2006/03/27 17:57:14 mlhuang Exp $
 #
 
 #
@@ -109,14 +109,6 @@ PlanetLabConf-MODULE := PlanetLabConf
 PlanetLabConf-SPEC := PlanetLabConf/PlanetLabConf.spec
 ALL += PlanetLabConf
 
-#
-# PlanetLabKeys
-#
-
-PlanetLabKeys-MODULE := PlanetLabKeys
-PlanetLabKeys-SPEC := PlanetLabKeys/PlanetLabKeys.spec
-ALL += PlanetLabKeys
-
 #
 # ipod
 #
@@ -173,14 +165,6 @@ pl_sshd-MODULE := pl_sshd
 pl_sshd-SPEC := pl_sshd/pl_sshd.spec
 ALL += pl_sshd
 
-#
-# Resource Management Tools
-#
-
-resman-MODULE := resman
-resman-SPEC := resman/resman.spec
-ALL += resman
-
 #
 # libhttpd++: 
 #