X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Kernel%2FMakefile;h=0b79233b3a5584bc1db6a083cf17fdf8bbf5066f;hb=28484b80f5d1e5f9e502f66484ada925ff833891;hp=f76540cb9166d64de0e5d861903be4ca3e3b1e24;hpb=f9c581641afeb556188e84428febd4011e61edc2;p=tpg%2Facess2.git diff --git a/Kernel/Makefile b/Kernel/Makefile index f76540cb..0b79233b 100644 --- a/Kernel/Makefile +++ b/Kernel/Makefile @@ -10,8 +10,8 @@ -include Makefile.BuildNum.$(ARCH) -ifeq ($(BUILDNUM),) -BUILDNUM = 0 +ifeq ($(BUILD_NUM),) +BUILD_NUM = 0 endif KERNEL_VERSION = 0.5 @@ -59,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)) @@ -97,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 @@ -105,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):