Cleanup

[tpg/acess2.git] / Kernel / Makefile

diff --git a/Kernel/Makefile b/Kernel/Makefile
index 0c90022..ae42dce 100644 (file)
--- a/Kernel/Makefile
+++ b/Kernel/Makefile
@@ -4,12 +4,10 @@
 # - The built objects and dependency files are suffixed with the arch name
 # - The final binary is Acess2.<ARCH>.bin
 
--include Makefile.cfg
+-include ../Makefile.cfg
 
 -include arch/$(ARCHDIR)/Makefile
 
-RM = rm -f
-
 MAKEDEP                = $(CC) -M
 
 CPPFLAGS       += -I./include -I./arch/$(ARCHDIR)/include -DARCH=$(ARCH)
@@ -18,11 +16,11 @@ ASFLAGS             += -D ARCH=\"$(ARCH)\"
 LDFLAGS                += -T arch/$(ARCHDIR)/link.ld
 
 OBJ = $(addprefix arch/$(ARCHDIR)/,$(A_OBJ))
-OBJ += heap.o messages.o debug.o modules.o lib.o syscalls.o system.o
+OBJ += heap.o messages.o debug.o modules.o lib.o syscalls.o system.o threads.o
 OBJ += binary.o bin/elf.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 vfs/fs/fat.o
-OBJ += drv/pci.o drv/ata_x86.o drv/vterm.o drv/vga.o drv/kb.o
+OBJ += drv/dma.o drv/fifo.o drv/pci.o drv/ata_x86.o drv/vterm.o drv/vga.o drv/kb.o drv/fdd.o
 OBJ := $(addsuffix .$(ARCH), $(OBJ))
 BIN = ../Acess2.$(ARCH).bin
 
@@ -43,9 +41,9 @@ $(BIN): $(OBJ) arch/$(ARCHDIR)/link.ld Makefile
        @echo --- LD -o $(BIN)
        @$(LD) $(LDFLAGS) -o $(BIN) $(OBJ) -Map ../Map.$(ARCH).txt
        @objdump $(BIN) -D > $(BIN).dsm
-       @cp $(BIN) /mnt/AcessFDD/
+       cp $(BIN) $(DISTROOT)
        @wc -l $(SRCFILES) > LineCounts.$(ARCH).txt
-       @git commit
+#      @git commit -a
 
 %.ao.$(ARCH): %.asm Makefile
        @echo --- NASM -o $@