roms: move abc80/asmsrc to asmsrc/abc80 so it can be used for 800 too

rv32/Makefile

@@ -1,6 +1,6 @@
 MAKEFLAGS += -R -r
 
-ASMDIRS  := roms/abc80/asmsrc
+ASMDIRS  := roms/asmsrc
 SUBDIRS  := include test roms fatfs/source zlib $(ROMDIRS)
 
 CROSS	  = ../tools/gnu/bin/riscv32-unknown-elf-

rv32/roms/abc80/asmsrc/Makefile → rv32/roms/asmsrc/Makefile

@@ -6,24 +6,25 @@ Z80ASM      = z80asm		# Get rid of these...
 PERL        = perl
 
 Z80_CPP     = gcc -E -x assembler-with-cpp
-CROSS       = ../../../../tools/gnu/bin/z80-none-elf-
+CROSS       = ../../../tools/gnu/bin/z80-none-elf-
 Z80_AS      = $(CROSS)as
 Z80_LD      = $(CROSS)ld
 Z80_OBJCOPY = $(CROSS)objcopy
 Z80_OBJDUMP = $(CROSS)objdump
 Z80_NM      = $(CROSS)nm
 
-INCLUDE = -I$(O) -I.
+INCLUDE = -I$(O) -I./abc80 -I.
 SFLAGS  = $(INCLUDE) -undef -nostdinc -D__ASSEMBLER__ -D__Z80__
 ASFLAGS = $(INCLUDE) -ahlsgm=$*.lst --no-pad-sections -g
 LDFLAGS =
 
 # Used for make clean
-AUXRAM   = nvram_20k nvram_22k no_nvram
+AUXRAM   = abc80/nvram_20k abc80/nvram_22k abc80/no_nvram
 UFDDOS   = ../$(O)/ufddos80.rom
 PRINT    = ../$(O)/print80_29.rom ../$(O)/print80_30.rom ../$(O)/print80_28.rom
 ROMS     = $(UFDDOS) $(PRINT)
-HDRS     = z80.inc abc80.inc auxram.inc $(O)/nvram.inc print80.inc
+HDRS80   = $(O)/nvram.inc abc80/abc80.inc abc80/auxram.inc abc80/print80.inc
+HDRS     = z80.inc $(HDRS80)
 
 .SUFFIXES:
 
@@ -37,7 +38,7 @@ all:
 all_O: $(ROMS)
 
 # .asm rather than .S to avoid problems on monocase filesystems
-$(O)/%.s: %.asm $(HDRS)
+$(O)/%.s: $(O)/../%.asm $(HDRS)
 	$(Z80_CPP) $(SFLAGS) -o $@ $<
 
 %.o: %.s
@@ -57,7 +58,7 @@ $(O)/%.s: %.asm $(HDRS)
 clean:
 
 spotless: clean
-	$(MAKE) O=* spotless_O
+	$(MAKE) O=*/* spotless_O
 
 spotless_O:
 	rm -f $(ROMS)