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

diff --git a/Kernel/Makefile b/Kernel/Makefile
index 619d3ea0..225928c3 100644
--- a/Kernel/Makefile
+++ b/Kernel/Makefile
@@ -8,15 +8,15 @@
 
 -include arch/$(ARCHDIR)/Makefile
 
--include Makefile.BuildNum
+-include Makefile.BuildNum.$(ARCH)
 
 KERNEL_VERSION = 0.5
 
 MAKEDEP		= $(CC) -M
 
 CPPFLAGS	+= -I./include -I./arch/$(ARCHDIR)/include
-CPPFLAGS    += -DARCH=$(ARCH) -DARCHDIR=$(ARCHDIR) -DKERNEL_VERSION=$(KERNEL_VERSION) -DBUILD_NUM=$(BUILD_NUM)
-CFLAGS		+= -Wall -Werror -O3 -fno-stack-protector -fno-builtin
+CPPFLAGS	+= -DARCH=$(ARCH) -DARCHDIR=$(ARCHDIR) -DKERNEL_VERSION=$(KERNEL_VERSION) -DBUILD_NUM=$(BUILD_NUM)
+CFLAGS		+= -Wall -Werror -O3 -fno-stack-protector -fno-builtin -Wstrict-prototypes
 ASFLAGS		+= -D ARCH=\"$(ARCH)\" -D ARCHDIR=\"$(ARCHDIR)\"
 LDFLAGS		+= -T arch/$(ARCHDIR)/link.ld
 
@@ -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 time.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
@@ -39,6 +37,7 @@ OBJ += $(addprefix drv/, $(addsuffix .o,$(DRIVERS)))
 OBJ := $(addsuffix .$(ARCH), $(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))
@@ -51,10 +50,11 @@ SRCFILES := $(SRCFILES:%.ao.$(ARCH)=%.asm)
 all: $(BIN)
 
 clean:
-	@$(RM) $(BIN) $(BIN).dsm ../Map.$(ARCH).txt LineCounts.$(ARCH).txt $(OBJ) $(DEPFILES)
+	@$(RM) $(BIN) ../Acess2.$(ARCH).gz $(BIN).dsm ../Map.$(ARCH).txt LineCounts.$(ARCH).txt $(OBJ) $(DEPFILES)
 
 install: $(BIN)
-	$(xCP) $(BIN) $(DISTROOT)
+	gzip -c $(BIN) > ../Acess2.$(ARCH).gz
+	$(xCP) ../Acess2.$(ARCH).gz $(DISTROOT)
 
 apidoc:
 	doxygen Doxyfile.api
@@ -62,9 +62,9 @@ apidoc:
 $(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 -S > $(BIN).dsm
-	@wc -l $(SRCFILES) > LineCounts.$(ARCH).txt
-	@echo BUILD_NUM = `calc $(BUILD_NUM)+1` > Makefile.BuildNum
+	$(DISASM) $(BIN) > $(BIN).dsm
+	@wc -l $(SRCFILES) include/*.h > LineCounts.$(ARCH).txt
+	@echo BUILD_NUM = $$(( $(BUILD_NUM) + 1 )) > Makefile.BuildNum.$(ARCH)
 
 %.ao.$(ARCH): %.asm Makefile
 	@echo --- NASM -o $@