X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=Makefile;h=1b14317002e5ce66f042464a45de052213b67d08;hb=ee05d4a828862fb4e79616585c15be0aee11ea50;hp=eb383bd5e446eb86b56ba8c8dd67109cfcf01491;hpb=ed4aa27a4901310df5fa1127ad62645da1bb4802;p=palacios.releases.git

diff --git a/Makefile b/Makefile
index eb383bd..1b14317 100644
--- a/Makefile
+++ b/Makefile
@@ -434,11 +434,13 @@ scripts_basic: palacios/include/autoconf.h
 core-y          := palacios/src/palacios/
 libs-y		:= palacios/lib/$(ARCH)/
 devices-y       := palacios/src/devices/
+interfaces-y    := palacios/src/interfaces/
+extensions-y    := palacios/src/extensions/
+vnet-y          := palacios/src/vnet/
 modules-y       := modules/
 
 
 
-
 ifeq ($(dot-config),1)
 # In this section, we need .config
 
@@ -466,7 +468,7 @@ palacios/include/autoconf.h: ;
 endif
 
 
-ifdef CONFIG_LINUX
+ifdef V3_CONFIG_LINUX
 DEFAULT_EXTRA_TARGETS=linux_module
 else
 DEFAULT_EXTRA_TARGETS=
@@ -479,24 +481,24 @@ endif
 all: palacios $(DEFAULT_EXTRA_TARGETS)
 
 
-ifdef CONFIG_LINUX
+ifdef V3_CONFIG_LINUX
 CFLAGS          += -mcmodel=kernel 
 else
 CFLAGS          += -fPIC
 endif
 
-ifdef CONFIG_FRAME_POINTER
+ifdef V3_CONFIG_FRAME_POINTER
 CFLAGS		+= -fno-omit-frame-pointer $(call cc-option,-fno-optimize-sibling-calls,)
 else
 CFLAGS		+= -fomit-frame-pointer
 endif
 
 
-ifdef CONFIG_UNWIND_INFO
+ifdef V3_CONFIG_UNWIND_INFO
 CFLAGS		+= -fasynchronous-unwind-tables
 endif
 
-ifdef CONFIG_DEBUG_INFO
+ifdef V3_CONFIG_DEBUG_INFO
 CFLAGS		+= -g
 else 
 CFLAGS          += -O
@@ -529,7 +531,9 @@ export	INSTALL_PATH ?= /build
 
 
 palacios-dirs	:= $(patsubst %/,%,$(filter %/,  \
-		     $(core-y) $(devices-y) $(libs-y)) $(modules-y))
+		     $(core-y) $(devices-y) $(interfaces-y) $(extensions-y) $(vnet-y) $(libs-y)) $(modules-y))
+
+
 
 #palacios-alldirs	:= $(sort $(palacios-dirs) $(patsubst %/,%,$(filter %/, \
 #		     $(core-n) $(core-) $(devices-n) $(devices-) \
@@ -537,14 +541,19 @@ palacios-dirs	:= $(patsubst %/,%,$(filter %/,  \
 
 
 palacios-cleandirs := $(sort $(palacios-dirs) $(patsubst %/,%,$(filter %/, \
-		     	$(core-n) $(core-) $(devices-n) $(devices-) $(modules-n) $(modules-))))
+		     	$(core-n) $(core-) $(devices-n) $(devices-) \
+			$(interfaces-n) $(interfaces-) $(extensions-n) $(extensions-) $(vnet-n) $(vnet-) $(modules-n) $(modules-))))
 
 
 
 core-y		:= $(patsubst %/, %/built-in.o, $(core-y))
 devices-y	:= $(patsubst %/, %/built-in.o, $(devices-y))
+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))
 modules-y       := $(patsubst %/, %/built-in.o, $(modules-y))
+#lnxmod-y        := $(patsubst %/, %/built-in.o, $(lnxmod-y))
 
 #core-y		:= $(patsubst %/, %/lib.a, $(core-y))
 #devices-y	:= $(patsubst %/, %/lib.a, $(devices-y))
@@ -568,7 +577,7 @@ modules-y       := $(patsubst %/, %/built-in.o, $(modules-y))
 
 
 
-palacios := $(core-y) $(devices-y) $(libs-y) $(modules-y)
+palacios := $(core-y) $(devices-y) $(interfaces-y) $(extensions-y) $(vnet-y) $(libs-y) $(modules-y)
 
 
 # Rule to link palacios - also used during CONFIG_CONFIGKALLSYMS
@@ -611,12 +620,16 @@ libv3vee.a: $(palacios)
 palacios: libv3vee.a
 
 
-linux_module/v3vee.ko:
-	cd linux_module/ && make CONFIG_LINUX_KERN=$(CONFIG_LINUX_KERN)
+
+
+linux_module/v3vee.ko: linux_module/*.c linux_module/*.h libv3vee.a
+	cd linux_module/ && make
 	cp linux_module/v3vee.ko v3vee.ko
 
 
-linux_module: linux_module/v3vee.ko
+linux_module: linux_module/v3vee.ko 
+
+
 
 palacios.asm: palacios
 	$(OBJDUMP) --disassemble $< > $@
@@ -930,10 +943,10 @@ target-dir = $(dir $@)
 
 # Modules
 / %/: prepare scripts FORCE
-	$(Q)$(MAKE) KBUILD_MODULES=$(if $(CONFIG_MODULES),1) \
+	$(Q)$(MAKE) KBUILD_MODULES=$(if $(V3_CONFIG_MODULES),1) \
 	$(build)=$(build-dir)
 %.ko: prepare scripts FORCE
-	$(Q)$(MAKE) KBUILD_MODULES=$(if $(CONFIG_MODULES),1)   \
+	$(Q)$(MAKE) KBUILD_MODULES=$(if $(V3_CONFIG_MODULES),1)   \
 	$(build)=$(build-dir) $(@:.ko=.o)
 	$(Q)$(MAKE) -rR -f $(srctree)/scripts/Makefile.modpost