Mercurial > hg > Members > kono > nitros9-code
changeset 3039:66963ae41cb6
makefiles: Use 3RDPARTY variable consistently
It is set in rules.mak and was used some places.
Also use the LEVEL2 variable in the arcadepak makefile.
| author | Tormod Volden <debian.tormod@gmail.com> |
|---|---|
| date | Wed, 21 Jan 2015 18:38:54 +0100 |
| parents | c6eafb074443 |
| children | 3f25a36416a3 |
| files | 3rdparty/customboots/boisy/makefile 3rdparty/packages/arcadepak/makefile level1/atari/cmds/makefile level1/coco1/cmds/makefile level2/coco3/cmds/makefile level3/coco3/cmds/makefile |
| diffstat | 6 files changed, 11 insertions(+), 11 deletions(-) [+] |
line wrap: on
line diff
--- a/3rdparty/customboots/boisy/makefile Thu Jan 22 00:05:11 2015 -0700 +++ b/3rdparty/customboots/boisy/makefile Wed Jan 21 18:38:54 2015 +0100 @@ -3,11 +3,11 @@ include $(NITROS9DIR)/rules.mak -vpath %.asm ../../../utils/boisy:..:$(LEVEL2)/cmds:$(LEVEL1)/cmds:$(LEVEL1)/modules:$(NITROS9DIR)/3rdparty/packages/basic09 +vpath %.asm ../../../utils/boisy:..:$(LEVEL2)/cmds:$(LEVEL1)/cmds:$(LEVEL1)/modules:$(3RDPARTY)/packages/basic09 AFLAGS += -aNoTerm=1 -acoco3=1 -LFLAGS += -y -l=$(NITROS9DIR)/3rdparty/libs/alib/alib.l -l=$(NITROS9DIR)/lib/sys6809l2.l +LFLAGS += -y -l=$(3RDPARTY)/libs/alib/alib.l -l=$(NITROS9DIR)/lib/sys6809l2.l 3PDW68 = $(3RDPARTY)/packages/drivewire/6809l2 3PBOISY = $(3RDPARTY)/utils/boisy
--- a/3rdparty/packages/arcadepak/makefile Thu Jan 22 00:05:11 2015 -0700 +++ b/3rdparty/packages/arcadepak/makefile Wed Jan 21 18:38:54 2015 +0100 @@ -1,6 +1,6 @@ include $(NITROS9DIR)/rules.mak -6809L2 = $(NITROS9DIR)/level2/coco3 +6809L2 = $(LEVEL2)/coco3 DEPENDS = ./makefile CMD = $(6809L2)/cmds
--- a/level1/atari/cmds/makefile Thu Jan 22 00:05:11 2015 -0700 +++ b/level1/atari/cmds/makefile Wed Jan 21 18:38:54 2015 +0100 @@ -1,11 +1,11 @@ include ../port.mak vpath %.as $(LEVEL1)/cmds -vpath %.asm $(LEVEL1)/cmds:$(NITROS9DIR)/3rdparty/packages/basic09 +vpath %.asm $(LEVEL1)/cmds:$(3RDPARTY)/packages/basic09 DEPENDS = ./makefile -AFLAGS += --includedir=$(NITROS9DIR)/3rdparty/packages/basic09 +AFLAGS += --includedir=$(3RDPARTY)/packages/basic09 LFLAGS += -L $(NITROS9DIR)/lib -lnet -latari -lalib BASIC09FILES = basic09.asm runb.asm gfx.asm inkey.asm syscall.asm
--- a/level1/coco1/cmds/makefile Thu Jan 22 00:05:11 2015 -0700 +++ b/level1/coco1/cmds/makefile Wed Jan 21 18:38:54 2015 +0100 @@ -1,11 +1,11 @@ include ../port.mak vpath %.as $(LEVEL1)/cmds -vpath %.asm $(LEVEL1)/cmds:$(NITROS9DIR)/3rdparty/packages/basic09 +vpath %.asm $(LEVEL1)/cmds:$(3RDPARTY)/packages/basic09 DEPENDS = ./makefile -AFLAGS += --includedir=$(NITROS9DIR)/3rdparty/packages/basic09 +AFLAGS += --includedir=$(3RDPARTY)/packages/basic09 LFLAGS += -L $(NITROS9DIR)/lib -lnet -lcoco -lalib BASIC09FILES = basic09.asm runb.asm gfx.asm inkey.asm syscall.asm
--- a/level2/coco3/cmds/makefile Thu Jan 22 00:05:11 2015 -0700 +++ b/level2/coco3/cmds/makefile Wed Jan 21 18:38:54 2015 +0100 @@ -2,10 +2,10 @@ include $(NITROS9DIR)/rules.mak vpath %.as $(LEVEL2)/cmds:$(LEVEL1)/cmds -vpath %.asm $(LEVEL2)/cmds:$(LEVEL1)/cmds:$(NITROS9DIR)/3rdparty/packages/basic09 +vpath %.asm $(LEVEL2)/cmds:$(LEVEL1)/cmds:$(3RDPARTY)/packages/basic09 DEPENDS = ./makefile -AFLAGS += --includedir=$(NITROS9DIR)/3rdparty/packages/basic09 +AFLAGS += --includedir=$(3RDPARTY)/packages/basic09 LFLAGS += -L$(NITROS9DIR)/lib ifdef H6309 LFLAGS += -lcoco3_6309
--- a/level3/coco3/cmds/makefile Thu Jan 22 00:05:11 2015 -0700 +++ b/level3/coco3/cmds/makefile Wed Jan 21 18:38:54 2015 +0100 @@ -1,10 +1,10 @@ PORT = coco3 include $(NITROS9DIR)/rules.mak -vpath %.asm $(LEVEL3)/cmds:$(LEVEL2)/cmds:$(LEVEL1)/cmds:$(NITROS9DIR)/3rdparty/packages/basic09 +vpath %.asm $(LEVEL3)/cmds:$(LEVEL2)/cmds:$(LEVEL1)/cmds:$(3RDPARTY)/packages/basic09 DEPENDS = ./makefile -AFLAGS += -I=$(NITROS9DIR)/3rdparty/packages/basic09 +AFLAGS += -I=$(3RDPARTY)/packages/basic09 CMDS = asm attr backup binex build cmp cobbler copy cputype \ date dcheck debug ded deiniz del deldir devs dir dirsort disasm \