add libnl

[build.git] / planetlab.mk

diff --git a/planetlab.mk b/planetlab.mk
index 9605733..215021e 100644 (file)
--- 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: planetlab.mk,v 1.56 2007/05/04 16:34:33 mef Exp $
+# $Id: planetlab.mk,v 1.61 2007/07/24 15:20:36 mef Exp $
 #
 
 #
@@ -49,34 +49,21 @@ endif
 # kernel
 #
 
-kernel-x86_64-MODULE := linux-2.6
-kernel-x86_64-RPMFLAGS:= --target x86_64
-kernel-x86_64-SPEC := linux-2.6/scripts/kernel-2.6-planetlab.spec
-#ALL += kernel-x86_64
+# Figure out whether we are building on i386 or x86_64 host
+HOSTARCH := $(shell uname -i)
 
-kernel-i686-MODULE := linux-2.6
-kernel-i686-RPMFLAGS:= --target i686
-kernel-i686-SPEC := linux-2.6/scripts/kernel-2.6-planetlab.spec
-ALL += kernel-i686
-
-kernel-i586-MODULE := linux-2.6
-kernel-i586-RPMFLAGS:= --target i586
-kernel-i586-SPEC := linux-2.6/scripts/kernel-2.6-planetlab.spec
-ALL += kernel-i586
-
-kernel: kernel-i586 kernel-i686
-kernel-clean: kernel-i586-clean kernel-i686-clean
-
-#
-# vnet
-#
+kernel-$(HOSTARCH)-MODULE := linux-2.6
+kernel-$(HOSTARCH)-SPEC := linux-2.6/scripts/kernel-2.6-planetlab.spec
+ifeq ($(HOSTARCH),i386)
+kernel-$(HOSTARCH)-RPMFLAGS:= --target i686
+else
+kernel-$(HOSTARCH)-RPMFLAGS:= --target $(HOSTARCH)
+endif
 
-vnet-MODULE := vnet
-vnet-SPEC := vnet/vnet.spec
-ALL += vnet
+ALL += kernel-$(HOSTARCH)
 
-# Build kernel first so we can bootstrap off of its build
-vnet: kernel
+kernel-clean: kernel-$(HOSTARCH)-clean
+kernel: kernel-$(HOSTARCH)
 
 #
 # madwifi
@@ -84,7 +71,7 @@ vnet: kernel
 
 madwifi-ng-MODULE := madwifi-ng
 madwifi-ng-SPEC := madwifi-ng/madwifi.spec
-ALL += madwifi-ng
+#ALL += madwifi-ng
 
 # Build kernel first so we can bootstrap off of its build
 madwifi-ng: kernel
@@ -93,8 +80,8 @@ madwifi-ng: kernel
 # ivtv 
 #
 
-#ivtv-MODULE := ivtv
-#ivtv-SPEC := ivtv/ivtv.spec
+ivtv-MODULE := ivtv
+ivtv-SPEC := ivtv/ivtv.spec
 #ALL += ivtv
 
 #
@@ -210,7 +197,7 @@ proper: libhttpd++
 
 codemux-MODULE := codemux
 codemux-SPEC   := codemux/codemux.spec
-ALL += codemux
+#ALL += codemux
 
 #
 # MySQL
@@ -361,6 +348,14 @@ myplc-devel-SPEC := myplc/myplc-devel.spec
 myplc-devel-RPMBUILD := sudo rpmbuild
 ALL += myplc-devel
 
+#
+# libnl
+#
+
+libnl-MODULE := libnl
+libnl-SPEC := libnl/libnl.spec
+ALL += libnl
+
 #
 # Installation rules
 #