From 0c85406f52b90c21ff937d2e2335d7b1c7a73a44 Mon Sep 17 00:00:00 2001 From: cpg Date: Mon, 3 Jul 2000 21:03:41 +0000 Subject: [PATCH] replaced multiple lines of "rm" commands with a single "rm" line in the clean target. on some rm lines the argument was empty which caused the NetBSD rm command to complain... git-svn-id: svn://svn.cc65.org/cc65/trunk@135 b7a2c559-68d2-44c3-8de9-860c34a00d81 --- libsrc/apple2/Makefile | 5 +---- libsrc/atari/Makefile | 5 +---- libsrc/c128/Makefile | 7 ++----- libsrc/c64/Makefile | 7 ++----- libsrc/cbm/Makefile | 5 +---- libsrc/cbm610/Makefile | 7 ++----- libsrc/conio/Makefile | 5 +---- libsrc/pet/Makefile | 6 +----- libsrc/plus4/Makefile | 7 ++----- libsrc/runtime/Makefile | 5 +---- 10 files changed, 14 insertions(+), 45 deletions(-) diff --git a/libsrc/apple2/Makefile b/libsrc/apple2/Makefile index 57d695665..cad5da42f 100644 --- a/libsrc/apple2/Makefile +++ b/libsrc/apple2/Makefile @@ -22,8 +22,5 @@ S_OBJS = break.o clrscr.o cclear.o cgetc.o chline.o color.o \ all: $(C_OBJS) $(S_OBJS) clean: - @rm -f $(C_OBJS:.c=.s) - @rm -f $(C_OBJS) - @rm -f $(S_OBJS) - @rm -f crt0.o + @rm -f $(C_OBJS:.c=.s) $(C_OBJS) $(S_OBJS) crt0.o diff --git a/libsrc/atari/Makefile b/libsrc/atari/Makefile index 932e1f7fb..0d1236b68 100644 --- a/libsrc/atari/Makefile +++ b/libsrc/atari/Makefile @@ -25,8 +25,5 @@ S_OBJS = crt0.o kbhit.o conio.o clrscr.o cputc.o ctype.o chline.o cvline.o \ all: $(C_OBJS) $(S_OBJS) clean: - @rm -f $(C_OBJS:.c=.s) - @rm -f $(C_OBJS) - @rm -f $(S_OBJS) - @rm -f crt0.o + @rm -f $(C_OBJS:.c=.s) $(C_OBJS) $(S_OBJS) crt0.o diff --git a/libsrc/c128/Makefile b/libsrc/c128/Makefile index 868e8e433..a75150b1f 100644 --- a/libsrc/c128/Makefile +++ b/libsrc/c128/Makefile @@ -16,13 +16,10 @@ C_OBJS = S_OBJS = crt0.o conio.o kbhit.o clrscr.o cgetc.o readjoy.o\ - color.o cputc.o break.o + color.o cputc.o break.o all: $(C_OBJS) $(S_OBJS) clean: - @rm -f $(C_OBJS:.c=.s) - @rm -f $(C_OBJS) - @rm -f $(S_OBJS) - @rm -f crt0.o + @rm -f $(C_OBJS:.c=.s) $(C_OBJS) $(S_OBJS) crt0.o diff --git a/libsrc/c64/Makefile b/libsrc/c64/Makefile index bfa8bc211..15806f5bc 100644 --- a/libsrc/c64/Makefile +++ b/libsrc/c64/Makefile @@ -16,13 +16,10 @@ C_OBJS = S_OBJS = crt0.o read.o write.o kbhit.o conio.o clrscr.o mouse.o\ - cputc.o cgetc.o color.o readjoy.o break.o rs232.o + cputc.o cgetc.o color.o readjoy.o break.o rs232.o all: $(C_OBJS) $(S_OBJS) clean: - @rm -f $(C_OBJS:.c=.s) - @rm -f $(C_OBJS) - @rm -f $(S_OBJS) - @rm -f crt0.o + @rm -f $(C_OBJS:.c=.s) $(C_OBJS) $(S_OBJS) crt0.o diff --git a/libsrc/cbm/Makefile b/libsrc/cbm/Makefile index 9093a8b33..552a8af88 100644 --- a/libsrc/cbm/Makefile +++ b/libsrc/cbm/Makefile @@ -25,8 +25,5 @@ S_OBJS = ctype.o getenv.o gotoxy.o gotox.o gotoy.o where.o\ all: $(C_OBJS) $(S_OBJS) clean: - @rm -f *~ - @rm -f $(C_OBJS:.c=.s) - @rm -f $(C_OBJS) - @rm -f $(S_OBJS) + @rm -f *~ $(C_OBJS:.c=.s) $(C_OBJS) $(S_OBJS) diff --git a/libsrc/cbm610/Makefile b/libsrc/cbm610/Makefile index cdc5f65a6..433e5555d 100644 --- a/libsrc/cbm610/Makefile +++ b/libsrc/cbm610/Makefile @@ -16,14 +16,11 @@ C_OBJS = S_OBJS = crt0.o kbhit.o conio.o clrscr.o cputc.o cgetc.o\ - color.o break.o banking.o crtc.o pokesys.o\ + color.o break.o banking.o crtc.o pokesys.o\ kscnkey.o kplot.o kudtim.o kirq.o rs232.o all: $(C_OBJS) $(S_OBJS) clean: - @rm -f $(C_OBJS:.c=.s) - @rm -f $(C_OBJS) - @rm -f $(S_OBJS) - @rm -f crt0.o + @rm -f $(C_OBJS:.c=.s) $(C_OBJS) $(S_OBJS) crt0.o diff --git a/libsrc/conio/Makefile b/libsrc/conio/Makefile index 2fc751aba..da1ff12b7 100644 --- a/libsrc/conio/Makefile +++ b/libsrc/conio/Makefile @@ -20,7 +20,4 @@ S_OBJS = cputs.o cursor.o cputhex.o scrsize.o all: $(C_OBJS) $(S_OBJS) clean: - @rm -f *~ - @rm -f $(C_OBJS:.o=.s) - @rm -f $(C_OBJS) - @rm -f $(S_OBJS) + @rm -f *~ $(C_OBJS:.o=.s) $(C_OBJS) $(S_OBJS) diff --git a/libsrc/pet/Makefile b/libsrc/pet/Makefile index 8f393fe33..6e5131db8 100644 --- a/libsrc/pet/Makefile +++ b/libsrc/pet/Makefile @@ -20,8 +20,4 @@ S_OBJS = crt0.o kbhit.o conio.o clrscr.o cputc.o cgetc.o break.o color.o all: $(C_OBJS) $(S_OBJS) clean: - @rm -f $(C_OBJS:.c=.s) - @rm -f $(C_OBJS) - @rm -f $(S_OBJS) - @rm -f crt0.o - + @rm -f $(C_OBJS:.c=.s) $(C_OBJS) $(S_OBJS) crt0.o diff --git a/libsrc/plus4/Makefile b/libsrc/plus4/Makefile index ae624cf9a..ad77f5c67 100644 --- a/libsrc/plus4/Makefile +++ b/libsrc/plus4/Makefile @@ -16,13 +16,10 @@ C_OBJS = S_OBJS = crt0.o kbhit.o conio.o clrscr.o cputc.o cgetc.o\ - color.o readjoy.o break.o + color.o readjoy.o break.o all: $(C_OBJS) $(S_OBJS) clean: - @rm -f $(C_OBJS:.c=.s) - @rm -f $(C_OBJS) - @rm -f $(S_OBJS) - @rm -f crt0.o + @rm -f $(C_OBJS:.c=.s) $(C_OBJS) $(S_OBJS) crt0.o diff --git a/libsrc/runtime/Makefile b/libsrc/runtime/Makefile index ef202d2f9..f4774970e 100644 --- a/libsrc/runtime/Makefile +++ b/libsrc/runtime/Makefile @@ -34,9 +34,6 @@ LOBJS = lruntime.o lconvert.o ladd.o lsub.o lrsub.o leq.o lne.o\ all: $(OBJS) $(LOBJS) clean: - @rm -f *~ - @rm -f $(COBJS:.o=.s) - @rm -f $(OBJS) - @rm -f $(LOBJS) + @rm -f *~ $(COBJS:.o=.s) $(OBJS) $(LOBJS) -- 2.39.5