X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Kernel%2FMakefile;h=14bae50787b6031899b83196f81d4660caa7c65e;hb=5e9042e320d0a24d1691bcd6845936879238e812;hp=3ae93776b27cc1116923f0b7d4d299e9fae2d809;hpb=7b879312a32ee8ccc929c372c54feade7aa1d7cd;p=tpg%2Facess2.git diff --git a/Kernel/Makefile b/Kernel/Makefile index 3ae93776..14bae507 100644 --- a/Kernel/Makefile +++ b/Kernel/Makefile @@ -30,9 +30,12 @@ ifeq ($(DEBUG_BUILD),yes) endif ifeq ($(AS_SUFFIX),) - AS_SUFFIX = s + 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 @@ -58,13 +61,15 @@ DEPFILES := $(DEPFILES:%.o$(OBJSUFFIX)=%.dep$(OBJSUFFIX)) SRCFILES = $(OBJ:$(OBJDIR)%.o$(OBJSUFFIX)=%.c) SRCFILES := $(SRCFILES:$(OBJDIR)%.ao$(OBJSUFFIX)=%.$(AS_SUFFIX)) +OBJ += $(BUILDINFO_OBJ) + .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 -r $(OBJDIR) $(OBJ) $(DEPFILES) + @$(RM) $(BIN) ../Acess2.$(ARCH).gz $(BIN).dsm ../Map.$(ARCH).txt LineCounts.$(ARCH).txt -r $(OBJDIR) $(OBJ) $(DEPFILES) $(BUILDINFO_SRC) install: $(BIN) cp $(BIN) $(BIN)_ @@ -107,8 +112,12 @@ include/syscalls.h include/syscalls.inc.asm: syscalls.lst Makefile GenSyscalls.p Makefile: ../Makefile.cfg arch/$(ARCHDIR)/Makefile -# HACK - Rebuild proc when the buildnum changes -#$(OBJDIR)drv/proc.o$(OBJSUFFIX): Makefile.BuildNum.$(ARCH) +.PHONY: $(BUILDINFO_SRC) +$(BUILDINFO_SRC): + @echo "const char * const gsGitHash = \""`git log -n 1 | head -n 1 | awk '{print $$1}'`"\";" > $@ + @echo "const int giBuildNumber = $(BUILD_NUM);" >> $@ +$(BUILDINFO_OBJ): $(BUILDINFO_SRC) + @$(CC) $(CFLAGS) $(CPPFLAGS) -o $@ -c $< # Dependency Files -include $(DEPFILES)