X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Kernel%2FMakefile;h=8818890903367cf283f9c62c419b16a03740f6e0;hb=refs%2Ftags%2Frel0.10;hp=10c63ff3d9854f2a6b2c97140d9f092f35bbd94c;hpb=c7c5c4dbeb7b298675856eebb36084c92e989d98;p=tpg%2Facess2.git

diff --git a/Kernel/Makefile b/Kernel/Makefile
index 10c63ff3..88188909 100644
--- a/Kernel/Makefile
+++ b/Kernel/Makefile
@@ -8,45 +8,63 @@
 
 -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) -DKERNEL_VERSION=$(KERNEL_VERSION) -DBUILD_NUM=$(BUILD_NUM)
-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 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
+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
+
+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/proc.o drv/fifo.o drv/dma.o drv/iocache.o drv/pci.o drv/kb.o drv/vga.o drv/vterm.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 .xo.$(ARCH),$(MODULES)))
 BIN = ../Acess2.$(ARCH).bin
+GZBIN = ../Acess2.$(ARCH).gz
 
 DEPFILES  = $(filter %.o.$(ARCH),$(OBJ))
 DEPFILES := $(DEPFILES:%.o.$(ARCH)=%.d.$(ARCH))
 
 SRCFILES  = $(OBJ:%.o.$(ARCH)=%.c)
-SRCFILES := $(SRCFILES:%.ao.$(ARCH)=%.asm)
+SRCFILES := $(SRCFILES:%.ao.$(ARCH)=%.$(AS_SUFFIX))
 
 .PHONY: all clean install apidoc
 
 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)
+install: $(BIN) 
+	cp $(BIN) $(BIN)_
+	$(STRIP) $(BIN)_
+	gzip -c $(BIN)_ > ../Acess2.$(ARCH).gz
+	$(RM) $(BIN)_
+	$(xCP) ../Acess2.$(ARCH).gz $(DISTROOT)
 
 apidoc:
 	doxygen Doxyfile.api
@@ -54,30 +72,34 @@ 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 > $(BIN).dsm
-	@wc -l $(SRCFILES) > LineCounts.$(ARCH).txt
-	@echo BUILD_NUM = `calc $(BUILD_NUM)+1` > Makefile.BuildNum
-
-%.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)
+
+%.ao.$(ARCH): %.$(AS_SUFFIX) Makefile
+	@echo --- AS -o $@
 	@$(AS) $(ASFLAGS) $< -o $@
 
 %.o.$(ARCH): %.c Makefile
 #	if exists %*/Makefile
 #	@make -C %*/ all
 #	else
-	@echo --- GCC -o $@
+	@echo --- CC -o $@
 	@$(CC) $(CFLAGS) $(CPPFLAGS) -o $@ -c $<
 	@$(MAKEDEP) $(CPPFLAGS) -MT $@ -o $*.d.$(ARCH) $<
 #	endif
 
 %.xo.$(ARCH):
-	@make -C $* all
+	@BUILDTYPE=static make -C $* all
 
-include/syscalls.h:	syscalls.lst Makefile
-	php GenSyscalls.php
+include/syscalls.h include/syscalls.inc.asm:	syscalls.lst Makefile GenSyscalls.pl
+	perl GenSyscalls.pl
 
 Makefile:	../Makefile.cfg arch/$(ARCHDIR)/Makefile
 
+drv/proc.o.%: Makefile.BuildNum
+
 # Dependency Files
 -include $(DEPFILES)