X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Kernel%2FMakefile;h=fa8ff2a01e910509c1fc9df434c6ba3b5ae42a4a;hb=6202eb0852c564c92b1ce6e61ce4d60e7023ace1;hp=619d3ea00f2d476d78d7c61eaa7cdde353a47aa7;hpb=156885e938b60fee9d061d989ae7711c9aeea493;p=tpg%2Facess2.git

diff --git a/Kernel/Makefile b/Kernel/Makefile
index 619d3ea0..fa8ff2a0 100644
--- a/Kernel/Makefile
+++ b/Kernel/Makefile
@@ -25,13 +25,11 @@ ifeq ($(DEBUG_BUILD),yes)
 	CFLAGS += -g
 endif
 
-OBJ = $(addprefix arch/$(ARCHDIR)/,$(A_OBJ))
-OBJ += heap.o messages.o debug.o modules.o lib.o syscalls.o system.o threads.o drvutil.o
+OBJ := $(addprefix arch/$(ARCHDIR)/,$(A_OBJ))
+OBJ += heap.o drvutil.o logging.o debug.o lib.o adt.o
+OBJ += messages.o modules.o syscalls.o system.o threads.o
 OBJ += $(addprefix vfs/fs/, $(addsuffix .o,$(FILESYSTEMS)))
-# These are first to make vterm be the first driver initialised (apart
-# its dependencies), allowing logging to exist throughout the loading
-# process.
-OBJ += drv/vterm.o drv/proc.o drv/fifo.o drv/dma.o drv/iocache.o drv/pci.o drv/kb.o drv/vga.o
+OBJ += drv/vterm.o drv/proc.o drv/fifo.o drv/iocache.o drv/dma.o drv/pci.o drv/kb.o drv/vga.o
 OBJ += binary.o bin/elf.o bin/pe.o
 OBJ += vfs/main.o vfs/open.o vfs/acls.o vfs/dir.o vfs/io.o vfs/mount.o vfs/memfile.o vfs/nodecache.o
 OBJ += vfs/fs/root.o vfs/fs/devfs.o