X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;ds=sidebyside;f=Kernel%2FMakefile;h=83c12407b48f4fa20df78199db11eb1eb17527af;hb=7e3a0260f0a6bb7bb1c1c001649b04bbe7ad6d52;hp=5d48945fe92349dda66a3587f327dd2011246693;hpb=1499c9eb8aa167dff5354a25c5a5bd2d00672a54;p=tpg%2Facess2.git

diff --git a/Kernel/Makefile b/Kernel/Makefile
index 5d48945f..83c12407 100644
--- a/Kernel/Makefile
+++ b/Kernel/Makefile
@@ -8,17 +8,17 @@
 
 -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	+= -I./include -I./arch/$(ARCHDIR)/include -D_MODULE_NAME_=\"Kernel\"
 CPPFLAGS	+= -DARCH=$(ARCH) -DARCHDIR=$(ARCHDIR) -DKERNEL_VERSION=$(KERNEL_VERSION) -DBUILD_NUM=$(BUILD_NUM)
-CFLAGS		+= -Wall -Werror -O3 -fno-stack-protector -fno-builtin
+CFLAGS		+= -Wall -Werror -O3 -fno-stack-protector -fno-builtin -Wstrict-prototypes -g
 ASFLAGS		+= -D ARCH=\"$(ARCH)\" -D ARCHDIR=\"$(ARCHDIR)\"
-LDFLAGS		+= -T arch/$(ARCHDIR)/link.ld
+LDFLAGS		+= -T arch/$(ARCHDIR)/link.ld -g
 
 ifeq ($(DEBUG_BUILD),yes)
 	LDFLAGS += -g
@@ -29,9 +29,9 @@ 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/vterm.o drv/proc.o drv/fifo.o drv/iocache.o drv/dma.o drv/pci.o drv/kb.o drv/vga.o
+OBJ += drv/kb.o drv/vterm.o drv/proc.o drv/fifo.o drv/iocache.o drv/dma.o drv/pci.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/main.o vfs/open.o vfs/acls.o vfs/dir.o vfs/io.o vfs/mount.o vfs/memfile.o vfs/nodecache.o vfs/handle.o
 OBJ += vfs/fs/root.o vfs/fs/devfs.o
 OBJ += $(addprefix drv/, $(addsuffix .o,$(DRIVERS)))
 OBJ := $(addsuffix .$(ARCH), $(OBJ))
@@ -52,7 +52,7 @@ all: $(BIN)
 clean:
 	@$(RM) $(BIN) ../Acess2.$(ARCH).gz $(BIN).dsm ../Map.$(ARCH).txt LineCounts.$(ARCH).txt $(OBJ) $(DEPFILES)
 
-install: $(BIN)
+install: $(BIN) 
 	gzip -c $(BIN) > ../Acess2.$(ARCH).gz
 	$(xCP) ../Acess2.$(ARCH).gz $(DISTROOT)
 
@@ -62,9 +62,11 @@ 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
+	$(DISASM) -S $(BIN) > $(BIN).dsm
 	@wc -l $(SRCFILES) include/*.h > LineCounts.$(ARCH).txt
-	@echo BUILD_NUM = `calc $(BUILD_NUM)+1` > Makefile.BuildNum
+	@echo BUILD_NUM = $$(( $(BUILD_NUM) + 1 )) > Makefile.BuildNum.$(ARCH)
+	$(POSTBUILD)
+	@$(STRIP) $(BIN)
 
 %.ao.$(ARCH): %.asm Makefile
 	@echo --- NASM -o $@