X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=KernelLand%2FKernel%2FMakefile;h=aecab40a29bf106eddafdddbd100f77a9b0360dc;hb=b60401ea8fc3d59c3adda530e995fc04ee7cf457;hp=81a292854cf4ad59574c9c1c152f9c10ba8713b9;hpb=2fcb3775f3afee7bfa9aa3cbb6aea3c6c3426e64;p=tpg%2Facess2.git

diff --git a/KernelLand/Kernel/Makefile b/KernelLand/Kernel/Makefile
index 81a29285..aecab40a 100644
--- a/KernelLand/Kernel/Makefile
+++ b/KernelLand/Kernel/Makefile
@@ -51,10 +51,11 @@ BUILDINFO_OBJ := $(OBJDIR)buildinfo.o$(OBJSUFFIX)
 BUILDINFO_SRC := $(OBJDIR)buildinfo.c$(OBJSUFFIX)
 
 OBJ := $(addprefix arch/$(ARCHDIR)/,$(A_OBJ))
-OBJ += heap.o drvutil.o logging.o debug.o lib.o adt.o time.o
+OBJ += heap.o logging.o debug.o lib.o libc.o adt.o time.o
+OBJ += drvutil_video.o drvutil_disk.o
 OBJ += messages.o modules.o syscalls.o system.o
-OBJ += threads.o mutex.o semaphore.o workqueue.o events.o
-OBJ += drv/proc.o drv/fifo.o drv/iocache.o drv/pci.o
+OBJ += threads.o mutex.o semaphore.o workqueue.o events.o rwlock.o
+OBJ += drv/zero-one.o drv/proc.o drv/fifo.o drv/iocache.o drv/pci.o
 OBJ += drv/vterm.o drv/vterm_font.o drv/vterm_vt100.o drv/vterm_output.o drv/vterm_input.o drv/vterm_termbuf.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
@@ -85,10 +86,6 @@ clean:
 # Creates a stripped and compressed copy of the kernel
 # and installs it to the target
 install: $(BIN) 
-	@cp $(BIN) $(BIN)_
-	@$(STRIP) $(BIN)_
-	@gzip -c $(BIN)_ > $(GZBIN)
-	@$(RM) $(BIN)_
 	$(xCP) $(GZBIN) $(DISTROOT)
 
 # Compile API documentation
@@ -108,6 +105,10 @@ $(BIN): $(OBJ) $(MODS) arch/$(ARCHDIR)/link.ld Makefile ../../BuildConf/$(ARCH)/
 	@wc -l $(SRCFILES) include/*.h > LineCounts.$(ARCH).txt
 	@echo BUILD_NUM = $$(( $(BUILD_NUM) + 1 )) > Makefile.BuildNum.$(ARCH)
 	$(POSTBUILD)
+	@cp $(BIN) $(BIN)_
+	@-$(STRIP) $(BIN)_
+	@gzip -c $(BIN)_ > $(GZBIN)
+	@$(RM) $(BIN)_
 
 # Assembly Sources
 $(OBJDIR)%.ao$(OBJSUFFIX): %.$(AS_SUFFIX) Makefile