X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?p=palacios.git;a=blobdiff_plain;f=misc%2Ftest_vm%2Fbuild%2FMakefile;fp=misc%2Ftest_vm%2Fbuild%2FMakefile;h=c38b9f4bcc511323658efdf29183be1f56430258;hp=62c901d95f4a1e1c74e00da08c6a349fe17eb440;hb=ee177da9b30ebf340c63fb5b9d535c729f90134d;hpb=4b8b4ad83c037fa685a3bb8f3a681cf0b617ae9c diff --git a/misc/test_vm/build/Makefile b/misc/test_vm/build/Makefile index 62c901d..c38b9f4 100644 --- a/misc/test_vm/build/Makefile +++ b/misc/test_vm/build/Makefile @@ -38,11 +38,14 @@ KERNEL_ENTRY = $(SYM_PFX)Main PROJECT_ROOT := .. VPATH := $(PROJECT_ROOT)/src -ifeq ($(DEBUG_SERIAL),1) -JRL_DEBUG := -DDEBUG_SERIAL -endif +ifeq ($(SERIAL_DEBUG), 1) +JRLDEBUG= -DDEBUG_SERIAL +else +JRLDEBUG= +endif + # Figure out if we're compiling with cygwin, http://cygwin.com SYSTEM_NAME := $(shell uname -s) @@ -78,6 +81,8 @@ KERNEL_C_SRCS := idt.c int.c trap.c irq.c io.c \ gdt.c tss.c segment.c \ bget.c malloc.c \ synch.c kthread.c \ + vm_cons.c debug.c \ + pci.c \ serial.c reboot.c \ paging.c \ main.c @@ -174,7 +179,8 @@ NUMSECS := $(PERL) $(PROJECT_ROOT)/scripts/numsecs # ---------------------------------------------------------------------- # Flags used for all C source files -GENERAL_OPTS := -O -Wall $(EXTRA_C_OPTS) $(JRL_DEBUG) + +GENERAL_OPTS := -O -Wall $(EXTRA_C_OPTS) $(JRLDEBUG) CC_GENERAL_OPTS := $(GENERAL_OPTS) -Werror # Flags used for kernel C source files @@ -235,7 +241,6 @@ guest-img: fd.img $(PAD) guest.img 1474560 guest-iso: guest-img - mkisofs -pad -b guest.img -R -o guest.iso guest.img