X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=linux_module%2FMakefile;h=d89f187cc8a75475ea144ac3eacd45762e7ae090;hb=d0aa5bd27c22a33f04f47363910f9773fdeab7eb;hp=e3cb52aef3f205015026d380c5b16d91b3381899;hpb=fed3449f4fd2fab7f27a17e0970e954bd2d69abc;p=palacios.git

diff --git a/linux_module/Makefile b/linux_module/Makefile
index e3cb52a..d89f187 100644
--- a/linux_module/Makefile
+++ b/linux_module/Makefile
@@ -6,75 +6,66 @@ ifdef V3_CONFIG_SYMMOD
 LDFLAGS += --script=$(PWD)/ld.symmod.cmd
 endif
 
-EXTRA_CFLAGS  += -I$(PWD)/../palacios/include/ -include autoconf.h -DMODULE=1 -D__KERNEL__=1
-
-
-v3vee-objs := 	palacios.o \
-		palacios-dev.o \
-		palacios-vm.o \
-		palacios-mm.o \
-		palacios-queue.o \
-	        palacios-hashtable.o \
-		linux-exts.o
-	
-ifdef V3_CONFIG_CONSOLE
-	v3vee-objs += 	palacios-console.o
-endif
-
-ifdef V3_CONFIG_FILE
-	v3vee-objs += 	palacios-file.o 
+ifdef V3_CONFIG_CHECKPOINT
+LDFLAGS += --script=$(PWD)/ld.chkpt.cmd
 endif
 
-ifdef V3_CONFIG_STREAM
-	v3vee-objs +=	palacios-stream.o \
-			palacios-ringbuffer.o
-endif
-
-ifdef V3_CONFIG_EXT_INSPECTOR
-	v3vee-objs += palacios-inspector.o
-endif
+EXTRA_CFLAGS  += -I$(PWD)/../palacios/include/ -include autoconf.h -DMODULE=1 -D__KERNEL__=1
 
-ifdef V3_CONFIG_VNET
-	v3vee-objs += 	palacios-vnet.o \
-			palacios-vnet-ctrl.o   \
-			palacios-vnet-brg.o
-endif
 
-ifdef V3_CONFIG_PACKET
-	v3vee-objs += palacios-packet.o
-endif
+v3vee-y := 	palacios-stubs.o \
+		main.o \
+		vm.o \
+		mm.o \
+		allow_devmem.o \
+		util-queue.o \
+	        util-hashtable.o \
+		linux-exts.o \
+		buddy.o \
+		numa.o
 
-ifdef V3_CONFIG_SOCKET
-	v3vee-objs += palacios-socket.o
-endif
+v3vee-$(V3_CONFIG_CONSOLE) += iface-console.o
+v3vee-$(V3_CONFIG_FILE) += iface-file.o
+v3vee-$(V3_CONFIG_STREAM) +=	iface-stream.o \
+				util-ringbuffer.o
+v3vee-$(V3_CONFIG_EXT_INSPECTOR) += inspector.o
+v3vee-$(V3_CONFIG_PACKET) += iface-packet.o
+v3vee-$(V3_CONFIG_SOCKET) += iface-socket.o
+v3vee-$(V3_CONFIG_KEYED_STREAMS) += iface-keyed-stream.o
+v3vee-$(V3_CONFIG_HOST_DEVICE) += iface-host-dev.o
+v3vee-$(V3_CONFIG_GRAPHICS_CONSOLE) += iface-graphics-console.o
+v3vee-$(V3_CONFIG_EXT_MACH_CHECK) += mcheck.o
 
-ifdef V3_CONFIG_KEYED_STREAMS
-	v3vee-objs += palacios-keyed-stream.o
-endif
+v3vee-$(V3_CONFIG_MEM_TRACK) += memtrack.o
 
-ifdef V3_CONFIG_HOST_DEVICE
-	v3vee-objs += palacios-host-dev.o
-endif
+v3vee-$(V3_CONFIG_HOST_PMU) += iface-pmu.o
+v3vee-$(V3_CONFIG_HOST_PWRSTAT) += iface-pwrstat.o
+v3vee-$(V3_CONFIG_HOST_PSTATE_CTRL) += iface-pstate-ctrl.o
 
-ifdef V3_CONFIG_GRAPHICS_CONSOLE
-	v3vee-objs += palacios-graphics-console.o
-endif
+v3vee-$(V3_CONFIG_VNET) += 	palacios-vnet.o \
+				palacios-vnet-ctrl.o   \
+				palacios-vnet-brg.o
 
+v3vee-$(V3_CONFIG_HOST_HYPERCALL) += iface-host-hypercall.o
+v3vee-$(V3_CONFIG_EXT_CODE_INJECT) += iface-code-inject.o
+v3vee-$(V3_CONFIG_EXT_ENV_INJECT) += iface-env-inject.o
+v3vee-$(V3_CONFIG_EXT_SELECTIVE_SYSCALL_EXIT) += iface-syscall.o
+v3vee-$(V3_CONFIG_EXT_GUARD_MODULES) += iface-guard-mods.o
 
 
-v3vee-objs += ../libv3vee.a 
+v3vee-$(V3_CONFIG_HOST_PCI) += iface-host-pci.o
 
+v3vee-$(V3_CONFIG_DEBUG_LOCKS) += lockcheck.o
+v3vee-$(V3_CONFIG_DEBUG_MEM_ALLOC) += memcheck.o
 
 
+v3vee-objs := $(v3vee-y) ../libv3vee.a
 obj-m := v3vee.o
 
 
-
 all:
 	$(MAKE) -C $(V3_CONFIG_LINUX_KERN) M=$(PWD) modules
 
-
-
 clean:
 	$(MAKE) -C $(V3_CONFIG_LINUX_KERN) M=$(PWD) clean