replace /bin/rm with $(RM) and /bin/mv with mv

37 files changed, 57 insertions, 103 deletions

diff --git a/TAO/examples/POA/DSI/Makefile b/TAO/examples/POA/DSI/Makefile
index 7a4aeea9786..d251551894a 100644
--- a/TAO/examples/POA/DSI/Makefile
+++ b/TAO/examples/POA/DSI/Makefile
@@ -50,7 +50,7 @@ client:	$(addprefix $(VDIR),$(FILE_CLT_OBJS))
 	$(LINK.cc) $(LDFLAGS) -o $@ $^ $(VLDLIBS) $(POSTLINK)
 
 realclean: clean
-	-/bin/rm -rf DatabaseC.* DatabaseS.*
+	-$(RM) DatabaseC.* DatabaseS.*
 
 # DO NOT DELETE THIS LINE -- g++dep uses it.
 # DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
diff --git a/TAO/examples/POA/Default_Servant/Makefile b/TAO/examples/POA/Default_Servant/Makefile
index 66cb72a7c1f..59f61591520 100644
--- a/TAO/examples/POA/Default_Servant/Makefile
+++ b/TAO/examples/POA/Default_Servant/Makefile
@@ -50,7 +50,7 @@ client:	$(addprefix $(VDIR),$(FILE_CLT_OBJS))
 	$(LINK.cc) $(LDFLAGS) -o $@ $^ $(VLDLIBS) $(POSTLINK)
 
 realclean: clean
-	-/bin/rm -rf FileC.* FileS.* FileS_T.*
+	-$(RM) FileC.* FileS.* FileS_T.*
 
 # DO NOT DELETE THIS LINE -- g++dep uses it.
 # DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
diff --git a/TAO/examples/POA/Forwarding/Makefile b/TAO/examples/POA/Forwarding/Makefile
index 32fa77ebfd8..943bab5a355 100644
--- a/TAO/examples/POA/Forwarding/Makefile
+++ b/TAO/examples/POA/Forwarding/Makefile
@@ -50,7 +50,7 @@ client:	$(addprefix $(VDIR),$(CLT_OBJS))
 	$(LINK.cc) $(LDFLAGS) -o $@ $^ $(VLDLIBS) $(POSTLINK)
 
 realclean: clean
-	-/bin/rm -rf FooC.* FooS.* FooS_T.*
+	-$(RM) FooC.* FooS.* FooS_T.*
 
 # DO NOT DELETE THIS LINE -- g++dep uses it.
 # DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
diff --git a/TAO/examples/POA/Generic_Servant/Makefile b/TAO/examples/POA/Generic_Servant/Makefile
index 7cd557b7e53..5daf05e3edd 100644
--- a/TAO/examples/POA/Generic_Servant/Makefile
+++ b/TAO/examples/POA/Generic_Servant/Makefile
@@ -64,7 +64,7 @@ client: $(POA_CLT_OBJS)
 	$(LINK.cc) $(LDFLAGS) -o $@ $^ $(VLDLIBS) $(POSTLINK)
 
 realclean: clean
-	-/bin/rm -rf FooC.* FooS.* FooS_T.*
+	-$(RM) FooC.* FooS.* FooS_T.*
 
 # DO NOT DELETE THIS LINE -- g++dep uses it.
 # DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
diff --git a/TAO/examples/POA/Identity/Makefile b/TAO/examples/POA/Identity/Makefile
index cdc444e5868..329e7e3e7d5 100644
--- a/TAO/examples/POA/Identity/Makefile
+++ b/TAO/examples/POA/Identity/Makefile
@@ -40,7 +40,7 @@ Identity: $(addprefix $(VDIR),$(PROG_OBJS))
 	$(LINK.cc) $(LDFLAGS) -o $@ $^ $(VLDLIBS) $(POSTLINK)
 
 realclean: clean
-	-/bin/rm -rf testC.* testS.* testS_T.*
+	-$(RM) testC.* testS.* testS_T.*
 
 #----------------------------------------------------------------------------
 #	Dependencies
diff --git a/TAO/examples/POA/TIE/Makefile b/TAO/examples/POA/TIE/Makefile
index 0a595bf18e9..6b7b41845a6 100644
--- a/TAO/examples/POA/TIE/Makefile
+++ b/TAO/examples/POA/TIE/Makefile
@@ -59,7 +59,7 @@ client: $(addprefix $(VDIR),$(FILE_CLT_OBJS))
 	$(LINK.cc) $(LDFLAGS) -o $@ $^ $(VLDLIBS) $(POSTLINK)
 
 realclean: clean
-	-/bin/rm -rf FooC.* FooS.* FooS_T.*
+	-$(RM) FooC.* FooS.* FooS_T.*
 
 endif # ! ACE_HAS_GNUG_PRE_2_8
 
diff --git a/TAO/examples/Simple/chat/Makefile b/TAO/examples/Simple/chat/Makefile
index ac716eb0241..54abbd0c657 100644
--- a/TAO/examples/Simple/chat/Makefile
+++ b/TAO/examples/Simple/chat/Makefile
@@ -78,7 +78,7 @@ client:	$(addprefix $(VDIR),$(SIMPLE_CLT_OBJS))
 	$(LINK.cc) $(LDFLAGS) -o $@ $^ $(VLDLIBS) $(POSTLINK)
 
 realclean: clean
-	-/bin/rm -rf ReceiverC.* ReceiverS.* ReceiverS_T.* BroadcasterC.* BroadcasterS.* BroadcasterS_T.*
+	-$(RM) ReceiverC.* ReceiverS.* ReceiverS_T.* BroadcasterC.* BroadcasterS.* BroadcasterS_T.*
 
 # DO NOT DELETE THIS LINE -- g++dep uses it.
 # DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
diff --git a/TAO/examples/Simulator/DOVEBrowser/Makefile b/TAO/examples/Simulator/DOVEBrowser/Makefile
index dc2a7f4612b..d3de3e5a12e 100644
--- a/TAO/examples/Simulator/DOVEBrowser/Makefile
+++ b/TAO/examples/Simulator/DOVEBrowser/Makefile
@@ -46,7 +46,7 @@ ifeq ($(CROSS-COMPILE),)
   include $(TAO_ROOT)/taoconfig.mk
 
   realclean: clean
-	-/bin/rm -rf $(DOVE_BROWSER_JAVA) \
+	-$(RM) $(DOVE_BROWSER_JAVA) \
          $(patsubst %.java,%.idl,$(DOVE_BROWSER_JAVA)) NavWeap.idl \
          Navigation.java NavigationH*.java \
          Weapons.java WeaponsH*.java *.class CosNaming \
diff --git a/TAO/orbsvcs/tests/AVStreams/mpeg/source/client/Makefile b/TAO/orbsvcs/tests/AVStreams/mpeg/source/client/Makefile
index 72eb79d3c67..f7a4dea4ec8 100644
--- a/TAO/orbsvcs/tests/AVStreams/mpeg/source/client/Makefile
+++ b/TAO/orbsvcs/tests/AVStreams/mpeg/source/client/Makefile
@@ -48,11 +48,8 @@ include	$(ACE_ROOT)/include/makeinclude/rules.local.GNU
 LDFLAGS +=  -lmpeg_shared -lmpeg_mib -lmpeg_client -lXm  -lXext -lXt -lSM -lICE  -lX11  -lsocket -lnsl -ldl
 CPPFLAGS += -i -DSH_MEM -DNDEBUG -I/project/doc/pkg/X11/include -L/project/doc/pkg/X11/lib
 
-clean:
-	-/bin/rm -rf *.o Log obj.* core Templates.DB .make.state
-
 realclean: clean
-	-/bin/rm -rf $(addsuffix .h, $(IDL_FILES)) $(addsuffix .i, $(IDL_FILES)) $(addsuffix .cpp, $(IDL_FILES))
+	-$(RM) $(addsuffix .h, $(IDL_FILES)) $(addsuffix .i, $(IDL_FILES)) $(addsuffix .cpp, $(IDL_FILES))
 
 # DO NOT DELETE THIS LINE -- g++dep uses it.
 # DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
diff --git a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/Makefile b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/Makefile
index 0195c177112..4fadaab1df6 100644
--- a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/Makefile
+++ b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/Makefile
@@ -85,11 +85,8 @@ include	$(ACE_ROOT)/include/makeinclude/rules.local.GNU
 LDFLAGS +=  -L/project/doc/pkg/X11/lib/ -lXm -lXt -lXext -lSM -lICE -lX11 -L/project/doc/pkg/X11/lib -lsocket -lnsl -ldl
 CPPFLAGS += -i -DSH_MEM -DNDEBUG  -I/project/doc/pkg/X11/include -L/project/doc/pkg/X11/lib
 
-clean:
-	-/bin/rm -rf *.o Log $(BIN) obj.* core Templates.DB .make.state
-
 realclean: clean
-	-/bin/rm -rf $(addsuffix .h, $(IDL_FILES)) $(addsuffix .i, $(IDL_FILES)) $(addsuffix .cpp, $(IDL_FILES))
+	-$(RM) $(addsuffix .h, $(IDL_FILES)) $(addsuffix .i, $(IDL_FILES)) $(addsuffix .cpp, $(IDL_FILES))
 
 # DO NOT DELETE THIS LINE -- g++dep uses it.
 # DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
diff --git a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_mib/Makefile b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_mib/Makefile
index 0e77c03cc35..8c14d8a0851 100644
--- a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_mib/Makefile
+++ b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_mib/Makefile
@@ -64,11 +64,8 @@ include	$(ACE_ROOT)/include/makeinclude/rules.local.GNU
 LDFLAGS +=  -L/project/doc/pkg/X11/lib/ -lXm -lXt -lXext -lSM -lICE -lX11 -L/project/doc/pkg/X11/lib -lsocket -lnsl -ldl
 CPPFLAGS += -DSH_MEM -DNDEBUG  -I/project/doc/pkg/X11/include
 
-clean:
-	-/bin/rm -rf *.o Log $(BIN) obj.* core Templates.DB .make.state
-
 realclean: clean
-	-/bin/rm -rf $(addsuffix .h, $(IDL_FILES)) $(addsuffix .i, $(IDL_FILES)) $(addsuffix .cpp, $(IDL_FILES))
+	-$(RM) $(addsuffix .h, $(IDL_FILES)) $(addsuffix .i, $(IDL_FILES)) $(addsuffix .cpp, $(IDL_FILES))
 
 # DO NOT DELETE THIS LINE -- g++dep uses it.
 # DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
diff --git a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_server/Makefile b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_server/Makefile
index 77f66db99fa..76c34372e40 100644
--- a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_server/Makefile
+++ b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_server/Makefile
@@ -57,11 +57,8 @@ LDFLAGS +=  -lsocket -lnsl -ldl
 CPPFLAGS += -I$(TAO_ROOT) -I$(TAO_ROOT)/orbsvcs $(TSS_ORB_FLAG)
 CPPFLAGS += -DSH_MEM  -I/project/doc/pkg/X11/include
 
-clean:
-	-/bin/rm -rf *.o Log $(BIN) obj.* core Templates.DB .make.state
-
 realclean: clean
-	-/bin/rm -rf $(addsuffix .h, $(IDL_FILES)) $(addsuffix .i, $(IDL_FILES)) $(addsuffix .cpp, $(IDL_FILES))
+	-$(RM) $(addsuffix .h, $(IDL_FILES)) $(addsuffix .i, $(IDL_FILES)) $(addsuffix .cpp, $(IDL_FILES))
 
 # DO NOT DELETE THIS LINE -- g++dep uses it.
 # DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
diff --git a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/Makefile b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/Makefile
index d700ba3afb5..f756a1d14fa 100644
--- a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/Makefile
+++ b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/Makefile
@@ -72,11 +72,8 @@ CPPFLAGS += -DSH_MEM -DNDEBUG
 
 idl_stubs: $(addsuffix .h, $(IDL_FILES))
 
-clean:
-	-/bin/rm -rf *.o Log $(BIN) obj.* core Templates.DB .make.state
-
 realclean: clean
-	-/bin/rm -rf $(addsuffix .h, $(IDL_FILES)) $(addsuffix .i, $(IDL_FILES)) $(addsuffix .cpp, $(IDL_FILES))
+	-$(RM) $(addsuffix .h, $(IDL_FILES)) $(addsuffix .i, $(IDL_FILES)) $(addsuffix .cpp, $(IDL_FILES))
 
 # DO NOT DELETE THIS LINE -- g++dep uses it.
 # DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
diff --git a/TAO/orbsvcs/tests/AVStreams/mpeg/source/server/Makefile b/TAO/orbsvcs/tests/AVStreams/mpeg/source/server/Makefile
index 7531cb70ed9..caa8796b159 100644
--- a/TAO/orbsvcs/tests/AVStreams/mpeg/source/server/Makefile
+++ b/TAO/orbsvcs/tests/AVStreams/mpeg/source/server/Makefile
@@ -85,11 +85,8 @@ vs:$(addprefix $(VDIR),$(AV_VS_OBJS))
 as:$(addprefix $(VDIR),$(AV_AS_OBJS))
 	$(LINK.cc) $(LDFLAGS) -o $@ $^ $(VLDLIBS) $(POSTLINK)
 
-clean:
-	-/bin/rm -rf *.o Log obj.* core Templates.DB .make.state
-
 realclean: clean
-	-/bin/rm -rf $(addsuffix .h, $(IDL_FILES)) $(addsuffix .i, $(IDL_FILES)) $(addsuffix .cpp, $(IDL_FILES)) \
+	-$(RM) $(addsuffix .h, $(IDL_FILES)) $(addsuffix .i, $(IDL_FILES)) $(addsuffix .cpp, $(IDL_FILES)) \
 	$(addsuffix _T.h, $(IDL_FILES)) $(addsuffix _T.i, $(IDL_FILES)) $(addsuffix _T.cpp, $(IDL_FILES))
 
 # DO NOT DELETE THIS LINE -- g++dep uses it.
diff --git a/TAO/orbsvcs/tests/AVStreams/server_discovery/Makefile b/TAO/orbsvcs/tests/AVStreams/server_discovery/Makefile
index 5d090d1bf35..c25b22626e2 100644
--- a/TAO/orbsvcs/tests/AVStreams/server_discovery/Makefile
+++ b/TAO/orbsvcs/tests/AVStreams/server_discovery/Makefile
@@ -77,11 +77,8 @@ TAO_VR.module: Video_Repository.idl
 	$(JAVA_ROOT)/bin/idltojava Video_Repository.idl
 	touch TAO_VR.module
 
-clean:
-	-/bin/rm -rf *.o Log $(BIN) obj.* core Templates.DB .make.state
-
 realclean: clean
-	-/bin/rm -rf Video_Repository.idl $(addsuffix .h, $(IDL_FILES)) $(addsuffix .i, $(IDL_FILES)) $(addsuffix .cpp, $(IDL_FILES)) \
+	-$(RM) Video_Repository.idl $(addsuffix .h, $(IDL_FILES)) $(addsuffix .i, $(IDL_FILES)) $(addsuffix .cpp, $(IDL_FILES)) \
 	$(addsuffix _T.h, $(IDL_FILES)) $(addsuffix _T.i, $(IDL_FILES)) $(addsuffix _T.cpp, $(IDL_FILES)) 
 
 IDL_EXT=C.h C.i C.cpp S.h S.i S.cpp S_T.h S_T.i S_T.cpp
diff --git a/TAO/performance-tests/Cubit/COOL/IDL_Cubit/Makefile b/TAO/performance-tests/Cubit/COOL/IDL_Cubit/Makefile
index 8a1b18e7113..df519b251bb 100644
--- a/TAO/performance-tests/Cubit/COOL/IDL_Cubit/Makefile
+++ b/TAO/performance-tests/Cubit/COOL/IDL_Cubit/Makefile
@@ -56,7 +56,7 @@ all: $(IDL_SRC) server client
 
 $(IDL_SRC): cubit.idl
 	$(CHORUS_BINDIR)/chic $(IDLFLAGS) cubit.idl
-	-/bin/mv cubit.C cubit.cpp
+	-mv cubit.C cubit.cpp
 
 server: $(addprefix $(VDIR),$(SVR_OBJS))
 	$(LINK.cc) -o server $(addprefix $(VDIR),$(SVR_OBJS)) $(LDFLAGS) $(ITIIOP) $(ITSRV) $(VLDLIBS) $(POSTLINK)
@@ -65,7 +65,7 @@ client: $(addprefix $(VDIR),$(CLT_OBJS))
 	$(LINK.cc) -o client $(addprefix $(VDIR),$(CLT_OBJS)) $(LDFLAGS) $(ITIIOP) $(ITCLT) $(VLDLIBS) $(POSTLINK)
 
 realclean: clean
-	-/bin/rm -rf cubit.cpp cubit.H sk_cubit.C sk_cubit.H server client
+	-$(RM) cubit.cpp cubit.H sk_cubit.C sk_cubit.H server client
 
 #----------------------------------------------------------------------------
 #	Dependencies
diff --git a/TAO/performance-tests/Cubit/COOL/MT_Cubit/Makefile b/TAO/performance-tests/Cubit/COOL/MT_Cubit/Makefile
index d605120ca98..cee1a38d81a 100644
--- a/TAO/performance-tests/Cubit/COOL/MT_Cubit/Makefile
+++ b/TAO/performance-tests/Cubit/COOL/MT_Cubit/Makefile
@@ -70,7 +70,7 @@ all: $(IDL_SRC) server client
 
 $(IDL_SRC): cubit.idl
 	$(CHORUS_BINDIR)/chic $(IDLFLAGS) cubit.idl
-	-/bin/mv cubit.C cubit.cpp
+	-mv cubit.C cubit.cpp
 
 server: $(addprefix $(VDIR),$(SVR_OBJS))
 	$(LINK.cc) -o server $(addprefix $(VDIR),$(SVR_OBJS)) $(LDFLAGS) $(ITIIOP) $(ITSRV) $(VLDLIBS) $(POSTLINK)
@@ -79,7 +79,7 @@ client: $(addprefix $(VDIR),$(CLT_OBJS))
 	$(LINK.cc) -o client $(addprefix $(VDIR),$(CLT_OBJS)) $(LDFLAGS) $(ITIIOP) $(ITCLT) $(VLDLIBS) $(POSTLINK)
 
 realclean: clean
-	-/bin/rm -rf cubit.cpp cubit.H sk_cubit.C sk_cubit.H server client
+	-$(RM) cubit.cpp cubit.H sk_cubit.C sk_cubit.H server client
 
 #----------------------------------------------------------------------------
 #	Dependencies
diff --git a/TAO/performance-tests/Cubit/CORBAplus/IDL_Cubit/Makefile b/TAO/performance-tests/Cubit/CORBAplus/IDL_Cubit/Makefile
index 48238fd831b..f89dc1b2eb2 100644
--- a/TAO/performance-tests/Cubit/CORBAplus/IDL_Cubit/Makefile
+++ b/TAO/performance-tests/Cubit/CORBAplus/IDL_Cubit/Makefile
@@ -45,8 +45,8 @@ CPPFLAGS += -I$(PBHOME)/include
 
 $(IDL_SRC): cubit.idl
 	$(PBHOME)/bin/idlc cubit.idl
-	-/bin/mv cubit.C cubit.cpp
-	-/bin/mv cubit_s.C cubit_s.cpp
+	-mv cubit.C cubit.cpp
+	-mv cubit_s.C cubit_s.cpp
 
 svr:	$(addprefix $(VDIR),$(CUBIT_SVR_OBJS))
 	$(LINK.cc) $(LDFLAGS) -o $@ $^ $(VLDLIBS) $(POSTLINK)
@@ -82,8 +82,6 @@ check:	$(TESTS)
 	@./clnt -n250 -O `cat obj.5` -x
 	@echo ''
 
-clean:
-	-/bin/rm -rf *.o cubit.cpp cubit.h cubit_s.cpp cubit_s.h $(CUBIT_SVR_OBJS) $(CUBIT_CLT_OBJS) $(BIN) core
- 
-realclean: clean
+realclean:
+	-$(RM) *.o cubit.cpp cubit.h cubit_s.cpp cubit_s.h $(CUBIT_SVR_OBJS) $(CUBIT_CLT_OBJS) $(BIN) core
 
diff --git a/TAO/performance-tests/Cubit/CORBAplus/MT_Cubit/client/Makefile b/TAO/performance-tests/Cubit/CORBAplus/MT_Cubit/client/Makefile
index 9441697f2d5..d6834f2d40a 100644
--- a/TAO/performance-tests/Cubit/CORBAplus/MT_Cubit/client/Makefile
+++ b/TAO/performance-tests/Cubit/CORBAplus/MT_Cubit/client/Makefile
@@ -42,17 +42,13 @@ CPPFLAGS += -I$(PBHOME)/include
 
 $(IDL_SRC): cubit.idl
 	$(PBHOME)/bin/idlc cubit.idl
-	-/bin/mv cubit.C cubit.cpp
+	-mv cubit.C cubit.cpp
 
 client:	$(addprefix $(VDIR),$(CUBIT_CLIENT_OBJS))
 	$(LINK.cc) $(LDFLAGS) -o $@ $^ $(PBHOME)/lib/mtiiop_s.o $(VLDLIBS) $(POSTLINK)
 
-clean:	
-	-/bin/rm -rf *.o $(BIN) obj.* core Templates.DB .make.state
-
 realclean: clean
-	-/bin/rm -rf cubit.cpp cubit.h cubit_s.*
-
+	-$(RM) cubit.cpp cubit.h cubit_s.*
 
 # DO NOT DELETE THIS LINE -- g++dep uses it.
 # DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
diff --git a/TAO/performance-tests/Cubit/CORBAplus/MT_Cubit/server/Makefile b/TAO/performance-tests/Cubit/CORBAplus/MT_Cubit/server/Makefile
index 58841d4d552..4a73e39f1a8 100644
--- a/TAO/performance-tests/Cubit/CORBAplus/MT_Cubit/server/Makefile
+++ b/TAO/performance-tests/Cubit/CORBAplus/MT_Cubit/server/Makefile
@@ -44,17 +44,15 @@ CPPFLAGS += -I$(PBHOME)/include
 
 $(IDL_SRC): cubit.idl
 	$(PBHOME)/bin/idlc cubit.idl
-	-/bin/mv cubit.C cubit.cpp
-	-/bin/mv cubit_s.C cubit_s.cpp
+	-mv cubit.C cubit.cpp
+	-mv cubit_s.C cubit_s.cpp
 
 svr:	$(addprefix $(VDIR),$(CUBIT_SVR_OBJS))
 	$(LINK.cc) $(LDFLAGS) -o $@ $^ $(PBHOME)/lib/iiop_s.o $(VLDLIBS) $(POSTLINK)
 
-clean:
-	-/bin/rm -rf *.o $(BIN) obj.* core Templates.DB .make.state
-
 realclean: clean
-	-/bin/rm -rf cubit.cpp cubit.h cubit_s.*
+	-$(RM) cubit.cpp cubit.h cubit_s.*
+
 # DO NOT DELETE THIS LINE -- g++dep uses it.
 # DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
 
diff --git a/TAO/performance-tests/Cubit/Orbix/base_server/Makefile b/TAO/performance-tests/Cubit/Orbix/base_server/Makefile
index 67d5a0c16f6..47e25193c7b 100644
--- a/TAO/performance-tests/Cubit/Orbix/base_server/Makefile
+++ b/TAO/performance-tests/Cubit/Orbix/base_server/Makefile
@@ -55,7 +55,8 @@ server: $(addprefix $(VDIR),$(SVR_OBJS))
 	$(LINK.cc) -o server $(addprefix $(VDIR),$(SVR_OBJS)) $(LDFLAGS) $(ITIIOP) $(ITSRV) $(VLDLIBS) $(POSTLINK)
 
 realclean: clean
-	-/bin/rm -rf server cubitC.* cubitS.* cubit.hh
+	-$(RM) server cubitC.* cubitS.* cubit.hh
+
 #----------------------------------------------------------------------------
 #	Dependencies
 #----------------------------------------------------------------------------
diff --git a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Makefile b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Makefile
index 3560adda63a..a0beb176254 100644
--- a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Makefile
+++ b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Makefile
@@ -87,7 +87,7 @@ collocation/collocation_test: $(addprefix $(VDIR),$(COLLOCATION_OBJS))
 	$(LINK.cc) $(LDFLAGS) -o $@ $^ $(VLDLIBS) $(POSTLINK)
 
 realclean: clean
-	-/bin/rm -rf cubitC.* cubitS.* cubitS_T.*
+	-$(RM) cubitC.* cubitS.* cubitS_T.*
 
 # DO NOT DELETE THIS LINE -- g++dep uses it.
 # DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
diff --git a/TAO/performance-tests/Cubit/TAO/MT_Cubit/MT_Cubit_Test b/TAO/performance-tests/Cubit/TAO/MT_Cubit/MT_Cubit_Test
index ab51c1c4083..fd21385fae8 100755
--- a/TAO/performance-tests/Cubit/TAO/MT_Cubit/MT_Cubit_Test
+++ b/TAO/performance-tests/Cubit/TAO/MT_Cubit/MT_Cubit_Test
@@ -46,6 +46,11 @@ if [ $# -ne 1 ]; then
 fi
 threads=`expr $1 + 1`
 
+if [ $threads -ge 40 ]; then
+  echo $0: limit of 40 threads
+  exit 0
+fi
+
 
 ########
 ######## Make sure that the executables have been built.
diff --git a/TAO/performance-tests/Cubit/TAO/MT_Cubit/Makefile b/TAO/performance-tests/Cubit/TAO/MT_Cubit/Makefile
index 96412edd72e..49b7aa49319 100644
--- a/TAO/performance-tests/Cubit/TAO/MT_Cubit/Makefile
+++ b/TAO/performance-tests/Cubit/TAO/MT_Cubit/Makefile
@@ -95,11 +95,8 @@ client:	$(addprefix $(VDIR),$(CUBIT_CLIENT_OBJS))
 .obj/pccTimer.o .obj/pccTimer.so .shobj/pccTimer.o .shobj/pccTimer.so: /project/doc/mvme/pccTimer.cpp
 	@$(COMPILE.cc) -o $@ $<
 
-clean:
-	-/bin/rm -rf *.o $(BIN) obj.* core Templates.DB .make.state
-
 realclean: clean
-	-/bin/rm -rf cubitC.* cubitS.* cubitS_T.*
+	-$(RM) cubitC.* cubitS.* cubitS_T.*
 
 # DO NOT DELETE THIS LINE -- g++dep uses it.
 # DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
diff --git a/TAO/performance-tests/POA/Object_Creation_And_Registration/Makefile b/TAO/performance-tests/POA/Object_Creation_And_Registration/Makefile
index 2d312d42458..793cf941b7a 100644
--- a/TAO/performance-tests/POA/Object_Creation_And_Registration/Makefile
+++ b/TAO/performance-tests/POA/Object_Creation_And_Registration/Makefile
@@ -45,7 +45,7 @@ registration: $(addprefix $(VDIR),$(TEST_OBJS))
 	$(LINK.cc) $(LDFLAGS) -o $@ $^ $(VLDLIBS) $(POSTLINK)
 
 realclean: clean
-	-/bin/rm -rf testC.* testS.* testS_T.*
+	-$(RM) testC.* testS.* testS_T.*
 
 # DO NOT DELETE THIS LINE -- g++dep uses it.
 # DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
diff --git a/TAO/performance-tests/Pluggable/Makefile b/TAO/performance-tests/Pluggable/Makefile
index bf98d811277..0369a6b783a 100644
--- a/TAO/performance-tests/Pluggable/Makefile
+++ b/TAO/performance-tests/Pluggable/Makefile
@@ -66,7 +66,7 @@ client:	$(addprefix $(VDIR),$(PP_TEST_CLT_OBJS))
 	$(LINK.cc) $(LDFLAGS) -o $@ $^ $(VLDLIBS) $(POSTLINK)
 
 realclean: clean
-	-/bin/rm -rf PP_TestC.* PP_TestS.* PP_TestS_T.*
+	-$(RM) PP_TestC.* PP_TestS.* PP_TestS_T.*
 
 # DO NOT DELETE THIS LINE -- g++dep uses it.
 # DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
diff --git a/TAO/performance-tests/Thruput/COOL/Makefile b/TAO/performance-tests/Thruput/COOL/Makefile
index 08735a2d8fd..1ffc61fd6cb 100644
--- a/TAO/performance-tests/Thruput/COOL/Makefile
+++ b/TAO/performance-tests/Thruput/COOL/Makefile
@@ -52,7 +52,7 @@ all:	$(IDL_SRC) server client
 
 $(IDL_SRC): ttcp.idl
 	$(CHORUS_BINDIR)/chic $(IDLFLAGS) ttcp.idl
-	-/bin/mv ttcp.C ttcp.cpp
+	-mv ttcp.C ttcp.cpp
 
 server: $(addprefix $(VDIR),$(SVR_OBJS))
 	$(LINK.cc) -o server $(addprefix $(VDIR),$(SVR_OBJS)) $(LDFLAGS) $(ITIIOP) $(ITSRV) $(VLDLIBS) $(POSTLINK)
@@ -61,7 +61,7 @@ client: $(addprefix $(VDIR),$(CLT_OBJS))
 	$(LINK.cc) -o client $(addprefix $(VDIR),$(CLT_OBJS)) $(LDFLAGS) $(ITIIOP) $(ITCLT) $(VLDLIBS) $(POSTLINK)
 
 realclean: clean
-	-/bin/rm -rf ttcp.cpp ttcp.H sk_ttcp.C sk_ttcp.H server client
+	-$(RM) ttcp.cpp ttcp.H sk_ttcp.C sk_ttcp.H server client
 
 #----------------------------------------------------------------------------
 #	Dependencies
diff --git a/TAO/performance-tests/Thruput/CORBAplus/Makefile b/TAO/performance-tests/Thruput/CORBAplus/Makefile
index cc6db955b9a..8bad8861b30 100644
--- a/TAO/performance-tests/Thruput/CORBAplus/Makefile
+++ b/TAO/performance-tests/Thruput/CORBAplus/Makefile
@@ -49,8 +49,8 @@ CPPFLAGS += -I$(PBHOME)/include
 
 $(IDL_SRC): ttcp.idl
 	$(PBHOME)/bin/idlc ttcp.idl
-	-/bin/mv ttcp.C ttcp.cpp
-	-/bin/mv ttcp_s.C ttcp_s.cpp
+	-mv ttcp.C ttcp.cpp
+	-mv ttcp_s.C ttcp_s.cpp
 
 server:	$(addprefix $(VDIR),$(TTCP_SERVER_OBJS))
 	$(LINK.cc) $(LDFLAGS) -o $@ $^ $(PBHOME)/lib/iiop_s.o $(VLDLIBS) $(POSTLINK)
@@ -61,8 +61,5 @@ server:	$(addprefix $(VDIR),$(TTCP_SERVER_OBJS))
 client:	$(addprefix $(VDIR),$(TTCP_CLIENT_OBJS))
 	$(LINK.cc) $(LDFLAGS) -o $@ $^ $(VLDLIBS) $(POSTLINK)
 
-clean:
-	-/bin/rm -rf *.o $(BIN) obj.* core Templates.DB .make.state
-
 realclean: clean
-	-/bin/rm -rf ttcp.cpp ttcp.h ttcp_s.cpp ttcp_s.h
+	-$(RM) ttcp.cpp ttcp.h ttcp_s.cpp ttcp_s.h
diff --git a/TAO/performance-tests/Thruput/TAO/Makefile b/TAO/performance-tests/Thruput/TAO/Makefile
index 968920f29bc..32f87e4eb55 100644
--- a/TAO/performance-tests/Thruput/TAO/Makefile
+++ b/TAO/performance-tests/Thruput/TAO/Makefile
@@ -58,7 +58,8 @@ client:	$(addprefix $(VDIR),$(TTCP_CLIENT_OBJS))
 	$(LINK.cc) $(LDFLAGS) -o $@ $^ $(VLDLIBS) $(POSTLINK)
 
 realclean: clean
-	-/bin/rm -rf ttcpC.* ttcpS.* ttcpS_T.*
+	-$(RM) ttcpC.* ttcpS.* ttcpS_T.*
+
 # DO NOT DELETE THIS LINE -- g++dep uses it.
 # DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
 
diff --git a/TAO/tests/CDR/Makefile b/TAO/tests/CDR/Makefile
index 0ffa83bdf62..d52d935e1bc 100644
--- a/TAO/tests/CDR/Makefile
+++ b/TAO/tests/CDR/Makefile
@@ -64,9 +64,6 @@ octet_sequence: $(addprefix $(VDIR),$(OCTET_SEQUENCE_OBJS))
 allocator: $(addprefix $(VDIR),$(ALLOCATOR_OBJS))
 	$(LINK.cc) $(LDFLAGS) -o $@ $^ $(VLDLIBS) $(POSTLINK)
 
-clean:
-	-/bin/rm -rf *.o $(BIN) obj.* core Templates.DB .make.state
-
 # DO NOT DELETE THIS LINE -- g++dep uses it.
 # DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
 
diff --git a/TAO/tests/DynAny_Test/Makefile b/TAO/tests/DynAny_Test/Makefile
index 361eaae7391..6f7ff86f6f2 100644
--- a/TAO/tests/DynAny_Test/Makefile
+++ b/TAO/tests/DynAny_Test/Makefile
@@ -59,10 +59,7 @@ CPPFLAGS += -I$(TAO_ROOT)
 basic_test:	$(addprefix $(VDIR),$(BASIC_TEST_OBJS))
 		$(LINK.cc) $(LDFLAGS) -o $@ $^ $(VLDLIBS) $(POSTLINK)
 
-clean:		
-		-/bin/rm -rf $(VDIR)/*.o $(BIN) obj.* core Templates.DB .make.state
-
 realclean:	clean
-		-/bin/rm -rf da_testsC.* da_testsS.* da_testsS_T.*
+		-$(RM) da_testsC.* da_testsS.* da_testsS_T.*
 
 
diff --git a/TAO/tests/MT_Client/Makefile b/TAO/tests/MT_Client/Makefile
index e375692d8ae..33cc2ea6749 100644
--- a/TAO/tests/MT_Client/Makefile
+++ b/TAO/tests/MT_Client/Makefile
@@ -57,7 +57,7 @@ orb_creation: $(addprefix $(VDIR),$(ORB_CREATION_OBJS))
 	$(LINK.cc) $(LDFLAGS) -o $@ $^ $(VLDLIBS) $(POSTLINK)
 
 realclean: clean
-	-/bin/rm -rf testC.* testS.* testS_T.*
+	-$(RM) testC.* testS.* testS_T.*
 
 # DO NOT DELETE THIS LINE -- g++dep uses it.
 # DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
diff --git a/TAO/tests/Multiple_Inheritance/Makefile b/TAO/tests/Multiple_Inheritance/Makefile
index cf6d465c5ea..4406935c0d2 100644
--- a/TAO/tests/Multiple_Inheritance/Makefile
+++ b/TAO/tests/Multiple_Inheritance/Makefile
@@ -50,7 +50,7 @@ client:	$(addprefix $(VDIR),$(FILE_CLT_OBJS))
 	$(LINK.cc) $(LDFLAGS) -o $@ $^ $(VLDLIBS) $(POSTLINK)
 
 realclean: clean
-	-/bin/rm -rf Multiple_InheritanceC.* Multiple_InheritanceS.* Multiple_InheritanceS_T.* client server
+	-$(RM) Multiple_InheritanceC.* Multiple_InheritanceS.* Multiple_InheritanceS_T.* client server
 
 # DO NOT DELETE THIS LINE -- g++dep uses it.
 # DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
diff --git a/TAO/tests/Multiple_Profiles/Makefile b/TAO/tests/Multiple_Profiles/Makefile
index 7c2dde7858a..0d266622919 100644
--- a/TAO/tests/Multiple_Profiles/Makefile
+++ b/TAO/tests/Multiple_Profiles/Makefile
@@ -41,9 +41,6 @@ include $(TAO_ROOT)/taoconfig.mk
 forward:	$(addprefix $(VDIR),$(OBJS))
 	$(LINK.cc) $(LDFLAGS) -o $@ $^ $(VLDLIBS) $(POSTLINK)
 
-#realclean: clean
-#	-/bin/rm -rf 
-
 # DO NOT DELETE THIS LINE -- g++dep uses it.
 # DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
 
diff --git a/TAO/tests/OctetSeq/Makefile b/TAO/tests/OctetSeq/Makefile
index 2d6c2c26ec4..4274ab32d22 100644
--- a/TAO/tests/OctetSeq/Makefile
+++ b/TAO/tests/OctetSeq/Makefile
@@ -49,11 +49,8 @@ OctetSeq: $(addprefix $(VDIR),$(OCTETSEQ_OBJS))
 
 .PRECIOUS: $(IDL_HDR) $(IDL_SRC)
 
-clean:
-	-/bin/rm -rf *.o $(BIN) obj.* core Templates.DB .make.state
-
 realclean: clean
-	-/bin/rm -rf testC.* testS.* testS_T.*
+	-$(RM) testC.* testS.* testS_T.*
 
 # DO NOT DELETE THIS LINE -- g++dep uses it.
 # DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
diff --git a/TAO/tests/Param_Test/Makefile b/TAO/tests/Param_Test/Makefile
index 2996352021a..93a85a27015 100644
--- a/TAO/tests/Param_Test/Makefile
+++ b/TAO/tests/Param_Test/Makefile
@@ -93,7 +93,7 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU
 
 override TAO_IDLFLAGS += -hc Cli.h -hs Ser.h -hT Ser_T.h \
 			 -cs Cli.cpp -ci Cli.i \
-			 -ss Ser.cpp -sT Ser_T.cpp  
+			 -ss Ser.cpp -sT Ser_T.cpp
 
 TSS_ORB_FLAG = #-DTAO_HAS_TSS_ORBCORE
 CPPFLAGS += -I$(TAO_ROOT) $(TSS_ORB_FLAG)
@@ -106,11 +106,8 @@ server:	$(addprefix $(VDIR),$(PARAM_TEST_SVR_OBJS))
 client:	$(addprefix $(VDIR),$(PARAM_TEST_CLT_OBJS))
 	$(LINK.cc) $(LDFLAGS) -o $@ $^ $(VLDLIBS) $(POSTLINK)
 
-clean:
-	-/bin/rm -rf $(VDIR)/*.o $(BIN) obj.* core Templates.DB .make.state
-
 realclean: clean
-	-/bin/rm -rf param_testCli.* param_testSer.* param_testSer_T.*
+	-$(RM) param_testCli.* param_testSer.* param_testSer_T.*
 
 endif # ! ACE_HAS_GNUG_PRE_2_8
 
diff --git a/bin/Makefile b/bin/Makefile
index 4af39ba9094..fb69b34ef03 100644
--- a/bin/Makefile
+++ b/bin/Makefile
@@ -47,10 +47,10 @@ else   # Not building envinfo
 
 include $(ACE_ROOT)/include/makeinclude/platform_macros.GNU
 
-CFILES		= clone.cpp 
+CFILES		= clone.cpp
 OFILES		= clone.o
 DFLAGS		= -b elf
-CCFLAGS		+= -I$(ACE_ROOT) 
+CCFLAGS		+= -I$(ACE_ROOT)
 
 #############################################################################
 # C++ directives
@@ -63,11 +63,8 @@ CCFLAGS		+= -I$(ACE_ROOT)
 clone: $(OFILES)
 	$(CXX) $(CCFLAGS) -o $@ $(OFILES)
 
-clean:
-	-/bin/rm -f *.o *.out *~ core
-
-realclean: clean 
-	-/bin/rm -fr clone
+realclean: clean
+	-$(RM) clone
 
 endif  # envinfo