test_vm makefile fixes

diff --git a/misc/test_vm/build/Makefile b/misc/test_vm/build/Makefile
index bacef9f..62c901d 100644 (file)
--- a/misc/test_vm/build/Makefile
+++ b/misc/test_vm/build/Makefile
@@ -38,14 +38,11 @@ KERNEL_ENTRY = $(SYM_PFX)Main
 PROJECT_ROOT := ..
 VPATH := $(PROJECT_ROOT)/src
 
-#when -DNDEBUG is set the kassert functions are disabled
-#JRLDEBUG=-DNDEBUG
-JRLDEBUG= -DSERIAL_PRINT_DEBUG=1 -DSERIAL_PRINT_DEBUG_LEVEL=1000 -DSERIAL_PRINT=1
+ifeq ($(DEBUG_SERIAL),1)
+JRL_DEBUG := -DDEBUG_SERIAL
+endif
+
 
-#
-#
-#Peter's compile flags
-PAD= 
 
 # Figure out if we're compiling with cygwin, http://cygwin.com
 SYSTEM_NAME := $(shell uname -s)
@@ -177,7 +174,7 @@ NUMSECS := $(PERL) $(PROJECT_ROOT)/scripts/numsecs
 # ----------------------------------------------------------------------
 
 # Flags used for all C source files
-GENERAL_OPTS := -O -Wall $(EXTRA_C_OPTS) $(JRLDEBUG) $(PADFLAGS)
+GENERAL_OPTS := -O -Wall $(EXTRA_C_OPTS) $(JRL_DEBUG)
 CC_GENERAL_OPTS := $(GENERAL_OPTS) -Werror 
 
 # Flags used for kernel C source files