X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Kernel%2FMakefile;h=900a46e6910f76309b8fbd00a43853811435b733;hb=ae3a0bf446529bfb50eb91a0fb90b72140d9f2ed;hp=bb76c1310f56dac0cf3925dde76e411920a7ddc6;hpb=f830c3b9bc88e968d34ea935e2125674d3a504b0;p=tpg%2Facess2.git

diff --git a/Kernel/Makefile b/Kernel/Makefile
index bb76c131..900a46e6 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 -Werror -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
 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