X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Kernel%2FMakefile;h=9bec84491e90a05e315202a4542592c11abc2279;hb=75e87cf46a3899f76bae5c64e130cfc033562e9a;hp=de3c071c6a66f3726f4c962a197c6f0f02175653;hpb=2ab2b815defe8dad0d15ecfa79dbfdff8acccb5e;p=tpg%2Facess2.git

diff --git a/Kernel/Makefile b/Kernel/Makefile
index de3c071c..9bec8449 100644
--- a/Kernel/Makefile
+++ b/Kernel/Makefile
@@ -4,26 +4,27 @@
 # - 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)
-CFLAGS		+= -Wall -Werror -O3 -fno-stack-protector -fno-builtin -fleading-underscore
+CFLAGS		+= -Wall -Werror -O3 -fno-stack-protector -fno-builtin
 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 drvutil.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 += vfs/fs/root.o vfs/fs/devfs.o
+OBJ += $(addprefix vfs/fs/, $(addsuffix .o,$(FILESYSTEMS)))
+OBJ += drv/fifo.o drv/dma.o drv/iocache.o drv/pci.o drv/kb.o drv/vga.o drv/vterm.o
+OBJ += $(addprefix drv/, $(addsuffix .o,$(DRIVERS)))
 OBJ := $(addsuffix .$(ARCH), $(OBJ))
+MODS += $(addprefix ../Modules/, $(addsuffix .xo.$(ARCH),$(MODULES)))
 BIN = ../Acess2.$(ARCH).bin
 
 DEPFILES  = $(filter %.o.$(ARCH),$(OBJ))
@@ -32,32 +33,44 @@ DEPFILES := $(DEPFILES:%.o.$(ARCH)=%.d.$(ARCH))
 SRCFILES  = $(OBJ:%.o.$(ARCH)=%.c)
 SRCFILES := $(SRCFILES:%.ao.$(ARCH)=%.asm)
 
-.PHONY: all clean
+.PHONY: all clean apidoc
 
 all: $(BIN)
 
 clean:
 	@$(RM) $(BIN) $(OBJ) $(DEPFILES)
 
-$(BIN): $(OBJ) arch/$(ARCHDIR)/link.ld Makefile
+apidoc:
+	doxygen Doxyfile.api
+
+$(BIN): $(OBJ) $(MODS) arch/$(ARCHDIR)/link.ld Makefile
 	@echo --- LD -o $(BIN)
-	@$(LD) $(LDFLAGS) -o $(BIN) $(OBJ) -Map ../Map.$(ARCH).txt
+	@$(LD) $(LDFLAGS) -o $(BIN) $(OBJ) $(MODS) -Map ../Map.$(ARCH).txt
 	@objdump $(BIN) -D > $(BIN).dsm
-	@cp $(BIN) /mnt/AcessFDD/
+	cp $(BIN) $(DISTROOT)
 	@wc -l $(SRCFILES) > LineCounts.$(ARCH).txt
-	@git commit -a
+#	@git commit -a
 
 %.ao.$(ARCH): %.asm Makefile
 	@echo --- NASM -o $@
 	@$(AS) $(ASFLAGS) $< -o $@
 
 %.o.$(ARCH): %.c Makefile
+#	if exists %*/Makefile
+#	@make -C %*/ all
+#	else
 	@echo --- GCC -o $@
 	@$(CC) $(CFLAGS) $(CPPFLAGS) -o $@ -c $<
 	@$(MAKEDEP) $(CPPFLAGS) -MT $@ -o $*.d.$(ARCH) $<
+#	endif
+
+%.xo.$(ARCH):
+	@make -C $* all
 
 include/syscalls.h:	syscalls.lst Makefile
 	php GenSyscalls.php
 
+Makefile:	../Makefile.cfg arch/$(ARCHDIR)/Makefile
+
 # Dependency Files
 -include $(DEPFILES)