From efd8aa91eae7801dfdf63a3b40c9d05b6064abb6 Mon Sep 17 00:00:00 2001 From: Alan Cox Date: Sun, 23 Nov 2014 22:17:56 +0000 Subject: [PATCH] z80pack: update Makefiles to have correct rules for dev/../.. code --- Kernel/platform-micropack/Makefile | 19 ++++++++++++------- Kernel/platform-z80pack-lite/Makefile | 19 ++++++++++++------- Kernel/platform-z80pack/Makefile | 18 ++++++++++++------ 3 files changed, 36 insertions(+), 20 deletions(-) diff --git a/Kernel/platform-micropack/Makefile b/Kernel/platform-micropack/Makefile index a977289e..e6d3d877 100644 --- a/Kernel/platform-micropack/Makefile +++ b/Kernel/platform-micropack/Makefile @@ -1,25 +1,30 @@ -CSRCS = ../dev/z80pack/devlpr.c ../dev/z80pack/devtty.c ../dev/z80pack/devfd.c -CSRCS += devices.c main.c +DSRCS = ../dev/z80pack/devlpr.c ../dev/z80pack/devtty.c ../dev/z80pack/devfd.c +CSRCS = devices.c main.c ASRCS = crt0.s z80pack.s ASRCS += tricks.s commonmem.s -COBJS = $(CSRCS:.c=.rel) AOBJS = $(ASRCS:.s=.rel) -OBJS = $(COBJS) $(AOBJS) +COBJS = $(CSRCS:.c=.rel) +DOBJS = $(patsubst ../dev/z80pack/%.c,%.rel, $(DSRCS)) + +OBJS = $(AOBJS) $(COBJS) $(DOBJS) CROSS_CCOPTS += -I../dev/z80pack/ -JUNK = $(CSRCS:.c=.lst) $(CSRCS:.c=.asm) $(CSRCS:.c=.sym) $(ASRCS:.s=.lst) $(ASRCS:.s=.sym) $(CSRCS:.c=.rst) $(ASRCS:.s=.rst) +JUNK = *.rel *.lst *.asm *.sym *.rst all: $(OBJS) +$(AOBJS): %.rel: %.s + $(CROSS_AS) $(ASOPTS) $< + $(COBJS): %.rel: %.c $(CROSS_CC) $(CROSS_CCOPTS) -c $< -$(AOBJS): %.rel: %.s - $(CROSS_AS) $(ASOPTS) $< +$(DOBJS): %.rel: ../dev/z80pack/%.c + $(CROSS_CC) $(CROSS_CCOPTS) -c $< clean: rm -f $(OBJS) $(JUNK) core *~ diff --git a/Kernel/platform-z80pack-lite/Makefile b/Kernel/platform-z80pack-lite/Makefile index a977289e..e6d3d877 100644 --- a/Kernel/platform-z80pack-lite/Makefile +++ b/Kernel/platform-z80pack-lite/Makefile @@ -1,25 +1,30 @@ -CSRCS = ../dev/z80pack/devlpr.c ../dev/z80pack/devtty.c ../dev/z80pack/devfd.c -CSRCS += devices.c main.c +DSRCS = ../dev/z80pack/devlpr.c ../dev/z80pack/devtty.c ../dev/z80pack/devfd.c +CSRCS = devices.c main.c ASRCS = crt0.s z80pack.s ASRCS += tricks.s commonmem.s -COBJS = $(CSRCS:.c=.rel) AOBJS = $(ASRCS:.s=.rel) -OBJS = $(COBJS) $(AOBJS) +COBJS = $(CSRCS:.c=.rel) +DOBJS = $(patsubst ../dev/z80pack/%.c,%.rel, $(DSRCS)) + +OBJS = $(AOBJS) $(COBJS) $(DOBJS) CROSS_CCOPTS += -I../dev/z80pack/ -JUNK = $(CSRCS:.c=.lst) $(CSRCS:.c=.asm) $(CSRCS:.c=.sym) $(ASRCS:.s=.lst) $(ASRCS:.s=.sym) $(CSRCS:.c=.rst) $(ASRCS:.s=.rst) +JUNK = *.rel *.lst *.asm *.sym *.rst all: $(OBJS) +$(AOBJS): %.rel: %.s + $(CROSS_AS) $(ASOPTS) $< + $(COBJS): %.rel: %.c $(CROSS_CC) $(CROSS_CCOPTS) -c $< -$(AOBJS): %.rel: %.s - $(CROSS_AS) $(ASOPTS) $< +$(DOBJS): %.rel: ../dev/z80pack/%.c + $(CROSS_CC) $(CROSS_CCOPTS) -c $< clean: rm -f $(OBJS) $(JUNK) core *~ diff --git a/Kernel/platform-z80pack/Makefile b/Kernel/platform-z80pack/Makefile index 933b09d8..2b14553b 100644 --- a/Kernel/platform-z80pack/Makefile +++ b/Kernel/platform-z80pack/Makefile @@ -1,25 +1,31 @@ -CSRCS = ../dev/z80pack/devlpr.c ../dev/z80pack/devtty.c ../dev/z80pack/devfd.c +DSRCS = ../dev/z80pack/devlpr.c ../dev/z80pack/devtty.c ../dev/z80pack/devfd.c CSRCS += devices.c main.c ASRCS = crt0.s z80pack.s ASRCS += tricks.s commonmem.s -COBJS = $(CSRCS:.c=.rel) AOBJS = $(ASRCS:.s=.rel) -OBJS = $(COBJS) $(AOBJS) +COBJS = $(CSRCS:.c=.rel) +DOBJS = $(patsubst ../dev/z80pack/%.c,%.rel, $(DSRCS)) + +OBJS = $(AOBJS) $(COBJS) $(DOBJS) CROSS_CCOPTS += -I../dev/z80pack/ -JUNK = $(CSRCS:.c=.lst) $(CSRCS:.c=.asm) $(CSRCS:.c=.sym) $(ASRCS:.s=.lst) $(ASRCS:.s=.sym) $(CSRCS:.c=.rst) $(ASRCS:.s=.rst) +JUNK = *.rel *.lst *.asm *.sym *.rst all: $(OBJS) +$(AOBJS): %.rel: %.s + $(CROSS_AS) $(ASOPTS) $< + $(COBJS): %.rel: %.c $(CROSS_CC) $(CROSS_CCOPTS) -c $< -$(AOBJS): %.rel: %.s - $(CROSS_AS) $(ASOPTS) $< +$(DOBJS): %.rel: ../dev/z80pack/%.c + $(CROSS_CC) $(CROSS_CCOPTS) -c $< + clean: rm -f $(OBJS) $(JUNK) core *~ -- 2.34.1