From 291a1facb72de2c0be1826b0f65617917bdc6862 Mon Sep 17 00:00:00 2001 From: Vincent Barrilliot Date: Fri, 3 Nov 2023 00:46:24 +0100 Subject: [PATCH] Tidy up the Makefile --- src/Makefile | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/src/Makefile b/src/Makefile index 50a1661..fb8a41d 100644 --- a/src/Makefile +++ b/src/Makefile @@ -157,18 +157,19 @@ ASFLAGS := $(ASFLAGS) $(DEFINES) $(INCLUDES) CFLAGS := $(CFLAGS) $(DEFINES) $(INCLUDES) LDFLAGS := $(LDFLAGS) $(LDFLAGS_FOR_UNIT) -# New make file (Calypsi / 1_makefile per folder) +# New make file (Calypsi / 1_makefile per folder). This needs adaptation (removal?) SRCS = foenixmcp.c log.c memory.c ring_buffer.c simpleio.c sys_general.c variables.c utilities.c $(SRCS_FOR_UNIT) OBJS = $(patsubst %.s,%.o,$(patsubst %.c,%.o,$(SRCS))) OBJS_TO_CLEAN = $(subst /,\\,$(OBJS)) LIBS = dev/devices.a snd/sound.a fatfs/fatfs.a -# Old makefile (VBCC) + +# CPU-specific files cpu_s_src := $(wildcard $(CPU)/*.s) cpu_c_src := $(wildcard $(CPU)/*.c) cpu_c_obj := $(subst .c,.o,$(cpu_c_src)) $(subst .s,.o,$(cpu_s_src)) -# Device drivers +# Device drivers (common to all Foenix) dev_c_src = block.c channel.c console.c fsys.c pata.c ps2.c rtc.c sdc.c txt_screen.c uart.c dev_s_src = ifeq ($(UNIT),a2560k) @@ -229,14 +230,10 @@ foenixmcp.s68: $(DEPS) $(CC) $(LDFLAGS) -o $@ $(subst $(STARTUP_OBJ),,$^) foenixmcp.bin: $(DEPS) - @echo Making $@ - - $(CC) $(LDFLAGS) -o $@ $^ + $(CC) $(LDFLAGS) -o $@ $(subst $(STARTUP_OBJ),,$^) $(PAD_CMD) - - # Clean up after a build clean: $(RM) $(OBJS_TO_CLEAN) foenixmcp.s37 *.lst *.map