X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fbuild%2FMakefile;h=9f0f862b5400b971fdc5eddad706536443b8cddf;hb=eb7dda8d4a92a2e8d0c8f867c65317d756ca6c11;hp=0d31d7ef4ebff2d3109cced83168c6e3c0875ca6;hpb=7246e098eaeb10934569dd4c6ef12753a1637351;p=palacios-OLD.git

diff --git a/palacios/build/Makefile b/palacios/build/Makefile
index 0d31d7e..9f0f862 100644
--- a/palacios/build/Makefile
+++ b/palacios/build/Makefile
@@ -1,6 +1,6 @@
 # Makefile for GeekOS kernel, userspace, and tools
 # Copyright (c) 2004,2005 David H. Hovemeyer <daveho@cs.umd.edu>
-# $Revision: 1.65 $
+# $Revision: 1.70 $
 
 # This is free software.  You are permitted to use,
 # redistribute, and modify it as specified in the file "COPYING".
@@ -51,40 +51,97 @@ DEBUG_SECTIONS=
 ifeq ($(DEBUG_ALL),1)
   DEBUG_SECTIONS:= $(DEBUG_SECTIONS) -DDEBUG_SHADOW_PAGING -DDEBUG_CTRL_REGS -DDEBUG_INTERRUPTS -DDEBUG_IO -DDEBUG_KEYBOARD -DDEBUG_PIC -DDEBUG_PIT -DDEBUG_NVRAM -DDEBUG_EMULATOR -DDEBUG_GENERIC -DDEBUG_RAMDISK
 endif
+
 ifeq ($(DEBUG_SHADOW_PAGING),1)
 DEBUG_SECTIONS := $(DEBUG_SECTIONS) -DDEBUG_SHADOW_PAGING
+else 
+ifeq ($(DEBUG_SHADOW_PAGING),0) 
+DEBUG_SECTIONS := $(DEBUG_SECTIONS) -UDEBUG_SHADOW_PAGING
+endif
 endif
+
 ifeq ($(DEBUG_CTRL_REGS),1)
 DEBUG_SECTIONS := $(DEBUG_SECTIONS) -DDEBUG_CTRL_REGS
+else 
+ifeq ($(DEBUG_CTRL_REGS),0) 
+DEBUG_SECTIONS := $(DEBUG_SECTIONS) -UDEBUG_CTRL_REGS
 endif
+endif
+
 ifeq ($(DEBUG_INTERRUPTS),1)
 DEBUG_SECTIONS := $(DEBUG_SECTIONS) -DDEBUG_INTERRUPTS
+else 
+ifeq ($(DEBUG_DEBUG_INTERRUPTS),0) 
+DEBUG_SECTIONS := $(DEBUG_SECTIONS) -UDEBUG_INTERRUPTS
+endif
 endif
+
 ifeq ($(DEBUG_IO),1)
 DEBUG_SECTIONS := $(DEBUG_SECTIONS) -DDEBUG_IO
+else 
+ifeq ($(DEBUG_IO),0) 
+DEBUG_SECTIONS := $(DEBUG_SECTIONS) -UDEBUG_IO
+endif
 endif
+
 ifeq ($(DEBUG_KEYBOARD),1)
 DEBUG_SECTIONS := $(DEBUG_SECTIONS) -DDEBUG_KEYBOARD
+else 
+ifeq ($(DEBUG_KEYBOARD),0) 
+DEBUG_SECTIONS := $(DEBUG_SECTIONS) -UDEBUG_KEYBOARD
 endif
+endif
+
 ifeq ($(DEBUG_PIC),1)
 DEBUG_SECTIONS := $(DEBUG_SECTIONS) -DDEBUG_PIC
+else 
+ifeq ($(DEBUG_PIC),0) 
+DEBUG_SECTIONS := $(DEBUG_SECTIONS) -UDEBUG_PIC
+endif
 endif
+
 ifeq ($(DEBUG_PIT),1)
 DEBUG_SECTIONS := $(DEBUG_SECTIONS) -DDEBUG_PIT
+else 
+ifeq ($(DEBUG_PIT),0) 
+DEBUG_SECTIONS := $(DEBUG_SECTIONS) -UDEBUG_PIT
+endif
 endif
+
 ifeq ($(DEBUG_NVRAM),1)
 DEBUG_SECTIONS := $(DEBUG_SECTIONS) -DDEBUG_NVRAM
+else 
+ifeq ($(DEBUG_NVRAM),0) 
+DEBUG_SECTIONS := $(DEBUG_SECTIONS) -UDEBUG_NVRAM
 endif
+endif
+
 ifeq ($(DEBUG_GENERIC),1)
 DEBUG_SECTIONS := $(DEBUG_SECTIONS) -DDEBUG_GENERIC
+else 
+ifeq ($(DEBUG_GENERIC),0) 
+DEBUG_SECTIONS := $(DEBUG_SECTIONS) -UDEBUG_GENERIC
+endif
 endif
+
 ifeq ($(DEBUG_EMULATOR),1)
 DEBUG_SECTIONS := $(DEBUG_SECTIONS) -DDEBUG_EMULATOR
+else 
+ifeq ($(DEBUG_EMULATOR),0) 
+DEBUG_SECTIONS := $(DEBUG_SECTIONS) -UDEBUG_EMULATOR
+endif
 endif
+
 ifeq ($(DEBUG_RAMDISK),1)
 DEBUG_SECTIONS := $(DEBUG_SECTIONS) -DDEBUG_RAMDISK
+else 
+ifeq ($(DEBUG_RAMDISK),0) 
+DEBUG_SECTIONS := $(DEBUG_SECTIONS) -UDEBUG_RAMDISK
 endif
+endif
+
 
+#DEBUG_SECTIONS := $(DEBUG_SECTIONS) -DTEST_NE2K
 
 ifeq ($(DEBUG),1)
   JRLDEBUG= -DSERIAL_PRINT_DEBUG=1 -DSERIAL_PRINT_DEBUG_LEVEL=10 -DSERIAL_PRINT=1 -DVMM_DEBUG=1 -DVMM_INFO=1 -DVMM_TRACE=1 $(DEBUG_SECTIONS)
@@ -173,7 +230,9 @@ KERNEL_C_SRCS := idt.c int.c trap.c irq.c io.c \
 	serial.c  reboot.c \
         paging.c \
 	debug.c vmm_stubs.c  vm.c  pci.c\
+	queue.c  ring_buffer.c \
 	main.c
+	#socket.c
 
 # Kernel object files built from C source files
 KERNEL_C_OBJS := $(KERNEL_C_SRCS:%.c=geekos/%.o)