Added support for dynamic registration of module loaders

[tpg/acess2.git] / Kernel / Makefile

diff --git a/Kernel/Makefile b/Kernel/Makefile
index 9bec844..279f251 100644 (file)
--- a/Kernel/Makefile
+++ b/Kernel/Makefile
@@ -8,20 +8,30 @@
 
 -include arch/$(ARCHDIR)/Makefile
 
+-include Makefile.BuildNum
+
+KERNEL_VERSION = 0.5
+
 MAKEDEP                = $(CC) -M
 
-CPPFLAGS       += -I./include -I./arch/$(ARCHDIR)/include -DARCH=$(ARCH)
+CPPFLAGS       += -I./include -I./arch/$(ARCHDIR)/include
+CPPFLAGS    += -DARCH=$(ARCH) -DARCHDIR=$(ARCHDIR) -DKERNEL_VERSION=$(KERNEL_VERSION) -DBUILD_NUM=$(BUILD_NUM)
 CFLAGS         += -Wall -Werror -O3 -fno-stack-protector -fno-builtin
-ASFLAGS                += -D ARCH=\"$(ARCH)\"
+ASFLAGS                += -D ARCH=\"$(ARCH)\" -D ARCHDIR=\"$(ARCHDIR)\"
 LDFLAGS                += -T arch/$(ARCHDIR)/link.ld
 
+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
 OBJ += $(addprefix vfs/fs/, $(addsuffix .o,$(FILESYSTEMS)))
-OBJ += drv/fifo.o drv/dma.o drv/iocache.o drv/pci.o drv/kb.o drv/vga.o drv/vterm.o
+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 += $(addprefix drv/, $(addsuffix .o,$(DRIVERS)))
 OBJ := $(addsuffix .$(ARCH), $(OBJ))
 MODS += $(addprefix ../Modules/, $(addsuffix .xo.$(ARCH),$(MODULES)))
@@ -33,12 +43,15 @@ DEPFILES := $(DEPFILES:%.o.$(ARCH)=%.d.$(ARCH))
 SRCFILES  = $(OBJ:%.o.$(ARCH)=%.c)
 SRCFILES := $(SRCFILES:%.ao.$(ARCH)=%.asm)
 
-.PHONY: all clean apidoc
+.PHONY: all clean install apidoc
 
 all: $(BIN)
 
 clean:
-       @$(RM) $(BIN) $(OBJ) $(DEPFILES)
+       @$(RM) $(BIN) $(BIN).dsm ../Map.$(ARCH).txt LineCounts.$(ARCH).txt $(OBJ) $(DEPFILES)
+
+install: $(BIN)
+       $(xCP) $(BIN) $(DISTROOT)
 
 apidoc:
        doxygen Doxyfile.api
@@ -46,10 +59,9 @@ apidoc:
 $(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 > $(BIN).dsm
-       cp $(BIN) $(DISTROOT)
+       @objdump $(BIN) -D -S > $(BIN).dsm
        @wc -l $(SRCFILES) > LineCounts.$(ARCH).txt
-#      @git commit -a
+       @echo BUILD_NUM = `calc $(BUILD_NUM)+1` > Makefile.BuildNum
 
 %.ao.$(ARCH): %.asm Makefile
        @echo --- NASM -o $@
@@ -72,5 +84,7 @@ include/syscalls.h:   syscalls.lst Makefile
 
 Makefile:      ../Makefile.cfg arch/$(ARCHDIR)/Makefile
 
+drv/proc.o.%: Makefile.BuildNum
+
 # Dependency Files
 -include $(DEPFILES)