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

diff --git a/Kernel/Makefile b/Kernel/Makefile
index bb76c131..d0c8dbf6 100644
--- a/Kernel/Makefile
+++ b/Kernel/Makefile
@@ -10,42 +10,52 @@
 
 -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
 
+ifeq ($(AS_SUFFIX),)
+	AS_SUFFIX = S
+endif
+
+ASFLAGS         += -D ARCHDIR_IS_$(ARCHDIR)=1 -D PLATFORM_is_$(PLATFORM)=1
 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
+CPPFLAGS	+= -D ARCH=$(ARCH) -D ARCHDIR=$(ARCHDIR) -D PLATFORM=\"$(PLATFORM)\" -D ARCHDIR_IS_$(ARCHDIR)=1 -D PLATFORM_is_$(PLATFORM)=1
+CPPFLAGS	+= -D KERNEL_VERSION=$(KERNEL_VERSION)
+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)/
-#OBJSUFFIX := .$(ARCH)
+ifeq ($(PLATFORM),default)
+	OBJDIR := obj-$(ARCH)/
+	#OBJSUFFIX := .$(ARCH)
+	BIN := ../Acess2.$(ARCH).bin
+	GZBIN := ../Acess2.$(ARCH).gz
+else
+	OBJDIR := obj-$(ARCH)-$(PLATFORM)/
+	#OBJSUFFIX := .$(ARCH)-$(PLATFORM)
+	BIN := ../Acess2.$(ARCH)-$(PLATFORM).bin
+	GZBIN := ../Acess2.$(ARCH)-$(PLATFORM).gz
+endif
 
 ifeq ($(DEBUG_BUILD),yes)
 	LDFLAGS += -g
 	CFLAGS += -g
 endif
 
-ifeq ($(AS_SUFFIX),)
-	AS_SUFFIX = S
-endif
-
 BUILDINFO_OBJ := $(OBJDIR)buildinfo.o$(OBJSUFFIX)
 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 += 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 += messages.o modules.o syscalls.o system.o
+OBJ += threads.o mutex.o semaphore.o workqueue.o events.o
+OBJ += drv/proc.o drv/fifo.o drv/iocache.o drv/pci.o
+OBJ += drv/vterm.o drv/vterm_font.o drv/vterm_vt100.o drv/vterm_output.o drv/vterm_input.o drv/vterm_termbuf.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
@@ -56,8 +66,6 @@ OBJ := $(addsuffix $(OBJSUFFIX), $(OBJ))
 OBJ := $(addprefix $(OBJDIR), $(OBJ))
 
 MODS += $(addprefix ../Modules/, $(addsuffix .xo.$(ARCH),$(MODULES)))
-BIN = ../Acess2.$(ARCH).bin
-GZBIN = ../Acess2.$(ARCH).gz
 
 DEPFILES := $(OBJ:%$(OBJSUFFIX)=%.dep$(OBJSUFFIX))
 
@@ -71,23 +79,23 @@ OBJ += $(BUILDINFO_OBJ)
 all: $(BIN)
 
 clean:
-#	$(RM) $(BIN) ../Acess2.$(ARCH).gz $(BIN).dsm ../Map.$(ARCH).txt LineCounts.$(ARCH).txt $(OBJ) $(DEPFILES)
-	@$(RM) $(BIN) ../Acess2.$(ARCH).gz $(BIN).dsm ../Map.$(ARCH).txt LineCounts.$(ARCH).txt -r $(OBJDIR) $(OBJ) $(DEPFILES) $(BUILDINFO_SRC)
+	@$(RM) $(BIN) ../Acess2.$(ARCH).gz $(BIN).dsm ../Map.$(ARCH).txt LineCounts.$(ARCH).txt
+	@$(RM) -r $(OBJDIR) $(OBJ) $(DEPFILES) $(BUILDINFO_SRC)
 
 install: $(BIN) 
-	cp $(BIN) $(BIN)_
-	$(STRIP) $(BIN)_
-	gzip -c $(BIN)_ > ../Acess2.$(ARCH).gz
-	$(RM) $(BIN)_
-	$(xCP) ../Acess2.$(ARCH).gz $(DISTROOT)
+	@cp $(BIN) $(BIN)_
+	@$(STRIP) $(BIN)_
+	@gzip -c $(BIN)_ > $(GZBIN)
+	@$(RM) $(BIN)_
+	$(xCP) $(GZBIN) $(DISTROOT)
 
 apidoc:
 	doxygen Doxyfile.api
 
-$(BIN): $(OBJ) $(MODS) arch/$(ARCHDIR)/link.ld Makefile
+$(BIN): $(OBJ) $(MODS) arch/$(ARCHDIR)/link.ld Makefile ../BuildConf/$(ARCH)/Makefile.cfg ../BuildConf/$(ARCH)/$(PLATFORM).mk
 	@echo --- LD -o $(BIN)
 	@$(LD) $(LDFLAGS) -o $(BIN) $(OBJ) $(MODS) --defsym __buildnum=$$(( $(BUILD_NUM) + 1 )) -Map ../Map.$(ARCH).txt
-	$(DISASM) -S $(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)