V3VEE compiles. Segfaults, but the callback structures work.

[palacios-OLD.git] / kitten / Makefile

diff --git a/kitten/Makefile b/kitten/Makefile
index 99507c0..3407681 100644 (file)
--- a/kitten/Makefile
+++ b/kitten/Makefile
@@ -301,7 +301,6 @@ AFLAGS_KERNEL       =
 # Use LWKINCLUDE when you must reference the include/ directory.
 # Needed to be compatible with the O= option
 LWKINCLUDE      := -Iinclude \
-                  -I../palacios/include \
                    $(if $(KBUILD_SRC),-Iinclude2 -I$(srctree)/include) \
                   -include include/lwk/autoconf.h
 
@@ -497,6 +496,11 @@ ifdef CONFIG_DEBUG_INFO
 CFLAGS         += -g
 endif
 
+ifdef CONFIG_V3VEE
+CFLAGS += -I../palacios/include
+endif
+
+
 include $(srctree)/arch/$(ARCH)/Makefile
 
 # arch Makefile may override CC so keep this after arch Makefile is included
@@ -531,6 +535,7 @@ export MODLIB
 ifeq ($(KBUILD_EXTMOD),)
 #core-y                += kernel/ mm/ fs/ ipc/ security/ crypto/ block/
 core-y         += kernel/ mm/
+core-$(CONFIG_V3VEE) += palacios-glue/
 
 vmlwk-dirs     := $(patsubst %/,%,$(filter %/, $(init-y) $(init-m) \
                     $(core-y) $(core-m) $(drivers-y) $(drivers-m) \