X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Kernel%2FMakefile;h=48a2c9f44ede30a2154be30dc527bc8aafcb1dbd;hb=7009aab6b04807e085c7e218965e1e8000a2bbbe;hp=2b2d96ffa63ca221baf3227b7f728f1f3dbd1ae6;hpb=337657367b698fab96222708a09a310490a725dd;p=tpg%2Facess2.git

diff --git a/Kernel/Makefile b/Kernel/Makefile
index 2b2d96ff..48a2c9f4 100644
--- a/Kernel/Makefile
+++ b/Kernel/Makefile
@@ -21,25 +21,25 @@ ifeq ($(AS_SUFFIX),)
 	AS_SUFFIX = S
 endif
 
-ASFLAGS         += -D ARCHDIR_IS_$(ARCHDIR)=1 -DCONFIG_is_$(CONFIG)=1
+ASFLAGS         += -D ARCHDIR_IS_$(ARCHDIR)=1 -D PLATFORM_is_$(PLATFORM)=1
 CPPFLAGS	+= -I./include -I./arch/$(ARCHDIR)/include -D_MODULE_NAME_=\"Kernel\"
-CPPFLAGS	+= -DARCH=$(ARCH) -DARCHDIR=$(ARCHDIR) -DARCHDIR_IS_$(ARCHDIR)=1 -DCONFIG_is_$(CONFIG)=1
-CPPFLAGS	+= -DKERNEL_VERSION=$(KERNEL_VERSION)
+CPPFLAGS	+= -D ARCH=$(ARCH) -D ARCHDIR=$(ARCHDIR) -D PLATFORM=\"$(PLATFORM)\" -D ARCHDIR_IS_$(ARCHDIR)=1 -D PLATFORM_is_$(PLATFORM)=1
+CPPFLAGS	+= -D KERNEL_VERSION=$(KERNEL_VERSION)
 CFLAGS  	+= -Wall -fno-stack-protector -Wstrict-prototypes -g
 CFLAGS  	+= -Wshadow -Wpointer-arith -Wcast-align -Wwrite-strings -Wmissing-prototypes -Wmissing-declarations -Wredundant-decls -Wnested-externs -Winline -Wuninitialized
 CFLAGS          += -O3
 LDFLAGS		+= -T arch/$(ARCHDIR)/link.ld -g
 
-ifeq ($(CONFIG),default)
+ifeq ($(PLATFORM),default)
 	OBJDIR := obj-$(ARCH)/
 	#OBJSUFFIX := .$(ARCH)
 	BIN := ../Acess2.$(ARCH).bin
 	GZBIN := ../Acess2.$(ARCH).gz
 else
-	OBJDIR := obj-$(ARCH)-$(CONFIG)/
-	#OBJSUFFIX := .$(ARCH)-$(CONFIG)
-	BIN := ../Acess2.$(ARCH)-$(CONFIG).bin
-	GZBIN := ../Acess2.$(ARCH)-$(CONFIG).gz
+	OBJDIR := obj-$(ARCH)-$(PLATFORM)/
+	#OBJSUFFIX := .$(ARCH)-$(PLATFORM)
+	BIN := ../Acess2.$(ARCH)-$(PLATFORM).bin
+	GZBIN := ../Acess2.$(ARCH)-$(PLATFORM).gz
 endif
 
 ifeq ($(DEBUG_BUILD),yes)
@@ -84,9 +84,9 @@ clean:
 install: $(BIN) 
 	cp $(BIN) $(BIN)_
 	$(STRIP) $(BIN)_
-	gzip -c $(BIN)_ > ../Acess2.$(ARCH).gz
+	gzip -c $(BIN)_ > $(GZBIN)
 	$(RM) $(BIN)_
-	$(xCP) ../Acess2.$(ARCH).gz $(DISTROOT)
+	$(xCP) $(GZBIN) $(DISTROOT)
 
 apidoc:
 	doxygen Doxyfile.api
@@ -94,7 +94,7 @@ apidoc:
 $(BIN): $(OBJ) $(MODS) arch/$(ARCHDIR)/link.ld Makefile
 	@echo --- LD -o $(BIN)
 	@$(LD) $(LDFLAGS) -o $(BIN) $(OBJ) $(MODS) --defsym __buildnum=$$(( $(BUILD_NUM) + 1 )) -Map ../Map.$(ARCH).txt
-	$(DISASM) -S $(BIN) > $(BIN).dsm
+	@$(DISASM) -S $(BIN) > $(BIN).dsm
 	@wc -l $(SRCFILES) include/*.h > LineCounts.$(ARCH).txt
 	@echo BUILD_NUM = $$(( $(BUILD_NUM) + 1 )) > Makefile.BuildNum.$(ARCH)
 	$(POSTBUILD)