X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;ds=inline;f=Kernel%2FMakefile;h=c972ed489b284fe39bfc25fbe9af571a85fb3f43;hb=57c1e8ff3a5e475ff5fe457ede46a4b3598b91f2;hp=f76540cb9166d64de0e5d861903be4ca3e3b1e24;hpb=f9c581641afeb556188e84428febd4011e61edc2;p=tpg%2Facess2.git

diff --git a/Kernel/Makefile b/Kernel/Makefile
index f76540cb..c972ed48 100644
--- a/Kernel/Makefile
+++ b/Kernel/Makefile
@@ -10,19 +10,20 @@
 
 -include Makefile.BuildNum.$(ARCH)
 
-ifeq ($(BUILDNUM),)
-BUILDNUM = 0
+ifeq ($(BUILD_NUM),)
+BUILD_NUM = 0
 endif
 
-KERNEL_VERSION = 0.5
+KERNEL_VERSION = $(ACESS_VERSION)
 
 MAKEDEP		= $(CC) -M
 
 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)
-CFLAGS  	+= -Wall -Werror -fno-stack-protector -fno-builtin -Wstrict-prototypes -g
+CFLAGS  	+= -Wall -fno-stack-protector -Wstrict-prototypes -g
 CFLAGS  	+= -Wshadow -Wpointer-arith -Wcast-align -Wwrite-strings -Wmissing-prototypes -Wmissing-declarations -Wredundant-decls -Wnested-externs -Winline -Wuninitialized
+CFLAGS          += -O3
 LDFLAGS		+= -T arch/$(ARCHDIR)/link.ld -g
 
 OBJDIR := obj-$(ARCH)/
@@ -42,10 +43,9 @@ BUILDINFO_SRC := $(OBJDIR)buildinfo.c$(OBJSUFFIX)
 
 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 += messages.o modules.o syscalls.o system.o
+OBJ += threads.o mutex.o semaphore.o workqueue.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
@@ -59,8 +59,7 @@ MODS += $(addprefix ../Modules/, $(addsuffix .xo.$(ARCH),$(MODULES)))
 BIN = ../Acess2.$(ARCH).bin
 GZBIN = ../Acess2.$(ARCH).gz
 
-DEPFILES  = $(filter %.o$(OBJSUFFIX),$(OBJ))
-DEPFILES := $(DEPFILES:%.o$(OBJSUFFIX)=%.dep$(OBJSUFFIX))
+DEPFILES := $(OBJ:%$(OBJSUFFIX)=%.dep$(OBJSUFFIX))
 
 SRCFILES  = $(OBJ:$(OBJDIR)%.o$(OBJSUFFIX)=%.c)
 SRCFILES := $(SRCFILES:$(OBJDIR)%.ao$(OBJSUFFIX)=%.$(AS_SUFFIX))
@@ -97,6 +96,9 @@ $(OBJDIR)%.ao$(OBJSUFFIX): %.$(AS_SUFFIX) Makefile
 	@echo --- AS -o $@
 	@mkdir -p $(dir $@)
 	@$(AS) $(ASFLAGS) $< -o $@
+ifeq ($(AS_SUFFIX),S)
+	@$(MAKEDEP) $(CPPFLAGS) -MT $@ -o $(OBJDIR)$*.ao.dep$(OBJSUFFIX) $<
+endif
 
 $(OBJDIR)%.o$(OBJSUFFIX): %.c Makefile
 #	if exists %*/Makefile
@@ -105,7 +107,7 @@ $(OBJDIR)%.o$(OBJSUFFIX): %.c Makefile
 	@echo --- CC -o $@
 	@mkdir -p $(dir $@)
 	@$(CC) $(CFLAGS) $(CPPFLAGS) -o $@ -c $<
-	@$(MAKEDEP) $(CPPFLAGS) -MT $@ -o $(OBJDIR)$*.dep$(OBJSUFFIX) $<
+	@$(MAKEDEP) $(CPPFLAGS) -MT $@ -o $(OBJDIR)$*.o.dep$(OBJSUFFIX) $<
 #	endif
 
 %.xo.$(ARCH):