X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Kernel%2FMakefile;h=225928c39cce38f152c91b6af8a82bcfbe7a2947;hb=6f1c621ed4d24ddbdc863cd5ef684e919c8f8b55;hp=5d48945fe92349dda66a3587f327dd2011246693;hpb=1499c9eb8aa167dff5354a25c5a5bd2d00672a54;p=tpg%2Facess2.git diff --git a/Kernel/Makefile b/Kernel/Makefile index 5d48945f..225928c3 100644 --- a/Kernel/Makefile +++ b/Kernel/Makefile @@ -8,7 +8,7 @@ -include arch/$(ARCHDIR)/Makefile --include Makefile.BuildNum +-include Makefile.BuildNum.$(ARCH) KERNEL_VERSION = 0.5 @@ -16,7 +16,7 @@ MAKEDEP = $(CC) -M 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 +CFLAGS += -Wall -Werror -O3 -fno-stack-protector -fno-builtin -Wstrict-prototypes ASFLAGS += -D ARCH=\"$(ARCH)\" -D ARCHDIR=\"$(ARCHDIR)\" LDFLAGS += -T arch/$(ARCHDIR)/link.ld @@ -62,9 +62,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 -S > $(BIN).dsm + $(DISASM) $(BIN) > $(BIN).dsm @wc -l $(SRCFILES) include/*.h > LineCounts.$(ARCH).txt - @echo BUILD_NUM = `calc $(BUILD_NUM)+1` > Makefile.BuildNum + @echo BUILD_NUM = $$(( $(BUILD_NUM) + 1 )) > Makefile.BuildNum.$(ARCH) %.ao.$(ARCH): %.asm Makefile @echo --- NASM -o $@