Kernel - Fixing bugs

[tpg/acess2.git] / Kernel / Makefile

diff --git a/Kernel/Makefile b/Kernel/Makefile
index 14bae50..bb76c13 100644 (file)
--- a/Kernel/Makefile
+++ b/Kernel/Makefile
@@ -10,6 +10,10 @@
 
 -include Makefile.BuildNum.$(ARCH)
 
+ifeq ($(BUILDNUM),)
+BUILDNUM = 0
+endif
+
 KERNEL_VERSION = 0.5
 
 MAKEDEP                = $(CC) -M
@@ -55,8 +59,7 @@ MODS += $(addprefix ../Modules/, $(addsuffix .xo.$(ARCH),$(MODULES)))
 BIN = ../Acess2.$(ARCH).bin
 GZBIN = ../Acess2.$(ARCH).gz
 
-DEPFILES  = $(filter %.o$(OBJSUFFIX),$(OBJ))
-DEPFILES := $(DEPFILES:%.o$(OBJSUFFIX)=%.dep$(OBJSUFFIX))
+DEPFILES := $(OBJ:%$(OBJSUFFIX)=%.dep$(OBJSUFFIX))
 
 SRCFILES  = $(OBJ:$(OBJDIR)%.o$(OBJSUFFIX)=%.c)
 SRCFILES := $(SRCFILES:$(OBJDIR)%.ao$(OBJSUFFIX)=%.$(AS_SUFFIX))
@@ -93,6 +96,9 @@ $(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
 
 $(OBJDIR)%.o$(OBJSUFFIX): %.c Makefile
 #      if exists %*/Makefile
@@ -101,7 +107,7 @@ $(OBJDIR)%.o$(OBJSUFFIX): %.c Makefile
        @echo --- CC -o $@
        @mkdir -p $(dir $@)
        @$(CC) $(CFLAGS) $(CPPFLAGS) -o $@ -c $<
-       @$(MAKEDEP) $(CPPFLAGS) -MT $@ -o $(OBJDIR)$*.dep$(OBJSUFFIX) $<
+       @$(MAKEDEP) $(CPPFLAGS) -MT $@ -o $(OBJDIR)$*.o.dep$(OBJSUFFIX) $<
 #      endif
 
 %.xo.$(ARCH):
@@ -112,11 +118,12 @@ include/syscalls.h include/syscalls.inc.asm:      syscalls.lst Makefile GenSyscalls.p
 
 Makefile:      ../Makefile.cfg arch/$(ARCHDIR)/Makefile
 
-.PHONY: $(BUILDINFO_SRC) 
-$(BUILDINFO_SRC): 
-       @echo "const char * const gsGitHash = \""`git log -n 1 | head -n 1 | awk '{print $$1}'`"\";" > $@
+$(BUILDINFO_SRC): $(filter-out $(BUILDINFO_OBJ), $(OBJ)) $(MODS) arch/$(ARCHDIR)/link.ld Makefile
+       @echo "#include <acess.h>" > $@
+       @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