X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=linux_module%2FMakefile;h=a1a4349898b64ec3f61ae997ad522f9605b196f3;hb=f42302b7880ec9252c080548b38e74d1fec16827;hp=f20fb08bfe9cf4f3a14260028e52b03bf7780ef4;hpb=467878dcf7ccb6248c83483e01360b0ffdc83dc0;p=palacios.git

diff --git a/linux_module/Makefile b/linux_module/Makefile
index f20fb08..a1a4349 100644
--- a/linux_module/Makefile
+++ b/linux_module/Makefile
@@ -1,31 +1,64 @@
+include $(PWD)/../.config
 
-LDFLAGS += --whole-archive  --script=$(PWD)/link.cmd
+LDFLAGS += --whole-archive  --script=$(PWD)/ld.cmd
 
-EXTRA_CFLAGS  += -I$(PWD)/../palacios/include/ -DMODULE=1 -D__KERNEL__=1
+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 \
+v3vee-objs := 	palacios.o \
 		palacios-dev.o \
 		palacios-vm.o \
-		palacios-file.o \
-		palacios-stream.o \
-		palacios-console.o \
 		palacios-mm.o \
-		palacios-serial.o \
 		palacios-queue.o \
-		palacios-ringbuffer.o \
-		palacios-debugfs.o
+	        palacios-hashtable.o
+
+ifdef V3_CONFIG_CONSOLE
+	v3vee-objs += 	palacios-console.o
+endif
+
+ifdef V3_CONFIG_FILE
+	v3vee-objs += 	palacios-file.o 
+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
 
-ifdef CONFIG_PALACIOS_VNET
-		v3vee-objs += palacios-vnet.o		
+ifdef V3_CONFIG_VNET
+	v3vee-objs += palacios-vnet.o palacios-vnet-bridge.o
 endif
-ifdef CONFIG_PALACIOS_PACKET
-		v3vee-objs += palacios-packet.o
+
+ifdef V3_CONFIG_PACKET
+	v3vee-objs += palacios-packet.o
+endif
+
+ifdef V3_CONFIG_SOCKET
+	v3vee-objs += palacios-socket.o
+endif
+
+ifdef V3_CONFIG_KEYED_STREAMS
+	v3vee-objs += palacios-keyed-stream.o
 endif
-ifdef CONFIG_PALACIOS_SOCKET
-		v3vee-objs += palacios-socket.o
+
+ifdef V3_CONFIG_HOST_DEVICE
+	v3vee-objs += palacios-host-dev.o
+endif
+
+ifdef V3_CONFIG_GRAPHICS_CONSOLE
+	v3vee-objs += palacios-graphics-console.o
 endif
 
+
+
 v3vee-objs += ../libv3vee.a 
 
 
@@ -35,10 +68,10 @@ obj-m := v3vee.o
 
 
 all:
-	$(MAKE) -C $(CONFIG_LINUX_KERN) M=$(PWD) modules
+	$(MAKE) -C $(V3_CONFIG_LINUX_KERN) M=$(PWD) modules
 
 
 
 clean:
-	$(MAKE) -C $(CONFIG_LINUX_KERN) M=$(PWD) clean
+	$(MAKE) -C $(V3_CONFIG_LINUX_KERN) M=$(PWD) clean