Skip to content

Commit

Permalink
(classic) Use := to make things that little bit quicker...
Browse files Browse the repository at this point in the history
  • Loading branch information
suborb committed Oct 14, 2023
1 parent 89956a7 commit 812c498
Show file tree
Hide file tree
Showing 28 changed files with 133 additions and 133 deletions.
8 changes: 4 additions & 4 deletions libsrc/adt/heap/heap.mak
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@

HEAP_CFILES = $(notdir $(wildcard adt/heap/*.c))
HEAP_AFILES = $(notdir $(wildcard adt/heap/*.asm))
HEAP_CFILES := $(notdir $(wildcard adt/heap/*.c))
HEAP_AFILES := $(notdir $(wildcard adt/heap/*.asm))


HEAP_OBJECTS = $(HEAP_CFILES:.c=.o) $(HEAP_AFILES:.asm=.o)
HEAP_OBJECTS := $(HEAP_CFILES:.c=.o) $(HEAP_AFILES:.asm=.o)

HEAP_OBJS = $(addprefix adt/heap/obj/z80/, $(HEAP_OBJECTS)) \
HEAP_OBJS := $(addprefix adt/heap/obj/z80/, $(HEAP_OBJECTS)) \
$(addprefix adt/heap/obj/r2ka/,$(HEAP_OBJECTS)) \
$(addprefix adt/heap/obj/r4k/,$(HEAP_OBJECTS)) \
$(addprefix adt/heap/obj/ixiy/,$(HEAP_OBJECTS)) \
Expand Down
8 changes: 4 additions & 4 deletions libsrc/adt/linkedlist/linkedlist.mak
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@

LINKEDLIST_CFILES = $(notdir $(wildcard adt/linkedlist/*.c))
LINKEDLIST_AFILES = $(notdir $(wildcard adt/linkedlist/*.asm))
LINKEDLIST_CFILES := $(notdir $(wildcard adt/linkedlist/*.c))
LINKEDLIST_AFILES := $(notdir $(wildcard adt/linkedlist/*.asm))


LINKEDLIST_OBJECTS = $(LINKEDLIST_CFILES:.c=.o) $(LINKEDLIST_AFILES:.asm=.o)
LINKEDLIST_OBJECTS := $(LINKEDLIST_CFILES:.c=.o) $(LINKEDLIST_AFILES:.asm=.o)

LINKEDLIST_OBJS = $(addprefix adt/linkedlist/obj/z80/, $(LINKEDLIST_OBJECTS)) \
LINKEDLIST_OBJS := $(addprefix adt/linkedlist/obj/z80/, $(LINKEDLIST_OBJECTS)) \
$(addprefix adt/linkedlist/obj/r2ka/,$(LINKEDLIST_OBJECTS)) \
$(addprefix adt/linkedlist/obj/r4k/,$(LINKEDLIST_OBJECTS)) \
$(addprefix adt/linkedlist/obj/ixiy/,$(LINKEDLIST_OBJECTS)) \
Expand Down
8 changes: 4 additions & 4 deletions libsrc/adt/queue/queue.mak
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@

QUEUE_CFILES = $(notdir $(wildcard adt/queue/*.c))
QUEUE_AFILES = $(notdir $(wildcard adt/queue/*.asm))
QUEUE_CFILES := $(notdir $(wildcard adt/queue/*.c))
QUEUE_AFILES := $(notdir $(wildcard adt/queue/*.asm))


QUEUE_OBJECTS = $(QUEUE_CFILES:.c=.o) $(QUEUE_AFILES:.asm=.o)
QUEUE_OBJECTS := $(QUEUE_CFILES:.c=.o) $(QUEUE_AFILES:.asm=.o)

QUEUE_OBJS = $(addprefix adt/queue/obj/z80/, $(QUEUE_OBJECTS)) \
QUEUE_OBJS := $(addprefix adt/queue/obj/z80/, $(QUEUE_OBJECTS)) \
$(addprefix adt/queue/obj/r2ka/,$(QUEUE_OBJECTS)) \
$(addprefix adt/queue/obj/r4k/,$(QUEUE_OBJECTS)) \
$(addprefix adt/queue/obj/ixiy/,$(QUEUE_OBJECTS)) \
Expand Down
8 changes: 4 additions & 4 deletions libsrc/adt/stack/stack.mak
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@

STACK_CFILES = $(notdir $(wildcard adt/stack/*.c))
STACK_AFILES = $(notdir $(wildcard adt/stack/*.asm))
STACK_CFILES := $(notdir $(wildcard adt/stack/*.c))
STACK_AFILES := $(notdir $(wildcard adt/stack/*.asm))


STACK_OBJECTS = $(STACK_CFILES:.c=.o) $(STACK_AFILES:.asm=.o)
STACK_OBJECTS := $(STACK_CFILES:.c=.o) $(STACK_AFILES:.asm=.o)

STACK_OBJS = $(addprefix adt/stack/obj/z80/, $(STACK_OBJECTS)) \
STACK_OBJS := $(addprefix adt/stack/obj/z80/, $(STACK_OBJECTS)) \
$(addprefix adt/stack/obj/r2ka/,$(STACK_OBJECTS)) \
$(addprefix adt/stack/obj/r4k/,$(STACK_OBJECTS)) \
$(addprefix adt/stack/obj/ixiy/,$(STACK_OBJECTS)) \
Expand Down
8 changes: 4 additions & 4 deletions libsrc/algorithm/AStarSearch/astar.mak
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@

ASTAR_CFILES = $(notdir $(wildcard algorithm/AStarSearch/*.c))
ASTAR_AFILES = $(notdir $(wildcard algorithm/AStarSearch/*.asm))
ASTAR_CFILES := $(notdir $(wildcard algorithm/AStarSearch/*.c))
ASTAR_AFILES := $(notdir $(wildcard algorithm/AStarSearch/*.asm))


ASTAR_OBJECTS = $(ASTAR_CFILES:.c=.o) $(ASTAR_AFILES:.asm=.o)
ASTAR_OBJECTS := $(ASTAR_CFILES:.c=.o) $(ASTAR_AFILES:.asm=.o)

ASTAR_OBJS = $(addprefix algorithm/AStarSearch/obj/z80/, $(ASTAR_OBJECTS)) \
ASTAR_OBJS := $(addprefix algorithm/AStarSearch/obj/z80/, $(ASTAR_OBJECTS)) \
$(addprefix algorithm/AStarSearch/obj/r2ka/,$(ASTAR_OBJECTS)) \
$(addprefix algorithm/AStarSearch/obj/r4k/,$(ASTAR_OBJECTS)) \
$(addprefix algorithm/AStarSearch/obj/ixiy/,$(ASTAR_OBJECTS)) \
Expand Down
8 changes: 4 additions & 4 deletions libsrc/alloc/balloc/balloc.mak
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@

BALLOC_CFILES = $(notdir $(wildcard alloc/balloc/*.c))
BALLOC_AFILES = $(notdir $(wildcard alloc/balloc/*.asm))
BALLOC_CFILES := $(notdir $(wildcard alloc/balloc/*.c))
BALLOC_AFILES := $(notdir $(wildcard alloc/balloc/*.asm))

BALLOC_NEWLIBGLOBS := "$(NEWLIB_DIRECTORY)/alloc/balloc/c/sccz80/*.asm" "$(NEWLIB_DIRECTORY)/alloc/balloc/z80/*.asm"
BALLOC_NEWLIBGLOBS_ex := $(NEWLIB_DIRECTORY)/alloc/balloc/c/sccz80/*.asm $(NEWLIB_DIRECTORY)/alloc/balloc/z80/*.asm
Expand All @@ -15,9 +15,9 @@ BALLOC_NEWLIB_TARGETS := alloc/balloc/obj/newlib-z80-alloc-balloc \
alloc/balloc/obj/newlib-kc160-alloc-balloc


BALLOC_OBJECTS = $(BALLOC_CFILES:.c=.o) $(BALLOC_AFILES:.asm=.o)
BALLOC_OBJECTS := $(BALLOC_CFILES:.c=.o) $(BALLOC_AFILES:.asm=.o)

BALLOC_OBJS = $(addprefix alloc/balloc/obj/z80/, $(BALLOC_OBJECTS)) \
BALLOC_OBJS := $(addprefix alloc/balloc/obj/z80/, $(BALLOC_OBJECTS)) \
$(addprefix alloc/balloc/obj/r2ka/,$(BALLOC_OBJECTS)) \
$(addprefix alloc/balloc/obj/r4k/,$(BALLOC_OBJECTS)) \
$(addprefix alloc/balloc/obj/ixiy/,$(BALLOC_OBJECTS)) \
Expand Down
8 changes: 4 additions & 4 deletions libsrc/alloc/malloc-classic/malloc.mak
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@

MALLOC_CFILES = $(notdir $(wildcard alloc/malloc-classic/*.c))
MALLOC_AFILES = $(notdir $(wildcard alloc/malloc-classic/*.asm))
MALLOC_CFILES := $(notdir $(wildcard alloc/malloc-classic/*.c))
MALLOC_AFILES := $(notdir $(wildcard alloc/malloc-classic/*.asm))

MALLOC_NEWLIBGLOBS :=
MALLOC_NEWLIBGLOBS_ex :=

MALLOC_NEWLIB_TARGETS :=

MALLOC_OBJECTS = $(MALLOC_CFILES:.c=.o) $(MALLOC_AFILES:.asm=.o)
MALLOC_OBJECTS := $(MALLOC_CFILES:.c=.o) $(MALLOC_AFILES:.asm=.o)

MALLOC_OBJS = $(addprefix alloc/malloc-classic/obj/z80/, $(MALLOC_OBJECTS)) \
MALLOC_OBJS := $(addprefix alloc/malloc-classic/obj/z80/, $(MALLOC_OBJECTS)) \
$(addprefix alloc/malloc-classic/obj/r2ka/,$(MALLOC_OBJECTS)) \
$(addprefix alloc/malloc-classic/obj/r4k/,$(MALLOC_OBJECTS)) \
$(addprefix alloc/malloc-classic/obj/ixiy/,$(MALLOC_OBJECTS)) \
Expand Down
8 changes: 4 additions & 4 deletions libsrc/alloc/obstack/obstack.mak
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@

OBSTACK_CFILES = $(notdir $(wildcard alloc/obstack/*.c))
OBSTACK_AFILES = $(notdir $(wildcard alloc/obstack/*.asm))
OBSTACK_CFILES := $(notdir $(wildcard alloc/obstack/*.c))
OBSTACK_AFILES := $(notdir $(wildcard alloc/obstack/*.asm))

OBSTACK_NEWLIBGLOBS := "$(NEWLIB_DIRECTORY)/alloc/obstack/c/sccz80/*.asm" "$(NEWLIB_DIRECTORY)/alloc/obstack/z80/*.asm"
OBSTACK_NEWLIBGLOBS_ex := $(NEWLIB_DIRECTORY)/alloc/obstack/c/sccz80/*.asm $(NEWLIB_DIRECTORY)/alloc/obstack/z80/*.asm
Expand All @@ -16,9 +16,9 @@ OBSTACK_NEWLIB_TARGETS := alloc/obstack/obj/newlib-z80-alloc-obstack \
alloc/obstack/obj/newlib-r4k-alloc-obstack \
alloc/obstack/obj/newlib-kc160-alloc-obstack

OBSTACK_OBJECTS = $(OBSTACK_CFILES:.c=.o) $(OBSTACK_AFILES:.asm=.o)
OBSTACK_OBJECTS := $(OBSTACK_CFILES:.c=.o) $(OBSTACK_AFILES:.asm=.o)

OBSTACK_OBJS = $(addprefix alloc/obstack/obj/z80/, $(OBSTACK_OBJECTS)) \
OBSTACK_OBJS := $(addprefix alloc/obstack/obj/z80/, $(OBSTACK_OBJECTS)) \
$(addprefix alloc/obstack/obj/r2ka/,$(OBSTACK_OBJECTS)) \
$(addprefix alloc/obstack/obj/ixiy/,$(OBSTACK_OBJECTS)) \
$(addprefix alloc/obstack/obj/z80n/,$(OBSTACK_OBJECTS)) \
Expand Down
16 changes: 8 additions & 8 deletions libsrc/arch/z80/z80.mak
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
ARCHZ80_AFILES = $(notdir $(wildcard arch/z80/*.asm))
ARCHZ80_CFILES = $(notdir $(wildcard arch/z80/*.c))
ARCHZ80_AFILES := $(notdir $(wildcard arch/z80/*.asm))
ARCHZ80_CFILES := $(notdir $(wildcard arch/z80/*.c))

ARCHZ80_R2KA_AFILES =
ARCHZ80_R2KA_CFILES = $(notdir $(wildcard arch/z80/*.c))
ARCHZ80_R2KA_AFILES :=
ARCHZ80_R2KA_CFILES := $(notdir $(wildcard arch/z80/*.c))


ARCHZ80_OBJECTS = $(ARCHZ80_CFILES:.c=.o) $(ARCHZ80_AFILES:.asm=.o)
ARCHZ80_R2KA_OBJECTS = $(ARCHZ80_R2KA_CFILES:.c=.o) $(ARCHZ80_R2KA_AFILES:.asm=.o)
ARCHZ80_OBJECTS := $(ARCHZ80_CFILES:.c=.o) $(ARCHZ80_AFILES:.asm=.o)
ARCHZ80_R2KA_OBJECTS := $(ARCHZ80_R2KA_CFILES:.c=.o) $(ARCHZ80_R2KA_AFILES:.asm=.o)

ARCHZ80_NEWLIBGLOBS := "$(NEWLIB_DIRECTORY)/z80/c/sccz80/*.asm" "$(NEWLIB_DIRECTORY)/z80/z80/*.asm"
ARCHZ80_NEWLIBGLOBS_ex := $(NEWLIB_DIRECTORY)/z80/c/sccz80/*.asm $(NEWLIB_DIRECTORY)/z80/z80/*.asm
Expand All @@ -16,9 +16,9 @@ ARCHZ80_NEWLIB_TARGETS := arch/z80/obj/newlib-z80-arch-z80 \
arch/z80/obj/newlib-z80n-arch-z80 \
arch/z80/obj/newlib-ixiy-arch-z80

ARCHZ80_OBJECTS = $(ARCHZ80_CFILES:.c=.o) $(ARCHZ80_AFILES:.asm=.o)
ARCHZ80_OBJECTS := $(ARCHZ80_CFILES:.c=.o) $(ARCHZ80_AFILES:.asm=.o)

ARCHZ80_OBJS = $(addprefix arch/z80/obj/z80/, $(ARCHZ80_OBJECTS)) \
ARCHZ80_OBJS := $(addprefix arch/z80/obj/z80/, $(ARCHZ80_OBJECTS)) \
$(addprefix arch/z80/obj/ixiy/,$(ARCHZ80_OBJECTS)) \
$(addprefix arch/z80/obj/z80n/,$(ARCHZ80_OBJECTS)) \
$(addprefix arch/z80/obj/r2ka/, $(ARCHZ80_R2KA_OBJECTS)) \
Expand Down
8 changes: 4 additions & 4 deletions libsrc/assert/assert.mak
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@

ASSERT_CFILES = $(notdir $(wildcard assert/*.c))
ASSERT_AFILES = $(notdir $(wildcard assert/*.asm))
ASSERT_CFILES := $(notdir $(wildcard assert/*.c))
ASSERT_AFILES := $(notdir $(wildcard assert/*.asm))

ASSERT_OBJECTS = $(ASSERT_CFILES:.c=.o) $(ASSERT_AFILES:.asm=.o)
ASSERT_OBJECTS := $(ASSERT_CFILES:.c=.o) $(ASSERT_AFILES:.asm=.o)

ASSERT_OBJS = $(addprefix assert/obj/z80/, $(ASSERT_OBJECTS)) \
ASSERT_OBJS := $(addprefix assert/obj/z80/, $(ASSERT_OBJECTS)) \
$(addprefix assert/obj/r2ka/,$(ASSERT_OBJECTS)) \
$(addprefix assert/obj/r4k/,$(ASSERT_OBJECTS)) \
$(addprefix assert/obj/ixiy/,$(ASSERT_OBJECTS)) \
Expand Down
8 changes: 4 additions & 4 deletions libsrc/compress/zx7/zx7.mak
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@

ZX7_CFILES = $(notdir $(wildcard compress/zx7/*.c))
ZX7_AFILES = $(notdir $(wildcard compress/zx7/*.asm))
ZX7_CFILES := $(notdir $(wildcard compress/zx7/*.c))
ZX7_AFILES := $(notdir $(wildcard compress/zx7/*.asm))


ZX7_OBJECTS = $(ZX7_CFILES:.c=.o) $(ZX7_AFILES:.asm=.o)
ZX7_OBJECTS := $(ZX7_CFILES:.c=.o) $(ZX7_AFILES:.asm=.o)

ZX7_OBJS = $(addprefix compress/zx7/obj/z80/, $(ZX7_OBJECTS)) \
ZX7_OBJS := $(addprefix compress/zx7/obj/z80/, $(ZX7_OBJECTS)) \
$(addprefix compress/zx7/obj/r2ka/,$(ZX7_OBJECTS)) \
$(addprefix compress/zx7/obj/r4k/,$(ZX7_OBJECTS)) \
$(addprefix compress/zx7/obj/ixiy/,$(ZX7_OBJECTS)) \
Expand Down
8 changes: 4 additions & 4 deletions libsrc/debug/debug.mak
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@

DEBUG_CFILES = $(notdir $(wildcard debug/*.c))
DEBUG_AFILES = $(notdir $(wildcard debug/*.asm))
DEBUG_CFILES := $(notdir $(wildcard debug/*.c))
DEBUG_AFILES := $(notdir $(wildcard debug/*.asm))

DEBUG_OBJECTS = $(DEBUG_CFILES:.c=.o) $(DEBUG_AFILES:.asm=.o)
DEBUG_OBJECTS := $(DEBUG_CFILES:.c=.o) $(DEBUG_AFILES:.asm=.o)

DEBUG_OBJS = $(addprefix debug/obj/z80/, $(DEBUG_OBJECTS)) \
DEBUG_OBJS := $(addprefix debug/obj/z80/, $(DEBUG_OBJECTS)) \
$(addprefix debug/obj/r2ka/,$(DEBUG_OBJECTS)) \
$(addprefix debug/obj/r4k/,$(DEBUG_OBJECTS)) \
$(addprefix debug/obj/ixiy/,$(DEBUG_OBJECTS)) \
Expand Down
8 changes: 4 additions & 4 deletions libsrc/gfx/portable/portable.mak
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@

GFXPORTABLE_CFILES = $(notdir $(wildcard gfx/portable/*.c))
GFXPORTABLE_AFILES = $(notdir $(wildcard gfx/portable/*.asm))
GFXPORTABLE_CFILES := $(notdir $(wildcard gfx/portable/*.c))
GFXPORTABLE_AFILES := $(notdir $(wildcard gfx/portable/*.asm))


GFXPORTABLE_OBJECTS = $(GFXPORTABLE_CFILES:.c=.o) $(GFXPORTABLE_AFILES:.asm=.o)
GFXPORTABLE_OBJECTS := $(GFXPORTABLE_CFILES:.c=.o) $(GFXPORTABLE_AFILES:.asm=.o)

GFXPORTABLE_OBJS = $(addprefix gfx/portable/obj/ixiy/,$(GFXPORTABLE_OBJECTS)) \
GFXPORTABLE_OBJS := $(addprefix gfx/portable/obj/ixiy/,$(GFXPORTABLE_OBJECTS)) \
$(addprefix gfx/portable/obj/8080/,$(GFXPORTABLE_OBJECTS)) \
$(addprefix gfx/portable/obj/8085/,$(GFXPORTABLE_OBJECTS)) \
$(addprefix gfx/portable/obj/z180/,$(GFXPORTABLE_OBJECTS)) \
Expand Down
8 changes: 4 additions & 4 deletions libsrc/gfx/x11/x11.mak
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@

X11_CFILES = $(notdir $(wildcard gfx/x11/*.c))
X11_AFILES = $(notdir $(wildcard gfx/x11/*.asm))
X11_CFILES := $(notdir $(wildcard gfx/x11/*.c))
X11_AFILES := $(notdir $(wildcard gfx/x11/*.asm))


X11_OBJECTS = $(X11_CFILES:.c=.o) $(X11_AFILES:.asm=.o)
X11_OBJECTS := $(X11_CFILES:.c=.o) $(X11_AFILES:.asm=.o)

X11_OBJS = $(addprefix gfx/x11/obj/z80/, $(X11_OBJECTS)) \
X11_OBJS := $(addprefix gfx/x11/obj/z80/, $(X11_OBJECTS)) \
$(addprefix gfx/x11/obj/r2ka/,$(X11_OBJECTS)) \
$(addprefix gfx/x11/obj/ixiy/,$(X11_OBJECTS)) \
$(addprefix gfx/x11/obj/z80n/,$(X11_OBJECTS)) \
Expand Down
8 changes: 4 additions & 4 deletions libsrc/graphics/retrofit/retrofit.mak
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@

RETROFIT_CFILES = $(notdir $(wildcard graphics/retrofit/*.c))
RETROFIT_AFILES = $(notdir $(wildcard graphics/retrofit/*.asm))
RETROFIT_CFILES := $(notdir $(wildcard graphics/retrofit/*.c))
RETROFIT_AFILES := $(notdir $(wildcard graphics/retrofit/*.asm))

RETROFIT_OBJECTS = $(RETROFIT_CFILES:.c=.o) $(RETROFIT_AFILES:.asm=.o)
RETROFIT_OBJECTS := $(RETROFIT_CFILES:.c=.o) $(RETROFIT_AFILES:.asm=.o)

RETROFIT_OBJS = $(addprefix graphics/retrofit/obj/z80/, $(RETROFIT_OBJECTS)) \
RETROFIT_OBJS := $(addprefix graphics/retrofit/obj/z80/, $(RETROFIT_OBJECTS)) \
$(addprefix graphics/retrofit/obj/r2ka/,$(RETROFIT_OBJECTS)) \
$(addprefix graphics/retrofit/obj/r4k/,$(RETROFIT_OBJECTS)) \
$(addprefix graphics/retrofit/obj/ixiy/,$(RETROFIT_OBJECTS)) \
Expand Down
8 changes: 4 additions & 4 deletions libsrc/input/input.mak
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@

INPUT_CFILES = $(notdir $(wildcard input/*.c))
INPUT_AFILES = $(notdir $(wildcard input/*.asm))
INPUT_CFILES := $(notdir $(wildcard input/*.c))
INPUT_AFILES := $(notdir $(wildcard input/*.asm))

INPUT_OBJECTS = $(INPUT_CFILES:.c=.o) $(INPUT_AFILES:.asm=.o)
INPUT_OBJECTS := $(INPUT_CFILES:.c=.o) $(INPUT_AFILES:.asm=.o)

INPUT_OBJS = $(addprefix input/obj/z80/, $(INPUT_OBJECTS)) \
INPUT_OBJS := $(addprefix input/obj/z80/, $(INPUT_OBJECTS)) \
$(addprefix input/obj/r2ka/,$(INPUT_OBJECTS)) \
$(addprefix input/obj/ixiy/,$(INPUT_OBJECTS)) \
$(addprefix input/obj/z80n/,$(INPUT_OBJECTS)) \
Expand Down
8 changes: 4 additions & 4 deletions libsrc/interrupts/common/common.mak
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@

INT_COMMON_CFILES = $(notdir $(wildcard interrupts/common/*.c))
INT_COMMON_AFILES = $(notdir $(wildcard interrupts/common/*.asm))
INT_COMMON_CFILES := $(notdir $(wildcard interrupts/common/*.c))
INT_COMMON_AFILES := $(notdir $(wildcard interrupts/common/*.asm))


INT_COMMON_OBJECTS = $(INT_COMMON_CFILES:.c=.o) $(INT_COMMON_AFILES:.asm=.o)
INT_COMMON_OBJECTS := $(INT_COMMON_CFILES:.c=.o) $(INT_COMMON_AFILES:.asm=.o)

INT_COMMON_OBJS = $(addprefix interrupts/common/obj/z80/, $(INT_COMMON_OBJECTS)) \
INT_COMMON_OBJS := $(addprefix interrupts/common/obj/z80/, $(INT_COMMON_OBJECTS)) \
$(addprefix interrupts/common/obj/ixiy/,$(INT_COMMON_OBJECTS)) \
$(addprefix interrupts/common/obj/z80n/,$(INT_COMMON_OBJECTS)) \
$(addprefix interrupts/common/obj/8080/,$(INT_COMMON_OBJECTS)) \
Expand Down
8 changes: 4 additions & 4 deletions libsrc/interrupts/im1/im1.mak
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@

INT_IM1_CFILES = $(notdir $(wildcard interrupts/im1/*.c))
INT_IM1_AFILES = $(notdir $(wildcard interrupts/im1/*.asm))
INT_IM1_CFILES := $(notdir $(wildcard interrupts/im1/*.c))
INT_IM1_AFILES := $(notdir $(wildcard interrupts/im1/*.asm))


INT_IM1_OBJECTS = $(INT_IM1_CFILES:.c=.o) $(INT_IM1_AFILES:.asm=.o)
INT_IM1_OBJECTS := $(INT_IM1_CFILES:.c=.o) $(INT_IM1_AFILES:.asm=.o)

INT_IM1_OBJS = $(addprefix interrupts/im1/obj/z80/, $(INT_IM1_OBJECTS)) \
INT_IM1_OBJS := $(addprefix interrupts/im1/obj/z80/, $(INT_IM1_OBJECTS)) \
$(addprefix interrupts/im1/obj/ixiy/,$(INT_IM1_OBJECTS)) \
$(addprefix interrupts/im1/obj/z80n/,$(INT_IM1_OBJECTS)) \
$(addprefix interrupts/im1/obj/8080/,$(INT_IM1_OBJECTS)) \
Expand Down
8 changes: 4 additions & 4 deletions libsrc/interrupts/im2/im2.mak
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@

INT_IM2_CFILES = $(notdir $(wildcard interrupts/im2/*.c))
INT_IM2_AFILES = $(notdir $(wildcard interrupts/im2/*.asm))
INT_IM2_CFILES := $(notdir $(wildcard interrupts/im2/*.c))
INT_IM2_AFILES := $(notdir $(wildcard interrupts/im2/*.asm))


INT_IM2_OBJECTS = $(INT_IM2_CFILES:.c=.o) $(INT_IM2_AFILES:.asm=.o)
INT_IM2_OBJECTS := $(INT_IM2_CFILES:.c=.o) $(INT_IM2_AFILES:.asm=.o)

INT_IM2_OBJS = $(addprefix interrupts/im2/obj/z80/, $(INT_IM2_OBJECTS)) \
INT_IM2_OBJS := $(addprefix interrupts/im2/obj/z80/, $(INT_IM2_OBJECTS)) \
$(addprefix interrupts/im2/obj/ixiy/,$(INT_IM2_OBJECTS)) \
$(addprefix interrupts/im2/obj/z80n/,$(INT_IM2_OBJECTS)) \
$(addprefix interrupts/im2/obj/z180/,$(INT_IM2_OBJECTS)) \
Expand Down
8 changes: 4 additions & 4 deletions libsrc/interrupts/nmi/nmi.mak
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@

INT_NMI_CFILES = $(notdir $(wildcard interrupts/nmi/*.c))
INT_NMI_AFILES = $(notdir $(wildcard interrupts/nmi/*.asm))
INT_NMI_CFILES := $(notdir $(wildcard interrupts/nmi/*.c))
INT_NMI_AFILES := $(notdir $(wildcard interrupts/nmi/*.asm))


INT_NMI_OBJECTS = $(INT_NMI_CFILES:.c=.o) $(INT_NMI_AFILES:.asm=.o)
INT_NMI_OBJECTS := $(INT_NMI_CFILES:.c=.o) $(INT_NMI_AFILES:.asm=.o)

INT_NMI_OBJS = $(addprefix interrupts/nmi/obj/z80/, $(INT_NMI_OBJECTS)) \
INT_NMI_OBJS := $(addprefix interrupts/nmi/obj/z80/, $(INT_NMI_OBJECTS)) \
$(addprefix interrupts/nmi/obj/ixiy/,$(INT_NMI_OBJECTS)) \
$(addprefix interrupts/nmi/obj/z80n/,$(INT_NMI_OBJECTS)) \
$(addprefix interrupts/nmi/obj/8080/,$(INT_NMI_OBJECTS)) \
Expand Down
8 changes: 4 additions & 4 deletions libsrc/rect/rect.mak
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@

RECT_CFILES = $(notdir $(wildcard rect/*.c))
RECT_AFILES = $(notdir $(wildcard rect/*.asm))
RECT_CFILES := $(notdir $(wildcard rect/*.c))
RECT_AFILES := $(notdir $(wildcard rect/*.asm))

RECT_OBJECTS = $(RECT_CFILES:.c=.o) $(RECT_AFILES:.asm=.o)
RECT_OBJECTS := $(RECT_CFILES:.c=.o) $(RECT_AFILES:.asm=.o)

RECT_OBJS = $(addprefix rect/obj/z80/, $(RECT_OBJECTS)) \
RECT_OBJS := $(addprefix rect/obj/z80/, $(RECT_OBJECTS)) \
$(addprefix rect/obj/r2ka/,$(RECT_OBJECTS)) \
$(addprefix rect/obj/r4k/,$(RECT_OBJECTS)) \
$(addprefix rect/obj/ixiy/,$(RECT_OBJECTS)) \
Expand Down
8 changes: 4 additions & 4 deletions libsrc/regex/regex.mak
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@

REGEX_CFILES = $(notdir $(wildcard regex/*.c))
REGEX_AFILES = $(notdir $(wildcard regex/*.asm))
REGEX_CFILES := $(notdir $(wildcard regex/*.c))
REGEX_AFILES := $(notdir $(wildcard regex/*.asm))

REGEX_OBJECTS = $(REGEX_CFILES:.c=.o) $(REGEX_AFILES:.asm=.o)
REGEX_OBJECTS := $(REGEX_CFILES:.c=.o) $(REGEX_AFILES:.asm=.o)

REGEX_OBJS = $(addprefix regex/obj/z80/, $(REGEX_OBJECTS)) \
REGEX_OBJS := $(addprefix regex/obj/z80/, $(REGEX_OBJECTS)) \
$(addprefix regex/obj/r2ka/,$(REGEX_OBJECTS)) \
$(addprefix regex/obj/ixiy/,$(REGEX_OBJECTS)) \
$(addprefix regex/obj/z80n/,$(REGEX_OBJECTS)) \
Expand Down
8 changes: 4 additions & 4 deletions libsrc/sdcard/sdcard.mak
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@

SDCARD_CFILES = $(notdir $(wildcard sdcard/*.c))
SDCARD_AFILES = $(notdir $(wildcard sdcard/*.asm))
SDCARD_CFILES := $(notdir $(wildcard sdcard/*.c))
SDCARD_AFILES := $(notdir $(wildcard sdcard/*.asm))

SDCARD_OBJECTS = $(SDCARD_CFILES:.c=.o) $(SDCARD_AFILES:.asm=.o)
SDCARD_OBJECTS := $(SDCARD_CFILES:.c=.o) $(SDCARD_AFILES:.asm=.o)

SDCARD_OBJS = $(addprefix sdcard/obj/z80/, $(SDCARD_OBJECTS)) \
SDCARD_OBJS := $(addprefix sdcard/obj/z80/, $(SDCARD_OBJECTS)) \
$(addprefix sdcard/obj/r2ka/,$(SDCARD_OBJECTS)) \
$(addprefix sdcard/obj/r4k/,$(SDCARD_OBJECTS)) \
$(addprefix sdcard/obj/ixiy/,$(SDCARD_OBJECTS)) \
Expand Down
Loading

0 comments on commit 812c498

Please sign in to comment.