X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Kernel%2FMakefile;h=6501a9006412e567c2056ea907b7301cc6886afa;hb=47b68865886bc60aaa3389121040ba1af1089130;hp=5aeee68592df31591176268c7eb91b79bb4709f2;hpb=b6c3b3cf61caafbd91bbf3acc81995e472656a5b;p=tpg%2Facess2.git

diff --git a/Kernel/Makefile b/Kernel/Makefile
index 5aeee685..6501a900 100644
--- a/Kernel/Makefile
+++ b/Kernel/Makefile
@@ -8,63 +8,108 @@
 
 -include arch/$(ARCHDIR)/Makefile
 
+-include Makefile.BuildNum.$(ARCH)
+
+KERNEL_VERSION = 0.5
+
 MAKEDEP		= $(CC) -M
 
-CPPFLAGS	+= -I./include -I./arch/$(ARCHDIR)/include -DARCH=$(ARCH)
-CFLAGS		+= -Wall -Werror -O3 -fno-stack-protector -fno-builtin -fleading-underscore
-ASFLAGS		+= -D ARCH=\"$(ARCH)\"
-LDFLAGS		+= -T arch/$(ARCHDIR)/link.ld
+CPPFLAGS	+= -I./include -I./arch/$(ARCHDIR)/include -D_MODULE_NAME_=\"Kernel\"
+CPPFLAGS	+= -DARCH=$(ARCH) -DARCHDIR=$(ARCHDIR) -DARCHDIR_IS_$(ARCHDIR)=1
+CPPFLAGS	+= -DKERNEL_VERSION=$(KERNEL_VERSION) -DBUILD_NUM=$(BUILD_NUM)
+CFLAGS  	+= -Wall -Werror -fno-stack-protector -fno-builtin -Wstrict-prototypes -g
+CFLAGS  	+= -Wshadow -Wpointer-arith -Wcast-align -Wwrite-strings -Wmissing-prototypes -Wmissing-declarations -Wredundant-decls -Wnested-externs -Winline -Wuninitialized
+LDFLAGS		+= -T arch/$(ARCHDIR)/link.ld -g
 
-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 += 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
+OBJDIR := obj-$(ARCH)/
+#OBJSUFFIX := .$(ARCH)
+
+ifeq ($(DEBUG_BUILD),yes)
+	LDFLAGS += -g
+	CFLAGS += -g
+endif
+
+ifeq ($(AS_SUFFIX),)
+	AS_SUFFIX = s
+endif
+
+OBJ := $(addprefix arch/$(ARCHDIR)/,$(A_OBJ))
+OBJ += heap.o drvutil.o logging.o debug.o lib.o adt.o time.o
+OBJ += messages.o modules.o syscalls.o system.o threads.o
 OBJ += $(addprefix vfs/fs/, $(addsuffix .o,$(FILESYSTEMS)))
-OBJ += drv/fifo.o drv/dma.o drv/pci.o drv/vterm.o drv/vga.o drv/kb.o
+OBJ += drv/vterm.o drv/proc.o drv/fifo.o drv/iocache.o drv/pci.o
+#OBJ += drv/kb.o drv/dma.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
+OBJ += vfs/memfile.o vfs/nodecache.o vfs/handle.o vfs/select.o vfs/mmap.o
+OBJ += vfs/fs/root.o vfs/fs/devfs.o
 OBJ += $(addprefix drv/, $(addsuffix .o,$(DRIVERS)))
-OBJ := $(addsuffix .$(ARCH), $(OBJ))
-MODS += $(addprefix ../Modules/, $(addsuffix .o.$(ARCH),$(MODULES)))
+
+OBJ := $(addsuffix $(OBJSUFFIX), $(OBJ))
+OBJ := $(addprefix $(OBJDIR), $(OBJ))
+
+MODS += $(addprefix ../Modules/, $(addsuffix .xo.$(ARCH),$(MODULES)))
 BIN = ../Acess2.$(ARCH).bin
+GZBIN = ../Acess2.$(ARCH).gz
 
-DEPFILES  = $(filter %.o.$(ARCH),$(OBJ))
-DEPFILES := $(DEPFILES:%.o.$(ARCH)=%.d.$(ARCH))
+DEPFILES  = $(filter %.o$(OBJSUFFIX),$(OBJ))
+DEPFILES := $(DEPFILES:%.o$(OBJSUFFIX)=%.dep$(OBJSUFFIX))
 
-SRCFILES  = $(OBJ:%.o.$(ARCH)=%.c)
-SRCFILES := $(SRCFILES:%.ao.$(ARCH)=%.asm)
+SRCFILES  = $(OBJ:$(OBJDIR)%.o$(OBJSUFFIX)=%.c)
+SRCFILES := $(SRCFILES:$(OBJDIR)%.ao$(OBJSUFFIX)=%.$(AS_SUFFIX))
 
-.PHONY: all clean
+.PHONY: all clean install apidoc
 
 all: $(BIN)
 
 clean:
-	@$(RM) $(BIN) $(OBJ) $(DEPFILES)
+#	$(RM) $(BIN) ../Acess2.$(ARCH).gz $(BIN).dsm ../Map.$(ARCH).txt LineCounts.$(ARCH).txt $(OBJ) $(DEPFILES)
+	@$(RM) $(BIN) ../Acess2.$(ARCH).gz $(BIN).dsm ../Map.$(ARCH).txt LineCounts.$(ARCH).txt -r $(OBJDIR) $(OBJ) $(DEPFILES)
+
+install: $(BIN) 
+	cp $(BIN) $(BIN)_
+	$(STRIP) $(BIN)_
+	gzip -c $(BIN)_ > ../Acess2.$(ARCH).gz
+	$(RM) $(BIN)_
+	$(xCP) ../Acess2.$(ARCH).gz $(DISTROOT)
+
+apidoc:
+	doxygen Doxyfile.api
 
 $(BIN): $(OBJ) $(MODS) arch/$(ARCHDIR)/link.ld Makefile
 	@echo --- LD -o $(BIN)
 	@$(LD) $(LDFLAGS) -o $(BIN) $(OBJ) $(MODS) -Map ../Map.$(ARCH).txt
-	@objdump $(BIN) -D > $(BIN).dsm
-	cp $(BIN) $(DISTROOT)
-	@wc -l $(SRCFILES) > LineCounts.$(ARCH).txt
-#	@git commit -a
-
-%.ao.$(ARCH): %.asm Makefile
-	@echo --- NASM -o $@
+	$(DISASM) -S $(BIN) > $(BIN).dsm
+	@wc -l $(SRCFILES) include/*.h > LineCounts.$(ARCH).txt
+	@echo BUILD_NUM = $$(( $(BUILD_NUM) + 1 )) > Makefile.BuildNum.$(ARCH)
+	$(POSTBUILD)
+#	$(STRIP) $(BIN)
+
+$(OBJDIR)%.ao$(OBJSUFFIX): %.$(AS_SUFFIX) Makefile
+	@echo --- AS -o $@
+	@mkdir -p $(dir $@)
 	@$(AS) $(ASFLAGS) $< -o $@
 
-%.o.$(ARCH): %.c Makefile
+$(OBJDIR)%.o$(OBJSUFFIX): %.c Makefile
 #	if exists %*/Makefile
 #	@make -C %*/ all
 #	else
-	@echo --- GCC -o $@
+	@echo --- CC -o $@
+	@mkdir -p $(dir $@)
 	@$(CC) $(CFLAGS) $(CPPFLAGS) -o $@ -c $<
-	@$(MAKEDEP) $(CPPFLAGS) -MT $@ -o $*.d.$(ARCH) $<
+	@$(MAKEDEP) $(CPPFLAGS) -MT $@ -o $(OBJDIR)$*.dep$(OBJSUFFIX) $<
 #	endif
 
-include/syscalls.h:	syscalls.lst Makefile
-	php GenSyscalls.php
+%.xo.$(ARCH):
+	@BUILDTYPE=static make -C $* all
+
+include/syscalls.h include/syscalls.inc.asm:	syscalls.lst Makefile GenSyscalls.pl
+	perl GenSyscalls.pl
 
 Makefile:	../Makefile.cfg arch/$(ARCHDIR)/Makefile
 
+# HACK - Rebuild proc when the buildnum changes
+$(OBJDIR)drv/proc.o$(OBJSUFFIX): Makefile.BuildNum
+
 # Dependency Files
 -include $(DEPFILES)