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

diff --git a/libsrc/apple2/Makefile b/libsrc/apple2/Makefile
index 57d695665900ab1c87fea233d96e2e0d3ab126bc..cad5da42f92c2e687b8538fc204c53a04d72cd14 100644 (file)
--- 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 932e1f7fb989f71b29bb907db6ab17bce5a781ec..0d1236b68a7048e0e6de1fdd37186e603ba39363 100644 (file)
--- 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 868e8e4333a6eaed91818ea3a73df36bc06f2413..a75150b1f1f2dbdd203264025a30278ddd458fcd 100644 (file)
--- 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 bfa8bc211fdf0b176c8cd70de74ed994d56def95..15806f5bc04aba89e61b063a99b25511ac88aaee 100644 (file)
--- 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 9093a8b33c4497bd62ed3fee07f345991378751d..552a8af882487b484e03bb35dc9ef684924f3a37 100644 (file)
--- 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 cdc5f65a6508b644ebbe235d4ba0e65cb0ee3de9..433e5555d1910e5109fefde07c2d6b0187fafbe6 100644 (file)
--- 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 2fc751abaf1936e3461b7ce31b979eb228b98c9b..da1ff12b77aeeb37a78df424931848b48d76c9ce 100644 (file)
--- 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 8f393fe337bb44d36c1220f8c46ec8c17e68f139..6e5131db84ceeed557cdc49c36ec903c1ac047f6 100644 (file)
--- 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 ae624cf9a668dc4ce52af0b42bf8be6c566e0323..ad77f5c673e72a4d2b8217d364a097eac2e09c66 100644 (file)
--- 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 ef202d2f9f1bb64d950dd9c6097cb3e480e361e6..f4774970eb7f45636a8052616e13c196329faaa9 100644 (file)
--- 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)