X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Kernel%2FMakefile;h=0dee58d03e8bcdc172fb33053cbb21aa532e1f6c;hb=0542d0b19b79f6439ace9c0f9e35ec29a8af91f9;hp=1d0f363fb7a120a0ece9a5c8ef18800e5119117a;hpb=7514bb8053931759b99f77d3f9ad70446b0625ac;p=tpg%2Facess2.git diff --git a/Kernel/Makefile b/Kernel/Makefile index 1d0f363f..0dee58d0 100644 --- a/Kernel/Makefile +++ b/Kernel/Makefile @@ -8,83 +8,123 @@ -include arch/$(ARCHDIR)/Makefile --include Makefile.BuildNum +-include Makefile.BuildNum.$(ARCH) -KERNEL_VERSION = 0.5 +ifeq ($(BUILD_NUM),) +BUILD_NUM = 0 +endif + +KERNEL_VERSION = $(ACESS_VERSION) MAKEDEP = $(CC) -M -CPPFLAGS += -I./include -I./arch/$(ARCHDIR)/include -CPPFLAGS += -DARCH=$(ARCH) -DKERNEL_VERSION=$(KERNEL_VERSION) -DBUILD_NUM=$(BUILD_NUM) -CFLAGS += -Wall -Werror -O3 -fno-stack-protector -fno-builtin -ASFLAGS += -D ARCH=\"$(ARCH)\" -LDFLAGS += -T arch/$(ARCHDIR)/link.ld +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 += -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 endif -OBJ = $(addprefix arch/$(ARCHDIR)/,$(A_OBJ)) -OBJ += heap.o messages.o debug.o modules.o lib.o syscalls.o system.o threads.o drvutil.o -OBJ += binary.o bin/elf.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/fs/root.o vfs/fs/devfs.o +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/proc.o drv/fifo.o drv/dma.o drv/iocache.o drv/pci.o drv/kb.o drv/vga.o drv/vterm.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 +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 := $(OBJ:%$(OBJSUFFIX)=%.dep$(OBJSUFFIX)) -DEPFILES = $(filter %.o.$(ARCH),$(OBJ)) -DEPFILES := $(DEPFILES:%.o.$(ARCH)=%.d.$(ARCH)) +SRCFILES = $(OBJ:$(OBJDIR)%.o$(OBJSUFFIX)=%.c) +SRCFILES := $(SRCFILES:$(OBJDIR)%.ao$(OBJSUFFIX)=%.$(AS_SUFFIX)) -SRCFILES = $(OBJ:%.o.$(ARCH)=%.c) -SRCFILES := $(SRCFILES:%.ao.$(ARCH)=%.asm) +OBJ += $(BUILDINFO_OBJ) .PHONY: all clean install apidoc all: $(BIN) clean: - @$(RM) $(BIN) $(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) $(BUILDINFO_SRC) -install: $(BIN) - $(xCP) $(BIN) $(DISTROOT) +install: $(BIN) + cp $(BIN) $(BIN)_ + $(STRIP) $(BIN)_ + gzip -c $(BIN)_ > ../Acess2.$(ARCH).gz + $(RM) $(BIN)_ + $(xCP) ../Acess2.$(ARCH).gz $(DISTROOT) apidoc: doxygen Doxyfile.api $(BIN): $(OBJ) $(MODS) arch/$(ARCHDIR)/link.ld Makefile @echo --- LD -o $(BIN) - @$(LD) $(LDFLAGS) -o $(BIN) $(OBJ) $(MODS) -Map ../Map.$(ARCH).txt - @objdump $(BIN) -D -S > $(BIN).dsm - @wc -l $(SRCFILES) > LineCounts.$(ARCH).txt - @echo BUILD_NUM = `calc $(BUILD_NUM)+1` > Makefile.BuildNum - -%.ao.$(ARCH): %.asm Makefile - @echo --- NASM -o $@ + @$(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) + +$(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 -%.o.$(ARCH): %.c Makefile +$(OBJDIR)%.o$(OBJSUFFIX): %.c Makefile # if exists %*/Makefile # @make -C %*/ all # else - @echo --- GCC -o $@ + @echo --- CC -o $@ + @mkdir -p $(dir $@) @$(CC) $(CFLAGS) $(CPPFLAGS) -o $@ -c $< - @$(MAKEDEP) $(CPPFLAGS) -MT $@ -o $*.d.$(ARCH) $< + @$(MAKEDEP) $(CPPFLAGS) -MT $@ -o $(OBJDIR)$*.o.dep$(OBJSUFFIX) $< # 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 -drv/proc.o.%: Makefile.BuildNum +$(BUILDINFO_SRC): $(filter-out $(BUILDINFO_OBJ), $(OBJ)) $(MODS) arch/$(ARCHDIR)/link.ld Makefile + @echo "#include " > $@ + @echo "const char gsGitHash[] = \""`git log -n 1 | head -n 1 | awk '{print $$2}'`"\";" >> $@ + @echo "const int giBuildNumber = $(BUILD_NUM);" >> $@ +$(BUILDINFO_OBJ): $(BUILDINFO_SRC) + @echo --- CC -o $@ + @$(CC) $(CFLAGS) $(CPPFLAGS) -o $@ -c $< # Dependency Files -include $(DEPFILES)