X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Kernel%2FMakefile;h=3ae93776b27cc1116923f0b7d4d299e9fae2d809;hb=afe31a49af11cf83b48947de018a5ac147835762;hp=10391b85f06ae1e2e4217b5d26bcf06bfda24dbc;hpb=9c61cf12758c0977ee1dc5791cba638fd3437ba6;p=tpg%2Facess2.git

diff --git a/Kernel/Makefile b/Kernel/Makefile
index 10391b85..3ae93776 100644
--- a/Kernel/Makefile
+++ b/Kernel/Makefile
@@ -15,11 +15,15 @@ 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)
+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  	+= -Wshadow -Wpointer-arith -Wcast-align -Wwrite-strings -Wmissing-prototypes -Wmissing-declarations -Wredundant-decls -Wnested-externs -Winline -Wuninitialized
 LDFLAGS		+= -T arch/$(ARCHDIR)/link.ld -g
 
+OBJDIR := obj-$(ARCH)/
+#OBJSUFFIX := .$(ARCH)
+
 ifeq ($(DEBUG_BUILD),yes)
 	LDFLAGS += -g
 	CFLAGS += -g
@@ -33,30 +37,34 @@ 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 drv/vga.o
-#OBJ += drv/kb.o drv/dma.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
+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))
+
+OBJ := $(addsuffix $(OBJSUFFIX), $(OBJ))
+OBJ := $(addprefix $(OBJDIR), $(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))
+DEPFILES  = $(filter %.o$(OBJSUFFIX),$(OBJ))
+DEPFILES := $(DEPFILES:%.o$(OBJSUFFIX)=%.dep$(OBJSUFFIX))
 
-SRCFILES  = $(OBJ:%.o.$(ARCH)=%.c)
-SRCFILES := $(SRCFILES:%.ao.$(ARCH)=%.$(AS_SUFFIX))
+SRCFILES  = $(OBJ:$(OBJDIR)%.o$(OBJSUFFIX)=%.c)
+SRCFILES := $(SRCFILES:$(OBJDIR)%.ao$(OBJSUFFIX)=%.$(AS_SUFFIX))
 
 .PHONY: all clean install apidoc
 
 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 $(OBJ) $(DEPFILES)
+	@$(RM) $(BIN) ../Acess2.$(ARCH).gz $(BIN).dsm ../Map.$(ARCH).txt LineCounts.$(ARCH).txt -r $(OBJDIR) $(OBJ) $(DEPFILES)
 
 install: $(BIN) 
 	cp $(BIN) $(BIN)_
@@ -70,24 +78,25 @@ apidoc:
 
 $(BIN): $(OBJ) $(MODS) arch/$(ARCHDIR)/link.ld Makefile
 	@echo --- LD -o $(BIN)
-	@$(LD) $(LDFLAGS) -o $(BIN) $(OBJ) $(MODS) -Map ../Map.$(ARCH).txt
+	@$(LD) $(LDFLAGS) -o $(BIN) $(OBJ) $(MODS) --defsym __buildnum=$$(( $(BUILD_NUM) + 1 )) -Map ../Map.$(ARCH).txt
 	$(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
+$(OBJDIR)%.ao$(OBJSUFFIX): %.$(AS_SUFFIX) Makefile
 	@echo --- AS -o $@
+	@mkdir -p $(dir $@)
 	@$(AS) $(ASFLAGS) $< -o $@
 
-%.o.$(ARCH): %.c Makefile
+$(OBJDIR)%.o$(OBJSUFFIX): %.c Makefile
 #	if exists %*/Makefile
 #	@make -C %*/ all
 #	else
 	@echo --- CC -o $@
+	@mkdir -p $(dir $@)
 	@$(CC) $(CFLAGS) $(CPPFLAGS) -o $@ -c $<
-	@$(MAKEDEP) $(CPPFLAGS) -MT $@ -o $*.d.$(ARCH) $<
+	@$(MAKEDEP) $(CPPFLAGS) -MT $@ -o $(OBJDIR)$*.dep$(OBJSUFFIX) $<
 #	endif
 
 %.xo.$(ARCH):
@@ -98,7 +107,8 @@ include/syscalls.h include/syscalls.inc.asm:	syscalls.lst Makefile GenSyscalls.p
 
 Makefile:	../Makefile.cfg arch/$(ARCHDIR)/Makefile
 
-drv/proc.o.%: Makefile.BuildNum
+# HACK - Rebuild proc when the buildnum changes
+#$(OBJDIR)drv/proc.o$(OBJSUFFIX): Makefile.BuildNum.$(ARCH)
 
 # Dependency Files
 -include $(DEPFILES)