X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fbuild%2FMakefile;h=4bfad21c154fa1408eb0f637722f76c2130b60f5;hb=87819b4172a7c32186403fc7a03bea5ae65f0e4a;hp=4e8c8e31fca76ce34743e790875e769d63508cf7;hpb=a7dc3322984b3c76fe990de506418e180ec1b0de;p=palacios-OLD.git

diff --git a/palacios/build/Makefile b/palacios/build/Makefile
index 4e8c8e3..4bfad21 100644
--- a/palacios/build/Makefile
+++ b/palacios/build/Makefile
@@ -203,6 +203,14 @@ DEBUG_SECTIONS := $(DEBUG_SECTIONS) -UDEBUG_DEV_MGR
 endif
 endif
 
+ifeq ($(DEBUG_NE2K),1)
+DEBUG_SECTIONS := $(DEBUG_SECTIONS) -DDEBUG_NE2K
+else 
+ifeq ($(DEBUG_NE2K),0)
+DEBUG_SECTIONS := $(DEBUG_SECTIONS) -UDEBUG_NE2K
+endif
+endif
+
 #DEBUG_SECTIONS := $(DEBUG_SECTIONS) -DTEST_NE2K
 
 ifeq ($(DEBUG),1)
@@ -241,6 +249,7 @@ else
   INSTRUMENT_OPT := 
 endif
 
+CFLAGS = -fno-stack-protector
 
 
 # ----------------------------------------------------------------------
@@ -297,13 +306,14 @@ VMM_OBJS := \
 	palacios/vmm_direct_paging.o \
 	palacios/vmm_ringbuffer.o \
 	palacios/vmm_hypercall.o \
+	palacios/vmm_lock.o \
 	$(OBJ_FILES)
 
 #		vmx.c vmcs_gen.c vmcs.c
 
 # Extra C flags for the VMM objects
 $(VMM_OBJS) :: EXTRA_CFLAGS = \
-	$(JRLDEBUG) \
+	$(JRLDEBUG) $(CFLAGS)\
 
 
 
@@ -312,7 +322,7 @@ XED_OBJS := \
 	xed/v3-udiv-compat.o \
 
 $(XED_OBJS) :: EXTRA_CFLAGS = \
-	$(JRLDEBUG) \
+	$(JRLDEBUG) $(CFLAGS)\
 
 DEVICES_OBJS := \
 	devices/generic.o \
@@ -334,13 +344,15 @@ DEVICES_OBJS := \
 	devices/ram_hd.o \
 	devices/i440fx.o \
 	devices/piix3.o \
+	devices/net_cd.o \
 
+#	devices/ne2k.o	\
 #	devices/cdrom.o \
 #	devices/ramdisk.o \
 #   	devices/vnic.o \
 
 $(DEVICES_OBJS) :: EXTRA_CFLAGS = \
-	$(JRLDEBUG) \
+	$(JRLDEBUG) $(CFLAGS)\