From: Kyle Hale <kh@u.northwestern.edu>
Date: Fri, 13 Apr 2012 23:32:40 +0000 (-0500)
Subject: Build changes for gears inclusion
X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=commitdiff_plain;h=64322c155031a0eff3e2b4ff69c3d9d7be92a643;p=palacios.releases.git

Build changes for gears inclusion
---

diff --git a/Kconfig b/Kconfig
index 0fb4b9a..a799842 100644
--- a/Kconfig
+++ b/Kconfig
@@ -313,8 +313,9 @@ config DEBUG_VNET
 
 endmenu
 
-menu "Debug configuration"
+source "palacios/src/gears/Kconfig"
 
+menu "Debug configuration"
 
 ## Is unwind information useful
 
diff --git a/Makefile b/Makefile
index 22b56bb..3d83791 100644
--- a/Makefile
+++ b/Makefile
@@ -438,6 +438,7 @@ devices-y       := palacios/src/devices/
 interfaces-y    := palacios/src/interfaces/
 extensions-y    := palacios/src/extensions/
 vnet-y          := palacios/src/vnet/
+gears-y         := palacios/src/gears/
 modules-y       := modules/
 
 
@@ -530,7 +531,7 @@ export	INSTALL_PATH ?= /build
 
 
 palacios-dirs	:= $(patsubst %/,%,$(filter %/,  \
-		     $(core-y) $(devices-y) $(interfaces-y) $(extensions-y) $(vnet-y) $(libs-y)) $(modules-y))
+		     $(core-y) $(devices-y) $(interfaces-y) $(extensions-y) $(vnet-y) $(gears-y) $(libs-y)) $(modules-y))
 
 
 
@@ -541,7 +542,7 @@ palacios-dirs	:= $(patsubst %/,%,$(filter %/,  \
 
 palacios-cleandirs := $(sort $(palacios-dirs) $(patsubst %/,%,$(filter %/, \
 		     	$(core-n) $(core-) $(devices-n) $(devices-) \
-			$(interfaces-n) $(interfaces-) $(extensions-n) $(extensions-) $(vnet-n) $(vnet-) $(modules-n) $(modules-))))
+			$(interfaces-n) $(interfaces-) $(extensions-n) $(extensions-) $(vnet-n) $(vnet-) $(gears-n) $(gears-) $(modules-n) $(modules-))))
 
 
 
@@ -551,6 +552,7 @@ interfaces-y    := $(patsubst %/, %/built-in.o, $(interfaces-y))
 extensions-y    := $(patsubst %/, %/built-in.o, $(extensions-y))
 libs-y		:= $(patsubst %/, %/built-in.o, $(libs-y))
 vnet-y          := $(patsubst %/, %/built-in.o, $(vnet-y))
+gears-y         := $(patsubst %/, %/built-in.o, $(gears-y))
 modules-y       := $(patsubst %/, %/built-in.o, $(modules-y))
 #lnxmod-y        := $(patsubst %/, %/built-in.o, $(lnxmod-y))
 
@@ -576,7 +578,7 @@ modules-y       := $(patsubst %/, %/built-in.o, $(modules-y))
 
 
 
-palacios := $(core-y) $(devices-y) $(interfaces-y) $(extensions-y) $(vnet-y) $(libs-y) $(modules-y)
+palacios := $(core-y) $(devices-y) $(interfaces-y) $(extensions-y) $(vnet-y) $(gears-y) $(libs-y) $(modules-y)
 
 
 # Rule to link palacios - also used during CONFIG_CONFIGKALLSYMS