KD System Rewrite:

[reactos.git] / reactos / ntoskrnl / Makefile.i386

diff --git a/reactos/ntoskrnl/Makefile.i386 b/reactos/ntoskrnl/Makefile.i386
index bee30e9..f6ece81 100644 (file)
--- a/reactos/ntoskrnl/Makefile.i386
+++ b/reactos/ntoskrnl/Makefile.i386
@@ -3,9 +3,12 @@
 #
 
 # Defines $(OBJECTS_HAL)
-include hal/x86/sources
+# include hal/x86/sources
 
-OBJECTS_BOOT := ke/i386/multiboot.o
+OBJECTS_BOOT := ke/i386/main.o
+
+OBJECTS_EX_I386 := \
+       ex/i386/interlck.o
 
 OBJECTS_KE_I386 := \
        ke/i386/exp.o \
@@ -14,23 +17,47 @@ OBJECTS_KE_I386 := \
        ke/i386/thread.o \
        ke/i386/usercall.o \
        ke/i386/trap.o \
-       ke/i386/bthread.o \
        ke/i386/syscall.o \
-       ke/i386/tskswitch.o \
+       ke/i386/ctxswitch.o \
        ke/i386/v86m.o \
        ke/i386/v86m_sup.o \
+       ke/i386/vdm.o \
        ke/i386/bios.o \
-  ke/i386/i386-mcount.o \
        ke/i386/gdt.o \
        ke/i386/idt.o \
        ke/i386/ldt.o \
        ke/i386/brkpoint.o \
        ke/i386/kernel.o \
-       ke/i386/fpu.o
+       ke/i386/fpu.o \
+       ke/i386/tlbflush.o \
+       ke/i386/tss.o \
+       ke/i386/usertrap.o \
+       ke/i386/stkswitch.o
 
 OBJECTS_MM_I386 := \
        mm/i386/memsafe.o \
        mm/i386/page.o \
        mm/i386/pfault.o
 
-OBJECTS_ARCH = $(OBJECTS_BOOT) $(OBJECTS_KE_I386) $(OBJECTS_MM_I386)
\ No newline at end of file
+OBJECTS_RTL_I386 := \
+       rtl/i386/exception.o \
+       rtl/i386/seh.o
+
+ifeq ($(KDBG), 1)
+OBJECTS_KDBG_I386 := \
+       kdbg/i386/kdb_help.o \
+       kdbg/i386/i386-dis.o \
+       kdbg/i386/longjmp.o \
+       kdbg/i386/setjmp.o
+preall: all
+else
+OBJECTS_KDBG_I386 :=
+endif
+
+OBJECTS_PS_I386 := \
+       ps/i386/continue.o
+
+RTL_EXCLUDE_FILTER := 
+
+OBJECTS_ARCH = $(OBJECTS_BOOT) $(OBJECTS_EX_I386) $(OBJECTS_KE_I386) $(OBJECTS_MM_I386) \
+  $(OBJECTS_RTL_I386) $(OBJECTS_KDBG_I386) $(OBJECTS_PS_I386)