X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Kernel%2FMakefile;h=65527f621a7a65e3da2c996c90f3f9bd58b02038;hb=df1d534cfe822903fc38e1cc13c4b18941c91908;hp=efd5e057bbf541b6ac0e27ee6d3c52bc86f1f078;hpb=6a945643557084578509e149c84cf5dde3c59c3c;p=tpg%2Facess2.git

diff --git a/Kernel/Makefile b/Kernel/Makefile
index efd5e057..65527f62 100644
--- a/Kernel/Makefile
+++ b/Kernel/Makefile
@@ -15,23 +15,30 @@ KERNEL_VERSION = 0.5
 MAKEDEP		= $(CC) -M
 
 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 -Wstrict-prototypes
-ASFLAGS		+= -D ARCH=\"$(ARCH)\" -D ARCHDIR=\"$(ARCHDIR)\"
-LDFLAGS		+= -T arch/$(ARCHDIR)/link.ld
+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/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/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 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
+OBJ += vfs/memfile.o vfs/nodecache.o vfs/handle.o vfs/select.o
 OBJ += vfs/fs/root.o vfs/fs/devfs.o
 OBJ += $(addprefix drv/, $(addsuffix .o,$(DRIVERS)))
 OBJ := $(addsuffix .$(ARCH), $(OBJ))
@@ -43,7 +50,7 @@ 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
 
@@ -52,8 +59,11 @@ all: $(BIN)
 clean:
 	@$(RM) $(BIN) ../Acess2.$(ARCH).gz $(BIN).dsm ../Map.$(ARCH).txt LineCounts.$(ARCH).txt $(OBJ) $(DEPFILES)
 
-install: $(BIN)
-	gzip -c $(BIN) > ../Acess2.$(ARCH).gz
+install: $(BIN) 
+	cp $(BIN) $(BIN)_
+	$(STRIP) $(BIN)_
+	gzip -c $(BIN)_ > ../Acess2.$(ARCH).gz
+	$(RM) $(BIN)_
 	$(xCP) ../Acess2.$(ARCH).gz $(DISTROOT)
 
 apidoc:
@@ -62,28 +72,30 @@ apidoc:
 $(BIN): $(OBJ) $(MODS) arch/$(ARCHDIR)/link.ld Makefile
 	@echo --- LD -o $(BIN)
 	@$(LD) $(LDFLAGS) -o $(BIN) $(OBJ) $(MODS) -Map ../Map.$(ARCH).txt
-	$(DISASM) $(BIN) > $(BIN).dsm
+	$(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): %.asm Makefile
-	@echo --- NASM -o $@
+%.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