build for linux modifications - moving towards common build evnironment for Linux...

diff --git a/build/linux/build.mk b/build/linux/build.mk
index 4b579f5..cae4a95 100644 (file)
--- a/build/linux/build.mk
+++ b/build/linux/build.mk
@@ -53,7 +53,7 @@ uninstall:
        +make -C $(SRCDIR)/rpa/build/$(OS)/$(ARCHDIR) uninstall
        +make -C $(SRCDIR)/rvm/build/$(OS)/$(ARCHDIR) uninstall
        +make -C $(SRCDIR)/rgrep/build/$(OS)/$(ARCHDIR) uninstall
-       rm -rf $(RPATK_INC_INSTALL)/rlib
-       rm -rf $(RPATK_INC_INSTALL)/rvm
-       rm -rf $(RPATK_INC_INSTALL)/rpa
-       rm -rf $(RPATK_INC_INSTALL)
+       -rm -rf $(RPATK_INC_INSTALL)/rlib
+       -rm -rf $(RPATK_INC_INSTALL)/rvm
+       -rm -rf $(RPATK_INC_INSTALL)/rpa
+       -rm -rf $(RPATK_INC_INSTALL)

diff --git a/build/template/linux/robject.mk b/build/template/linux/robject.mk
index e8a6135..0d46f56 100644 (file)
--- a/build/template/linux/robject.mk
+++ b/build/template/linux/robject.mk
@@ -26,13 +26,13 @@ $(OUTDIR):
        @mkdir $(OUTDIR)
 
 distclean: clean
-       @rm -f .depend
-       @rm -rf $(OUTDIR)
+       -rm -f .depend
+       -rm -rf $(OUTDIR)
 
 clean:
-       @rm -f $(ROBJECT_LIB)
-       @rm -f $(ROBJECT_SO)
-       @rm -f $(ROBJECT_OBJECTS)
-       @rm -f *~
-       @rm -f $(SRCDIR)/*~
+       -rm -f $(ROBJECT_LIB)
+       -rm -f $(ROBJECT_SO)
+       -rm -f $(ROBJECT_OBJECTS)
+       -rm -f *~
+       -rm -f $(SRCDIR)/*~
 

diff --git a/rgrep/build/darwin/rgrep.mk b/rgrep/build/darwin/rgrep.mk
index 01daa32..c52c042 100644 (file)
--- a/rgrep/build/darwin/rgrep.mk
+++ b/rgrep/build/darwin/rgrep.mk
@@ -31,20 +31,18 @@ $(OUTDIR):
        @mkdir $(OUTDIR)
 
 distclean: clean
-       @rm -f .depend
-       @rm -rf $(OUTDIR)
+       -rm -f .depend
+       -rm -rf $(OUTDIR)
 
 clean:
-       @rm -f $(TESTS)
-       @rm -f *~
-       @rm -f $(SRCDIR)/*~
-       @rm -f $(OBJECTS)
-       @rm -f $(OUTDIR)/$(RPAGREP)
+       -rm -f $(TESTS)
+       -rm -f *~
+       -rm -f $(SRCDIR)/*~
+       -rm -f $(OBJECTS)
+       -rm -f $(OUTDIR)/$(RPAGREP)
 
 install:
        cp $(OUTDIR)/$(RPAGREP) $(RPAGREP_BIN_INSTALL)
 
 uninstall:
-       rm $(RPAGREP_BIN_INSTALL)/$(RPAGREP)
-
-
+       -rm -f $(RPAGREP_BIN_INSTALL)/$(RPAGREP)

diff --git a/rgrep/build/linux/rgrep.mk b/rgrep/build/linux/rgrep.mk
index a7a704f..124680f 100644 (file)
--- a/rgrep/build/linux/rgrep.mk
+++ b/rgrep/build/linux/rgrep.mk
@@ -31,20 +31,20 @@ $(OUTDIR):
        @mkdir $(OUTDIR)
 
 distclean: clean
-       @rm -f .depend
-       @rm -rf $(OUTDIR)
+       -rm -f .depend
+       -rm -rf $(OUTDIR)
 
 clean:
-       @rm -f $(TESTS)
-       @rm -f *~
-       @rm -f $(SRCDIR)/*~
-       @rm -f $(OBJECTS)
-       @rm -f $(OUTDIR)/$(RPAGREP)
+       -rm -f $(TESTS)
+       -rm -f *~
+       -rm -f $(SRCDIR)/*~
+       -rm -f $(OBJECTS)
+       -rm -f $(OUTDIR)/$(RPAGREP)
 
 install:
        cp $(OUTDIR)/$(RPAGREP) $(RPAGREP_BIN_INSTALL)
 
 uninstall:
-       -rm $(RPAGREP_BIN_INSTALL)/$(RPAGREP)
+       -rm -f $(RPAGREP_BIN_INSTALL)/$(RPAGREP)
 
 

diff --git a/rjs/build/darwin/rjs.mk b/rjs/build/darwin/rjs.mk
index 798ef1c..636fac6 100644 (file)
--- a/rjs/build/darwin/rjs.mk
+++ b/rjs/build/darwin/rjs.mk
@@ -52,13 +52,13 @@ $(OUTDIR):
        @mkdir $(OUTDIR)
 
 distclean: clean
-       @rm -f .depend
-       @rm -rf $(OUTDIR)
+       -rm -f .depend
+       -rm -rf $(OUTDIR)
 
 clean:
-       @rm -f $(RJS_LIB)
-       @rm -f $(RJS_SO)
-       @rm -f $(RJS_OBJECTS)
-       @rm -f *~
-       @rm -f $(SRCDIR)/*~
+       -rm -f $(RJS_LIB)
+       -rm -f $(RJS_SO)
+       -rm -f $(RJS_OBJECTS)
+       -rm -f *~
+       -rm -f $(SRCDIR)/*~
 

diff --git a/rjs/build/linux/i386/Makefile b/rjs/build/linux/i386/Makefile
index 50cf9a8..6a6bf8f 100644 (file)
--- a/rjs/build/linux/i386/Makefile
+++ b/rjs/build/linux/i386/Makefile
@@ -6,6 +6,7 @@ INCLUDE = -I$(SRCDIR)/arch/$(OS)/$(ARCHDIR)
 MACH = -m32
 ELFARCH = elf32-i386
 BINARCH = i386
+OCFLAGS_TXT = --input binary --output $(ELFARCH) --binary-architecture $(BINARCH)
 
 CC = gcc
 AR = ar

diff --git a/rjs/build/linux/rjs.mk b/rjs/build/linux/rjs.mk
index c441a75..61d67fa 100644 (file)
--- a/rjs/build/linux/rjs.mk
+++ b/rjs/build/linux/rjs.mk
@@ -48,20 +48,20 @@ $(RJS_SO): $(RJS_OBJECTS)
        $(CC) $(LDFLAGS) -shared -Wl,-soname,librjs.so -o $@ $^
 
 $(OUTDIR)/%.o: $(RJS_SRCDIR)/%.rpa
-       $(OC) --input binary --output $(ELFARCH) --binary-architecture $(BINARCH) $(RJS_SRCDIR)/$*.rpa $(OUTDIR)/$*.o
+       $(OC) $(OCFLAGS_TXT)  $(RJS_SRCDIR)/$*.rpa $(OUTDIR)/$*.o
 
 $(OUTDIR):
        @mkdir $(OUTDIR)
 
 distclean: clean
-       @rm -f .depend
-       @rm -rf $(OUTDIR)
+       -rm -f .depend
+       -rm -rf $(OUTDIR)
 
 clean:
-       @rm -f $(RJS_LIB)
-       @rm -f $(RJS_SO)
-       @rm -f $(RJS_OBJECTS)
-       @rm -f $(RJS_EXEC)
-       @rm -f *~
-       @rm -f $(SRCDIR)/*~
+       -rm -f $(RJS_LIB)
+       -rm -f $(RJS_SO)
+       -rm -f $(RJS_OBJECTS)
+       -rm -f $(RJS_EXEC)
+       -rm -f *~
+       -rm -f $(SRCDIR)/*~
 

diff --git a/rjs/build/linux/x86_64/Makefile b/rjs/build/linux/x86_64/Makefile
index ca7efbe..5240399 100644 (file)
--- a/rjs/build/linux/x86_64/Makefile
+++ b/rjs/build/linux/x86_64/Makefile
@@ -6,6 +6,7 @@ INCLUDE = -I$(SRCDIR)/arch/$(OS)/$(ARCHDIR)
 MACH = -m64
 ELFARCH = elf64-x86-64
 BINARCH = i386:x86-64
+OCFLAGS_TXT = --input binary --output $(ELFARCH) --binary-architecture $(BINARCH)
 
 CC = gcc
 AR = ar

diff --git a/rlib/build/darwin/rlib.mk b/rlib/build/darwin/rlib.mk
index 4a0325c..4bd95c8 100644 (file)
--- a/rlib/build/darwin/rlib.mk
+++ b/rlib/build/darwin/rlib.mk
@@ -42,15 +42,15 @@ $(OUTDIR):
        @mkdir $(OUTDIR)
 
 distclean: clean
-       @rm -f .depend
-       @rm -rf $(OUTDIR)
+       -rm -f .depend
+       -rm -rf $(OUTDIR)
 
 clean:
-       @rm -f $(TARGET_RLIB_LIB)
-       @rm -f $(TARGET_RLIB_SO)
-       @rm -f $(RLIB_OBJECTS)
-       @rm -f *~
-       @rm -f $(SRCDIR)/*~
+       -rm -f $(TARGET_RLIB_LIB)
+       -rm -f $(TARGET_RLIB_SO)
+       -rm -f $(RLIB_OBJECTS)
+       -rm -f *~
+       -rm -f $(SRCDIR)/*~
 
 install:
        cp $(TARGET_RLIB_LIB) $(RPATK_LIB_INSTALL)
@@ -58,5 +58,5 @@ install:
 
 
 uninstall:
-       rm $(RPATK_LIB_INSTALL)/$(RLIB_LIB)
-       rm $(RPATK_INC_INSTALL)/rlib/*
+       -rm -f $(RPATK_LIB_INSTALL)/$(RLIB_LIB)
+       -rm -f $(RPATK_INC_INSTALL)/rlib/*

diff --git a/rlib/build/linux/rlib.mk b/rlib/build/linux/rlib.mk
index 6f2b4cc..080dfa6 100644 (file)
--- a/rlib/build/linux/rlib.mk
+++ b/rlib/build/linux/rlib.mk
@@ -7,7 +7,6 @@ RLIB_SO = $(RLIB_SO_NAME).$(RLIB_SO_VERSION)
 RLIB_LIB = librlib.a
 TARGET_RLIB_LIB = $(OUTDIR)/$(RLIB_LIB)
 TARGET_RLIB_SO = $(OUTDIR)/$(RLIB_SO)
-
 CFLAGS += -I$(SRCDIR)
 
 RLIB_OBJECTS +=        $(OUTDIR)/rref.o
@@ -27,14 +26,12 @@ RLIB_OBJECTS +=     $(OUTDIR)/rstring.o
 RLIB_OBJECTS +=        $(OUTDIR)/rlist.o
 RLIB_OBJECTS +=        $(OUTDIR)/rutf.o
 
-
 ifeq ($(OS), linux)
 all: $(OUTDIR) $(TARGET_RLIB_LIB) $(TARGET_RLIB_SO)
 else
 all: $(OUTDIR) $(TARGET_RLIB_LIB)
 endif
 
-
 $(OUTDIR)/%.o: $(RLIB_SRCDIR)/%.c
        + $(CC) $(CFLAGS) -o $(OUTDIR)/$*.o -c $(RLIB_SRCDIR)/$*.c
 

diff --git a/rpa/build/darwin/rpa.mk b/rpa/build/darwin/rpa.mk
index 0141604..698e5c1 100644 (file)
--- a/rpa/build/darwin/rpa.mk
+++ b/rpa/build/darwin/rpa.mk
@@ -18,7 +18,7 @@ RPA_OBJECTS = \
        $(OUTDIR)/rpaparser.o \
        $(OUTDIR)/rpaoptimization.o \
        $(OUTDIR)/rpabitmap.o \
-       
+
 
 all: $(OUTDIR) $(TARGET_RPA_LIB)
 
@@ -32,20 +32,20 @@ $(OUTDIR):
        @mkdir $(OUTDIR)
 
 distclean: clean
-       @rm -f .depend
-       @rm -rf $(OUTDIR)
+       -rm -f .depend
+       -rm -rf $(OUTDIR)
 
 clean:
-       @rm -f $(TARGET_RPA_LIB)
-       @rm -f $(TARGET_RPA_SO)
-       @rm -f $(RPA_OBJECTS)
-       @rm -f *~
-       @rm -f $(SRCDIR)/*~
+       -rm -f $(TARGET_RPA_LIB)
+       -rm -f $(TARGET_RPA_SO)
+       -rm -f $(RPA_OBJECTS)
+       -rm -f *~
+       -rm -f $(SRCDIR)/*~
 
 install:
        cp $(TARGET_RPA_LIB) $(RTK_LIB_INSTALL)
        cp $(RPA_SRCDIR)/*.h $(RPATK_INC_INSTALL)/rpa
 
 uninstall:
-       rm $(RTK_LIB_INSTALL)/$(RPA_LIB)
-       rm $(RPATK_INC_INSTALL)/rpa/*
+       -rm -f $(RTK_LIB_INSTALL)/$(RPA_LIB)
+       -rm -f $(RPATK_INC_INSTALL)/rpa/*

diff --git a/rpa/build/linux/rpa.mk b/rpa/build/linux/rpa.mk
index e506298..404a4a9 100644 (file)
--- a/rpa/build/linux/rpa.mk
+++ b/rpa/build/linux/rpa.mk
@@ -5,20 +5,17 @@ RPA_SO_NAME = librpa.so
 RPA_SO = $(RPA_SO_NAME).$(RPA_SO_VERSION)
 TARGET_RPA_LIB = $(OUTDIR)/$(RPA_LIB)
 TARGET_RPA_SO = $(OUTDIR)/$(RPA_SO)
-
-
 CFLAGS += -I$(SRCDIR)
 
-RPA_OBJECTS =  \
-       $(OUTDIR)/rpacache.o \
-       $(OUTDIR)/rpadbex.o \
-       $(OUTDIR)/rpastat.o \
-       $(OUTDIR)/rparecord.o \
-       $(OUTDIR)/rpavm.o \
-       $(OUTDIR)/rpacompiler.o \
-       $(OUTDIR)/rpaparser.o \
-       $(OUTDIR)/rpaoptimization.o \
-       $(OUTDIR)/rpabitmap.o \
+RPA_OBJECTS += $(OUTDIR)/rpacache.o
+RPA_OBJECTS += $(OUTDIR)/rpadbex.o
+RPA_OBJECTS += $(OUTDIR)/rpastat.o
+RPA_OBJECTS += $(OUTDIR)/rparecord.o
+RPA_OBJECTS += $(OUTDIR)/rpavm.o
+RPA_OBJECTS += $(OUTDIR)/rpacompiler.o
+RPA_OBJECTS += $(OUTDIR)/rpaparser.o
+RPA_OBJECTS += $(OUTDIR)/rpaoptimization.o
+RPA_OBJECTS += $(OUTDIR)/rpabitmap.o
 
 
 ifeq ($(OS), linux)
@@ -41,15 +38,15 @@ $(OUTDIR):
        @mkdir $(OUTDIR)
 
 distclean: clean
-       @rm -f .depend
-       @rm -rf $(OUTDIR)
+       -rm -f .depend
+       -rm -rf $(OUTDIR)
 
 clean:
-       @rm -f $(TARGET_RPA_LIB)
-       @rm -f $(TARGET_RPA_SO)
-       @rm -f $(RPA_OBJECTS)
-       @rm -f *~
-       @rm -f $(SRCDIR)/*~
+       -rm -f $(TARGET_RPA_LIB)
+       -rm -f $(TARGET_RPA_SO)
+       -rm -f $(RPA_OBJECTS)
+       -rm -f *~
+       -rm -f $(SRCDIR)/*~
 
 install:
        cp $(TARGET_RPA_SO) $(RTK_LIB_INSTALL)
@@ -57,6 +54,6 @@ install:
        cp $(RPA_SRCDIR)/*.h $(RPATK_INC_INSTALL)/rpa
 
 uninstall:
-       -rm $(RTK_LIB_INSTALL)/$(RPA_LIB)
-       -rm $(RTK_LIB_INSTALL)/$(RPA_SO_NAME)*
-       -rm $(RPATK_INC_INSTALL)/rpa/*
+       -rm -f $(RTK_LIB_INSTALL)/$(RPA_LIB)
+       -rm -f $(RTK_LIB_INSTALL)/$(RPA_SO_NAME)*
+       -rm -f $(RPATK_INC_INSTALL)/rpa/*

diff --git a/rvm/build/darwin/rvm.mk b/rvm/build/darwin/rvm.mk
index 821b5db..9f47d6d 100644 (file)
--- a/rvm/build/darwin/rvm.mk
+++ b/rvm/build/darwin/rvm.mk
@@ -57,20 +57,20 @@ $(OUTDIR):
        @mkdir $(OUTDIR)
 
 distclean: clean
-       @rm -f .depend
-       @rm -rf $(OUTDIR)
+       -rm -f .depend
+       -rm -rf $(OUTDIR)
 
 clean:
-       @rm -f $(TARGET_RVM_LIB)
-       @rm -f $(TARGET_RVM_SO)
-       @rm -f $(RVM_OBJECTS)
-       @rm -f *~
-       @rm -f $(SRCDIR)/*~
+       -rm -f $(TARGET_RVM_LIB)
+       -rm -f $(TARGET_RVM_SO)
+       -rm -f $(RVM_OBJECTS)
+       -rm -f *~
+       -rm -f $(SRCDIR)/*~
 
 install:
        cp $(TARGET_RVM_LIB) $(RTK_LIB_INSTALL)
        cp $(RVM_SRCDIR)/*.h $(RPATK_INC_INSTALL)/rvm
 
 uninstall:
-       rm $(RTK_LIB_INSTALL)/$(RVM_LIB)
-       rm $(RPATK_INC_INSTALL)/rvm/*
+       -rm -f $(RTK_LIB_INSTALL)/$(RVM_LIB)
+       -rm -f $(RPATK_INC_INSTALL)/rvm/*

diff --git a/rvm/build/linux/rvm.mk b/rvm/build/linux/rvm.mk
index 93c3c5a..4e3153a 100644 (file)
--- a/rvm/build/linux/rvm.mk
+++ b/rvm/build/linux/rvm.mk
@@ -6,7 +6,6 @@ RVM_LIB = librvm.a
 RVM_SO = $(RVM_SO_NAME).$(RVM_SO_VERSION)
 TARGET_RVM_LIB = $(OUTDIR)/$(RVM_LIB)
 TARGET_RVM_SO = $(OUTDIR)/$(RVM_SO)
-
 CFLAGS += -I$(SRCDIR)
 
 RVM_OBJECTS += $(OUTDIR)/rvmcpu.o 
@@ -43,14 +42,12 @@ RVM_OBJECTS +=      $(OUTDIR)/rvmoperatordiv.o
 RVM_OBJECTS += $(OUTDIR)/rvmoperatormod.o
 RVM_OBJECTS += $(OUTDIR)/rvmoperatornot.o
 
-
 ifeq ($(OS), linux)
 all: $(OUTDIR) $(TARGET_RVM_LIB) $(TARGET_RVM_SO)
 else
 all: $(OUTDIR) $(TARGET_RVM_LIB)
 endif
 
-
 $(OUTDIR)/%.o: $(RVM_SRCDIR)/%.c
        + $(CC) $(CFLAGS) -o $(OUTDIR)/$*.o -c $(RVM_SRCDIR)/$*.c
 
@@ -64,15 +61,15 @@ $(OUTDIR):
        @mkdir $(OUTDIR)
 
 distclean: clean
-       @rm -f .depend
-       @rm -rf $(OUTDIR)
+       -rm -f .depend
+       -rm -rf $(OUTDIR)
 
 clean:
-       @rm -f $(TARGET_RVM_LIB)
-       @rm -f $(TARGET_RVM_SO)
-       @rm -f $(RVM_OBJECTS)
-       @rm -f *~
-       @rm -f $(SRCDIR)/*~
+       -rm -f $(TARGET_RVM_LIB)
+       -rm -f $(TARGET_RVM_SO)
+       -rm -f $(RVM_OBJECTS)
+       -rm -f *~
+       -rm -f $(SRCDIR)/*~
 
 install:
        cp $(TARGET_RVM_SO) $(RTK_LIB_INSTALL)
@@ -80,6 +77,6 @@ install:
        cp $(RVM_SRCDIR)/*.h $(RPATK_INC_INSTALL)/rvm
 
 uninstall:
-       -rm $(RTK_LIB_INSTALL)/$(RVM_LIB)
-       -rm $(RTK_LIB_INSTALL)/$(RVM_SO_NAME)*
-       -rm $(RPATK_INC_INSTALL)/rvm/*
+       -rm -f $(RTK_LIB_INSTALL)/$(RVM_LIB)
+       -rm -f $(RTK_LIB_INSTALL)/$(RVM_SO_NAME)*
+       -rm -f $(RPATK_INC_INSTALL)/rvm/*

diff --git a/tests/testmisc/build/darwin/misc-tests.mk b/tests/testmisc/build/darwin/misc-tests.mk
index 82f3b4a..d4e4d4f 100644 (file)
--- a/tests/testmisc/build/darwin/misc-tests.mk
+++ b/tests/testmisc/build/darwin/misc-tests.mk
@@ -61,11 +61,11 @@ $(OUTDIR):
        @mkdir $(OUTDIR)
 
 distclean: clean
-       @rm -f .depend
-       @rm -rf $(OUTDIR)
+       -rm -f .depend
+       -rm -rf $(OUTDIR)
 
 clean:
-       @rm -f $(TESTS)
-       @rm -f *~
-       @rm -f $(SRCDIR)/*~
+       -rm -f $(TESTS)
+       -rm -f *~
+       -rm -f $(SRCDIR)/*~
 

diff --git a/tests/testmisc/build/linux/misc-tests.mk b/tests/testmisc/build/linux/misc-tests.mk
index 0fea462..54d3602 100644 (file)
--- a/tests/testmisc/build/linux/misc-tests.mk
+++ b/tests/testmisc/build/linux/misc-tests.mk
@@ -63,11 +63,11 @@ $(OUTDIR):
        @mkdir $(OUTDIR)
 
 distclean: clean
-       @rm -f .depend
-       @rm -rf $(OUTDIR)
+       -rm -f .depend
+       -rm -rf $(OUTDIR)
 
 clean:
-       @rm -f $(TESTS)
-       @rm -f *~
-       @rm -f $(SRCDIR)/*~
+       -rm -f $(TESTS)
+       -rm -f *~
+       -rm -f $(SRCDIR)/*~
 

diff --git a/tests/testrjs/build/darwin/testrjs.mk b/tests/testrjs/build/darwin/testrjs.mk
index 972fd90..7a29373 100644 (file)
--- a/tests/testrjs/build/darwin/testrjs.mk
+++ b/tests/testrjs/build/darwin/testrjs.mk
@@ -33,11 +33,11 @@ $(OUTDIR):
        @mkdir $(OUTDIR)
 
 distclean: clean
-       @rm -f .depend
-       @rm -rf $(OUTDIR)
+       -rm -f .depend
+       -rm -rf $(OUTDIR)
 
 clean:
-       @rm -f $(TESTS)
-       @rm -f *~
-       @rm -f $(SRCDIR)/*~
+       -rm -f $(TESTS)
+       -rm -f *~
+       -rm -f $(SRCDIR)/*~
 

diff --git a/tests/testrjs/build/linux/testrjs.mk b/tests/testrjs/build/linux/testrjs.mk
index aa7c906..04a66c3 100644 (file)
--- a/tests/testrjs/build/linux/testrjs.mk
+++ b/tests/testrjs/build/linux/testrjs.mk
@@ -33,11 +33,11 @@ $(OUTDIR):
        @mkdir $(OUTDIR)
 
 distclean: clean
-       @rm -f .depend
-       @rm -rf $(OUTDIR)
+       -rm -f .depend
+       -rm -rf $(OUTDIR)
 
 clean:
-       @rm -f $(TESTS)
-       @rm -f *~
-       @rm -f $(SRCDIR)/*~
+       -rm -f $(TESTS)
+       -rm -f *~
+       -rm -f $(SRCDIR)/*~
 

diff --git a/tests/testrpa/build/darwin/testrpa2.mk b/tests/testrpa/build/darwin/testrpa2.mk
index 56fb2d3..eb11bb4 100644 (file)
--- a/tests/testrpa/build/darwin/testrpa2.mk
+++ b/tests/testrpa/build/darwin/testrpa2.mk
@@ -43,11 +43,11 @@ $(OUTDIR):
        @mkdir $(OUTDIR)
 
 distclean: clean
-       @rm -f .depend
-       @rm -rf $(OUTDIR)
+       -rm -f .depend
+       -rm -rf $(OUTDIR)
 
 clean:
-       @rm -f $(TESTS)
-       @rm -f *~
-       @rm -f $(SRCDIR)/*~
+       -rm -f $(TESTS)
+       -rm -f *~
+       -rm -f $(SRCDIR)/*~
 

diff --git a/tests/testrpa/build/linux/testrpa2.mk b/tests/testrpa/build/linux/testrpa2.mk
index 45d9c73..67d6156 100644 (file)
--- a/tests/testrpa/build/linux/testrpa2.mk
+++ b/tests/testrpa/build/linux/testrpa2.mk
@@ -43,11 +43,11 @@ $(OUTDIR):
        @mkdir $(OUTDIR)
 
 distclean: clean
-       @rm -f .depend
-       @rm -rf $(OUTDIR)
+       -rm -f .depend
+       -rm -rf $(OUTDIR)
 
 clean:
-       @rm -f $(TESTS)
-       @rm -f *~
-       @rm -f $(SRCDIR)/*~
+       -rm -f $(TESTS)
+       -rm -f *~
+       -rm -f $(SRCDIR)/*~