From 211242e98a1594f9eb3444c93e2b46c67555c436 Mon Sep 17 00:00:00 2001 From: Vince Weaver Date: Tue, 5 Jan 2021 16:34:36 -0500 Subject: [PATCH] clean up the basic dir to compile again --- Makefile | 15 +++++++++++++++ basic/appleiibot/Makefile | 8 ++++---- basic/deceptive_list/Makefile | 16 +++++++++------- basic/two-liners/Makefile | 8 ++++---- 4 files changed, 32 insertions(+), 15 deletions(-) diff --git a/Makefile b/Makefile index 071fb866..f7f5861b 100644 --- a/Makefile +++ b/Makefile @@ -8,7 +8,22 @@ install: clean: cd asm_routines && make clean + cd basic && make clean + cd basic && make clean + cd combo_disk && make clean + cd compression && make clean + cd demos && make clean + cd disk && make clean + cd docs && make clean + cd ethernet && make clean + cd games && make clean + cd graphics && make clean + cd joystick && make clean + cd linker_scripts && make clean + cd music && make clean + cd textmode && make clean cd utils && make clean + cd vaporlock && make clean rm -f *~ test: diff --git a/basic/appleiibot/Makefile b/basic/appleiibot/Makefile index 5a35f562..d3dc8811 100644 --- a/basic/appleiibot/Makefile +++ b/basic/appleiibot/Makefile @@ -1,7 +1,7 @@ -include ../Makefile.inc +include ../../Makefile.inc -DOS33 = ../dos33fs-utils/dos33 -TOKENIZE = ../asoft_basic-utils/tokenize_asoft +DOS33 = ../../utils/dos33fs-utils/dos33 +TOKENIZE = ../../utils/asoft_basic-utils/tokenize_asoft all: appleiibot.dsk convert_to convert_back convert_qkumba make_boxes convert_vmw @@ -101,7 +101,7 @@ convert_back.o: convert_back.c ### LOAD: load.o - ld65 -o LOAD load.o -C ../linker_scripts/apple2_300.inc + ld65 -o LOAD load.o -C ../../linker_scripts/apple2_300.inc load.o: load.s ca65 -o load.o load.s -l load.lst diff --git a/basic/deceptive_list/Makefile b/basic/deceptive_list/Makefile index 5a92cce3..f2aefd5c 100644 --- a/basic/deceptive_list/Makefile +++ b/basic/deceptive_list/Makefile @@ -1,14 +1,16 @@ -DOS33 = ../dos33fs-utils/dos33 -TXT2BAS = ../asoft_basic-utils/tokenize_asoft +DOS33 = ../../utils/dos33fs-utils/dos33 +TXT2BAS = ../../utils/asoft_basic-utils/tokenize_asoft all: deceptive.dsk -BACKWARD.BAS: backward.basd - $(TXT2BAS) < backward.basd > BACKWARD.BAS +deceptive.dsk: HIDDEN.BAS + $(DOS33) -y deceptive.dsk SAVE A HIDDEN.BAS + + +HIDDEN.BAS: hidden.basd + $(TXT2BAS) < hidden.basd > HIDDEN.BAS -deceptive.dsk: BACKWARD.BAS - $(DOS33) -y deceptive.dsk SAVE A BACKWARD.BAS clean: - rm -f *~ *.BAS *.SHAPE sound_test.bas shape_test.bas *.lst + rm -f *~ *.BAS *.lst diff --git a/basic/two-liners/Makefile b/basic/two-liners/Makefile index 6ab0c03b..d833ac63 100644 --- a/basic/two-liners/Makefile +++ b/basic/two-liners/Makefile @@ -1,7 +1,7 @@ -include ../Makefile.inc +include ../../Makefile.inc -DOS33 = ../dos33fs-utils/dos33 -TOKENIZE = ../asoft_basic-utils/tokenize_asoft +DOS33 = ../../utils/dos33fs-utils/dos33 +TOKENIZE = ../../utils/asoft_basic-utils/tokenize_asoft all: entropy.dsk @@ -12,7 +12,7 @@ entropy.dsk: ENTROPY ENTROPY.BAS ### ENTROPY: entropy.o - ld65 -o ENTROPY entropy.o -C ../linker_scripts/apple2_c00.inc + ld65 -o ENTROPY entropy.o -C ../../linker_scripts/apple2_c00.inc entropy.o: entropy.s ca65 -o entropy.o entropy.s -l entropy.lst