From: Jack Lange <jacklange@cs.pitt.edu>
Date: Thu, 9 Jun 2011 20:38:04 +0000 (-0500)
Subject: makefile cleanup
X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?p=palacios.git;a=commitdiff_plain;h=e555306f4bfad36f6f60c7bcadc0a851b2abded7

makefile cleanup
---

diff --git a/linux_module/Makefile b/linux_module/Makefile
index e3cb52a..bedce06 100644
--- a/linux_module/Makefile
+++ b/linux_module/Makefile
@@ -9,62 +9,34 @@ endif
 EXTRA_CFLAGS  += -I$(PWD)/../palacios/include/ -include autoconf.h -DMODULE=1 -D__KERNEL__=1
 
 
-v3vee-objs := 	palacios.o \
+v3vee-y := 	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 
-endif
+v3vee-$(V3_CONFIG_CONSOLE) += palacios-console.o
+v3vee-$(V3_CONFIG_FILE) += palacios-file.o
+v3vee-$(V3_CONFIG_STREAM) +=	palacios-stream.o \
+				palacios-ringbuffer.o
+v3vee-$(V3_CONFIG_EXT_INSPECTOR) += palacios-inspector.o
+v3vee-$(V3_CONFIG_PACKET) += palacios-packet.o
+v3vee-$(V3_CONFIG_SOCKET) += palacios-socket.o
+v3vee-$(V3_CONFIG_KEYED_STREAMS) += palacios-keyed-stream.o
+v3vee-$(V3_CONFIG_HOST_DEVICE) += palacios-host-dev.o
+v3vee-$(V3_CONFIG_GRAPHICS_CONSOLE) += palacios-graphics-console.o
 
-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 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
-
-ifdef V3_CONFIG_SOCKET
-	v3vee-objs += palacios-socket.o
-endif
-
-ifdef V3_CONFIG_KEYED_STREAMS
-	v3vee-objs += palacios-keyed-stream.o
-endif
-
-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-$(V3_CONFIG_VNET) += 	palacios-vnet.o \
+				palacios-vnet-ctrl.o   \
+				palacios-vnet-brg.o
 
 
 
-v3vee-objs += ../libv3vee.a 
 
 
+v3vee-objs := $(v3vee-y) ../libv3vee.a
 
 obj-m := v3vee.o