Added `clean-local' targets to all Makefile.am files.

45 files changed, 292 insertions, 0 deletions

diff --git a/TAO/TAO_IDL/Makefile.am b/TAO/TAO_IDL/Makefile.am
index 67859f0e9d1..d2c1459db76 100644
--- a/TAO/TAO_IDL/Makefile.am
+++ b/TAO/TAO_IDL/Makefile.am
@@ -44,3 +44,10 @@ tags:
 	rm -f TAGS
 	find . -name "*.h" -print | etags -a --c++ -
 	find . -name "*.cpp" -print | etags -a -
+
+## Clean up some additional files/directories possibly created during
+## the configure script tests.
+clean-local:
+	-rm -f *.bak *.rpo *.sym lib*.*_pure_* Makefile.old core
+	-rm -rf ptrepository Templates.DB gcctemp.c gcctemp so_locations
+
diff --git a/TAO/TAO_IDL/ast/Makefile.am b/TAO/TAO_IDL/ast/Makefile.am
index 75e0bf342d2..3c9efba103a 100644
--- a/TAO/TAO_IDL/ast/Makefile.am
+++ b/TAO/TAO_IDL/ast/Makefile.am
@@ -49,3 +49,10 @@ libast_a_SOURCES = \
          ast_union_branch.cpp  \
          ast_union_label.cpp
 
+
+## Clean up some additional files/directories possibly created during
+## the configure script tests.
+clean-local:
+	-rm -f *.bak *.rpo *.sym lib*.*_pure_* Makefile.old core
+	-rm -rf ptrepository Templates.DB gcctemp.c gcctemp so_locations
+
diff --git a/TAO/TAO_IDL/be/Makefile.am b/TAO/TAO_IDL/be/Makefile.am
index df5dfca68c8..67b85a70c01 100644
--- a/TAO/TAO_IDL/be/Makefile.am
+++ b/TAO/TAO_IDL/be/Makefile.am
@@ -82,3 +82,10 @@ dist-hook:
           $(mkinstalldirs) $(distdir)/$$p; \
           cp $$p/*.cpp $(distdir)/$$p; \
         done
+
+## Clean up some additional files/directories possibly created during
+## the configure script tests.
+clean-local:
+	-rm -f *.bak *.rpo *.sym lib*.*_pure_* Makefile.old core
+	-rm -rf ptrepository Templates.DB gcctemp.c gcctemp so_locations
+
diff --git a/TAO/TAO_IDL/be_include/Makefile.am b/TAO/TAO_IDL/be_include/Makefile.am
index 029bbeafe3e..5574114093a 100644
--- a/TAO/TAO_IDL/be_include/Makefile.am
+++ b/TAO/TAO_IDL/be_include/Makefile.am
@@ -75,3 +75,10 @@ dist-hook:
           $(mkinstalldirs) $(distdir)/$$p; \
           cp $$p/*.h $(distdir)/$$p; \
         done
+
+## Clean up some additional files/directories possibly created during
+## the configure script tests.
+clean-local:
+	-rm -f *.bak *.rpo *.sym lib*.*_pure_* Makefile.old core
+	-rm -rf ptrepository Templates.DB gcctemp.c gcctemp so_locations
+
diff --git a/TAO/TAO_IDL/driver/Makefile.am b/TAO/TAO_IDL/driver/Makefile.am
index 333da3c8a0b..b7293137b69 100644
--- a/TAO/TAO_IDL/driver/Makefile.am
+++ b/TAO/TAO_IDL/driver/Makefile.am
@@ -30,3 +30,10 @@ libdriver_a_SOURCES = \
 ##        Is the "+=" a portable make feature?
 CXXFLAGS += \
            -DCPP_LOCATION=\"$(CXX)\"
+
+## Clean up some additional files/directories possibly created during
+## the configure script tests.
+clean-local:
+	-rm -f *.bak *.rpo *.sym lib*.*_pure_* Makefile.old core
+	-rm -rf ptrepository Templates.DB gcctemp.c gcctemp so_locations
+
diff --git a/TAO/TAO_IDL/fe/Makefile.am b/TAO/TAO_IDL/fe/Makefile.am
index 8a77d59f628..11f9ce72a1b 100644
--- a/TAO/TAO_IDL/fe/Makefile.am
+++ b/TAO/TAO_IDL/fe/Makefile.am
@@ -86,3 +86,10 @@ y.tab: idl.yy
 noinst_DATA = keywords.dat
 
 EXTRA_DIST = idl.ll idl.yy keywords.dat y.tab.cpp.diff
+
+## Clean up some additional files/directories possibly created during
+## the configure script tests.
+clean-local:
+	-rm -f *.bak *.rpo *.sym lib*.*_pure_* Makefile.old core
+	-rm -rf ptrepository Templates.DB gcctemp.c gcctemp so_locations
+
diff --git a/TAO/TAO_IDL/include/Makefile.am b/TAO/TAO_IDL/include/Makefile.am
index b0c60ddc06d..d589b7b2e95 100644
--- a/TAO/TAO_IDL/include/Makefile.am
+++ b/TAO/TAO_IDL/include/Makefile.am
@@ -78,3 +78,10 @@ noinst_HEADERS = \
          utl_stack.h  \
          utl_string.h  \
          utl_strlist.h
+
+## Clean up some additional files/directories possibly created during
+## the configure script tests.
+clean-local:
+	-rm -f *.bak *.rpo *.sym lib*.*_pure_* Makefile.old core
+	-rm -rf ptrepository Templates.DB gcctemp.c gcctemp so_locations
+
diff --git a/TAO/TAO_IDL/narrow/Makefile.am b/TAO/TAO_IDL/narrow/Makefile.am
index 262a433ad11..160565df988 100644
--- a/TAO/TAO_IDL/narrow/Makefile.am
+++ b/TAO/TAO_IDL/narrow/Makefile.am
@@ -19,3 +19,10 @@ noinst_LIBRARIES = libnarrow.a
 
 libnarrow_a_SOURCES = \
          narrow.cpp
+
+## Clean up some additional files/directories possibly created during
+## the configure script tests.
+clean-local:
+	-rm -f *.bak *.rpo *.sym lib*.*_pure_* Makefile.old core
+	-rm -rf ptrepository Templates.DB gcctemp.c gcctemp so_locations
+
diff --git a/TAO/TAO_IDL/util/Makefile.am b/TAO/TAO_IDL/util/Makefile.am
index a37e8a78177..94e553b4c06 100644
--- a/TAO/TAO_IDL/util/Makefile.am
+++ b/TAO/TAO_IDL/util/Makefile.am
@@ -35,3 +35,10 @@ libutil_a_SOURCES = \
          utl_stack.cpp  \
          utl_string.cpp  \
          utl_strlist.cpp
+
+## Clean up some additional files/directories possibly created during
+## the configure script tests.
+clean-local:
+	-rm -f *.bak *.rpo *.sym lib*.*_pure_* Makefile.old core
+	-rm -rf ptrepository Templates.DB gcctemp.c gcctemp so_locations
+
diff --git a/TAO/orbsvcs/Concurrency_Service/Makefile.am b/TAO/orbsvcs/Concurrency_Service/Makefile.am
index 6ee4dd3b1b1..083ebfe5f1c 100644
--- a/TAO/orbsvcs/Concurrency_Service/Makefile.am
+++ b/TAO/orbsvcs/Concurrency_Service/Makefile.am
@@ -27,3 +27,10 @@ noinst_HEADERS = \
         Concurrency_Service.h
 
 EXTRA_DIST = README
+
+## Clean up some additional files/directories possibly created during
+## the configure script tests.
+clean-local:
+	-rm -f *.bak *.rpo *.sym lib*.*_pure_* Makefile.old core
+	-rm -rf ptrepository Templates.DB gcctemp.c gcctemp so_locations
+
diff --git a/TAO/orbsvcs/CosEvent_Service/Makefile.am b/TAO/orbsvcs/CosEvent_Service/Makefile.am
index 296a1166e22..2b19fa4cfef 100644
--- a/TAO/orbsvcs/CosEvent_Service/Makefile.am
+++ b/TAO/orbsvcs/CosEvent_Service/Makefile.am
@@ -27,3 +27,10 @@ noinst_HEADERS = \
         CosEvent_Service.h
 
 EXTRA_DIST = README
+
+## Clean up some additional files/directories possibly created during
+## the configure script tests.
+clean-local:
+	-rm -f *.bak *.rpo *.sym lib*.*_pure_* Makefile.old core
+	-rm -rf ptrepository Templates.DB gcctemp.c gcctemp so_locations
+
diff --git a/TAO/orbsvcs/Dump_Schedule/Makefile.am b/TAO/orbsvcs/Dump_Schedule/Makefile.am
index 97ea89e65e6..80ae24e06b5 100644
--- a/TAO/orbsvcs/Dump_Schedule/Makefile.am
+++ b/TAO/orbsvcs/Dump_Schedule/Makefile.am
@@ -26,3 +26,10 @@ Dump_Schedule_SOURCES = \
 ## noinst_HEADERS = 
 
 ## EXTRA_DIST = README
+
+## Clean up some additional files/directories possibly created during
+## the configure script tests.
+clean-local:
+	-rm -f *.bak *.rpo *.sym lib*.*_pure_* Makefile.old core
+	-rm -rf ptrepository Templates.DB gcctemp.c gcctemp so_locations
+
diff --git a/TAO/orbsvcs/Event_Service/Makefile.am b/TAO/orbsvcs/Event_Service/Makefile.am
index 658d762aa30..5b39b7edfb1 100644
--- a/TAO/orbsvcs/Event_Service/Makefile.am
+++ b/TAO/orbsvcs/Event_Service/Makefile.am
@@ -27,3 +27,10 @@ noinst_HEADERS = \
         Event_Service.h
 
 ## EXTRA_DIST = README
+
+## Clean up some additional files/directories possibly created during
+## the configure script tests.
+clean-local:
+	-rm -f *.bak *.rpo *.sym lib*.*_pure_* Makefile.old core
+	-rm -rf ptrepository Templates.DB gcctemp.c gcctemp so_locations
+
diff --git a/TAO/orbsvcs/ImplRepo_Service/Makefile.am b/TAO/orbsvcs/ImplRepo_Service/Makefile.am
index d4784df84ce..e681e218b0d 100644
--- a/TAO/orbsvcs/ImplRepo_Service/Makefile.am
+++ b/TAO/orbsvcs/ImplRepo_Service/Makefile.am
@@ -30,3 +30,10 @@ noinst_HEADERS = \
         Repository.h
 
 ## EXTRA_DIST = README
+
+## Clean up some additional files/directories possibly created during
+## the configure script tests.
+clean-local:
+	-rm -f *.bak *.rpo *.sym lib*.*_pure_* Makefile.old core
+	-rm -rf ptrepository Templates.DB gcctemp.c gcctemp so_locations
+
diff --git a/TAO/orbsvcs/LifeCycle_Service/Makefile.am b/TAO/orbsvcs/LifeCycle_Service/Makefile.am
index 46979fd61f9..d456fd634f0 100644
--- a/TAO/orbsvcs/LifeCycle_Service/Makefile.am
+++ b/TAO/orbsvcs/LifeCycle_Service/Makefile.am
@@ -33,3 +33,10 @@ noinst_HEADERS = \
         LifeCycle_Service_i.h
 
 ## EXTRA_DIST = README
+
+## Clean up some additional files/directories possibly created during
+## the configure script tests.
+clean-local:
+	-rm -f *.bak *.rpo *.sym lib*.*_pure_* Makefile.old core
+	-rm -rf ptrepository Templates.DB gcctemp.c gcctemp so_locations
+
diff --git a/TAO/orbsvcs/Logging_Service/Makefile.am b/TAO/orbsvcs/Logging_Service/Makefile.am
index 47861d6a42c..93e3437fbb5 100644
--- a/TAO/orbsvcs/Logging_Service/Makefile.am
+++ b/TAO/orbsvcs/Logging_Service/Makefile.am
@@ -28,3 +28,10 @@ noinst_HEADERS = \
         Logging_Service_i.h
 
 ## EXTRA_DIST = README
+
+## Clean up some additional files/directories possibly created during
+## the configure script tests.
+clean-local:
+	-rm -f *.bak *.rpo *.sym lib*.*_pure_* Makefile.old core
+	-rm -rf ptrepository Templates.DB gcctemp.c gcctemp so_locations
+
diff --git a/TAO/orbsvcs/Makefile.am b/TAO/orbsvcs/Makefile.am
index 8f27d07c80f..faa3a7cc56c 100644
--- a/TAO/orbsvcs/Makefile.am
+++ b/TAO/orbsvcs/Makefile.am
@@ -23,3 +23,5 @@ SUBDIRS = \
         Trading_Service \
         Logging_Service \
         tests
+
+
diff --git a/TAO/orbsvcs/Naming_Service/Makefile.am b/TAO/orbsvcs/Naming_Service/Makefile.am
index 243ebe82375..eb0a2f09d7c 100644
--- a/TAO/orbsvcs/Naming_Service/Makefile.am
+++ b/TAO/orbsvcs/Naming_Service/Makefile.am
@@ -27,3 +27,10 @@ noinst_HEADERS = \
         Naming_Service.h
 
 EXTRA_DIST = README
+
+## Clean up some additional files/directories possibly created during
+## the configure script tests.
+clean-local:
+	-rm -f *.bak *.rpo *.sym lib*.*_pure_* Makefile.old core
+	-rm -rf ptrepository Templates.DB gcctemp.c gcctemp so_locations
+
diff --git a/TAO/orbsvcs/Scheduling_Service/Makefile.am b/TAO/orbsvcs/Scheduling_Service/Makefile.am
index 02865b18f6d..a1c9126feca 100644
--- a/TAO/orbsvcs/Scheduling_Service/Makefile.am
+++ b/TAO/orbsvcs/Scheduling_Service/Makefile.am
@@ -26,3 +26,10 @@ Scheduling_Service_SOURCES = \
 ## noinst_HEADERS =
 
 ## EXTRA_DIST = README
+
+## Clean up some additional files/directories possibly created during
+## the configure script tests.
+clean-local:
+	-rm -f *.bak *.rpo *.sym lib*.*_pure_* Makefile.old core
+	-rm -rf ptrepository Templates.DB gcctemp.c gcctemp so_locations
+
diff --git a/TAO/orbsvcs/Time_Service/Makefile.am b/TAO/orbsvcs/Time_Service/Makefile.am
index a60c7f37596..d675105e61e 100644
--- a/TAO/orbsvcs/Time_Service/Makefile.am
+++ b/TAO/orbsvcs/Time_Service/Makefile.am
@@ -38,3 +38,10 @@ noinst_HEADERS = \
         Server_i.h
 
 EXTRA_DIST = README
+
+## Clean up some additional files/directories possibly created during
+## the configure script tests.
+clean-local:
+	-rm -f *.bak *.rpo *.sym lib*.*_pure_* Makefile.old core
+	-rm -rf ptrepository Templates.DB gcctemp.c gcctemp so_locations
+
diff --git a/TAO/orbsvcs/Trading_Service/Makefile.am b/TAO/orbsvcs/Trading_Service/Makefile.am
index 447c80fb89a..859084b3f0b 100644
--- a/TAO/orbsvcs/Trading_Service/Makefile.am
+++ b/TAO/orbsvcs/Trading_Service/Makefile.am
@@ -27,3 +27,10 @@ noinst_HEADERS = \
         Trading_Service.h
 
 EXTRA_DIST = README
+
+## Clean up some additional files/directories possibly created during
+## the configure script tests.
+clean-local:
+	-rm -f *.bak *.rpo *.sym lib*.*_pure_* Makefile.old core
+	-rm -rf ptrepository Templates.DB gcctemp.c gcctemp so_locations
+
diff --git a/TAO/orbsvcs/orbsvcs/AV/Makefile.am b/TAO/orbsvcs/orbsvcs/AV/Makefile.am
index 3da9661b33f..8aa87e9e67d 100644
--- a/TAO/orbsvcs/orbsvcs/AV/Makefile.am
+++ b/TAO/orbsvcs/orbsvcs/AV/Makefile.am
@@ -33,3 +33,10 @@ noinst_HEADERS = \
         sfp.h
 
 EXTRA_DIST = README
+
+## Clean up some additional files/directories possibly created during
+## the configure script tests.
+clean-local:
+	-rm -f *.bak *.rpo *.sym lib*.*_pure_* Makefile.old core
+	-rm -rf ptrepository Templates.DB gcctemp.c gcctemp so_locations
+
diff --git a/TAO/orbsvcs/orbsvcs/Concurrency/Makefile.am b/TAO/orbsvcs/orbsvcs/Concurrency/Makefile.am
index 0d7e846020d..1038e3ee925 100644
--- a/TAO/orbsvcs/orbsvcs/Concurrency/Makefile.am
+++ b/TAO/orbsvcs/orbsvcs/Concurrency/Makefile.am
@@ -32,3 +32,10 @@ noinst_HEADERS = \
         CC_LockSetFactory.h \
         Concurrency_Utils.h
 
+
+## Clean up some additional files/directories possibly created during
+## the configure script tests.
+clean-local:
+	-rm -f *.bak *.rpo *.sym lib*.*_pure_* Makefile.old core
+	-rm -rf ptrepository Templates.DB gcctemp.c gcctemp so_locations
+
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/Makefile.am b/TAO/orbsvcs/orbsvcs/CosEvent/Makefile.am
index 06c43124200..4e1ad8fc3fb 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/Makefile.am
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/Makefile.am
@@ -33,3 +33,10 @@ noinst_HEADERS = \
         ProxyPushConsumer_i.h \
         ProxyPushSupplier_i.h \
         SupplierAdmin_i.h
+
+## Clean up some additional files/directories possibly created during
+## the configure script tests.
+clean-local:
+	-rm -f *.bak *.rpo *.sym lib*.*_pure_* Makefile.old core
+	-rm -rf ptrepository Templates.DB gcctemp.c gcctemp so_locations
+
diff --git a/TAO/orbsvcs/orbsvcs/Event/Makefile.am b/TAO/orbsvcs/orbsvcs/Event/Makefile.am
index a87f40e0493..c3d26dff635 100644
--- a/TAO/orbsvcs/orbsvcs/Event/Makefile.am
+++ b/TAO/orbsvcs/orbsvcs/Event/Makefile.am
@@ -140,3 +140,10 @@ noinst_HEADERS = \
         Timer_Module.i
 
 EXTRA_DIST = README
+
+## Clean up some additional files/directories possibly created during
+## the configure script tests.
+clean-local:
+	-rm -f *.bak *.rpo *.sym lib*.*_pure_* Makefile.old core
+	-rm -rf ptrepository Templates.DB gcctemp.c gcctemp so_locations
+
diff --git a/TAO/orbsvcs/orbsvcs/Log/Makefile.am b/TAO/orbsvcs/orbsvcs/Log/Makefile.am
index 5f013201668..81a356344ff 100644
--- a/TAO/orbsvcs/orbsvcs/Log/Makefile.am
+++ b/TAO/orbsvcs/orbsvcs/Log/Makefile.am
@@ -25,3 +25,10 @@ libTAO_Logger_la_SOURCES = \
 
 noinst_HEADERS = \
         Logger_i.h
+
+## Clean up some additional files/directories possibly created during
+## the configure script tests.
+clean-local:
+	-rm -f *.bak *.rpo *.sym lib*.*_pure_* Makefile.old core
+	-rm -rf ptrepository Templates.DB gcctemp.c gcctemp so_locations
+
diff --git a/TAO/orbsvcs/orbsvcs/Makefile.am b/TAO/orbsvcs/orbsvcs/Makefile.am
index 080fabdf479..e8fc260b88d 100644
--- a/TAO/orbsvcs/orbsvcs/Makefile.am
+++ b/TAO/orbsvcs/orbsvcs/Makefile.am
@@ -94,3 +94,10 @@ liborbsvcs_la_SOURCES = \
         
 
 VPATH=.:Naming:Time:Log:Concurrency:Property:Trader:Sched:Event:CosEvent:AV:
+
+## Clean up some additional files/directories possibly created during
+## the configure script tests.
+clean-local:
+	-rm -f *.bak *.rpo *.sym lib*.*_pure_* Makefile.old core
+	-rm -rf ptrepository Templates.DB gcctemp.c gcctemp so_locations
+
diff --git a/TAO/orbsvcs/orbsvcs/Naming/Makefile.am b/TAO/orbsvcs/orbsvcs/Naming/Makefile.am
index bd0c6589747..65f3bb1b56d 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/Makefile.am
+++ b/TAO/orbsvcs/orbsvcs/Naming/Makefile.am
@@ -33,3 +33,10 @@ noinst_HEADERS = \
         Naming_Utils.h
 
 EXTRA_DIST = README
+
+## Clean up some additional files/directories possibly created during
+## the configure script tests.
+clean-local:
+	-rm -f *.bak *.rpo *.sym lib*.*_pure_* Makefile.old core
+	-rm -rf ptrepository Templates.DB gcctemp.c gcctemp so_locations
+
diff --git a/TAO/orbsvcs/orbsvcs/Property/Makefile.am b/TAO/orbsvcs/orbsvcs/Property/Makefile.am
index 446c94f7f12..b8235d16383 100644
--- a/TAO/orbsvcs/orbsvcs/Property/Makefile.am
+++ b/TAO/orbsvcs/orbsvcs/Property/Makefile.am
@@ -25,3 +25,10 @@ libTAO_Property_la_SOURCES = \
 
 noinst_HEADERS = \
         CosPropertyService_i.h
+
+## Clean up some additional files/directories possibly created during
+## the configure script tests.
+clean-local:
+	-rm -f *.bak *.rpo *.sym lib*.*_pure_* Makefile.old core
+	-rm -rf ptrepository Templates.DB gcctemp.c gcctemp so_locations
+
diff --git a/TAO/orbsvcs/orbsvcs/Sched/Makefile.am b/TAO/orbsvcs/orbsvcs/Sched/Makefile.am
index c30c1cc1086..1adfc0f5e39 100644
--- a/TAO/orbsvcs/orbsvcs/Sched/Makefile.am
+++ b/TAO/orbsvcs/orbsvcs/Sched/Makefile.am
@@ -35,3 +35,10 @@ noinst_HEADERS = \
         Scheduler.h \
         Scheduler_Generic.h \
         Strategy_Scheduler.h
+
+## Clean up some additional files/directories possibly created during
+## the configure script tests.
+clean-local:
+	-rm -f *.bak *.rpo *.sym lib*.*_pure_* Makefile.old core
+	-rm -rf ptrepository Templates.DB gcctemp.c gcctemp so_locations
+
diff --git a/TAO/orbsvcs/orbsvcs/Time/Makefile.am b/TAO/orbsvcs/orbsvcs/Time/Makefile.am
index da50550bca2..7b1f4668c1a 100644
--- a/TAO/orbsvcs/orbsvcs/Time/Makefile.am
+++ b/TAO/orbsvcs/orbsvcs/Time/Makefile.am
@@ -33,3 +33,10 @@ noinst_HEADERS = \
         TAO_Time_Service_Server.h \
         TAO_UTO.h \
         Timer_Helper.h
+
+## Clean up some additional files/directories possibly created during
+## the configure script tests.
+clean-local:
+	-rm -f *.bak *.rpo *.sym lib*.*_pure_* Makefile.old core
+	-rm -rf ptrepository Templates.DB gcctemp.c gcctemp so_locations
+
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Makefile.am b/TAO/orbsvcs/orbsvcs/Trader/Makefile.am
index 6b75e083567..7c906d9aef0 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Makefile.am
+++ b/TAO/orbsvcs/orbsvcs/Trader/Makefile.am
@@ -49,3 +49,10 @@ noinst_HEADERS = \
         Trader_Interfaces.h \
         Trader_T.h \
         Trader_Utils.h
+
+## Clean up some additional files/directories possibly created during
+## the configure script tests.
+clean-local:
+	-rm -f *.bak *.rpo *.sym lib*.*_pure_* Makefile.old core
+	-rm -rf ptrepository Templates.DB gcctemp.c gcctemp so_locations
+
diff --git a/TAO/orbsvcs/tests/AVStreams/Makefile.am b/TAO/orbsvcs/tests/AVStreams/Makefile.am
index a7d36a0e1fe..78c1bdc6b4f 100644
--- a/TAO/orbsvcs/tests/AVStreams/Makefile.am
+++ b/TAO/orbsvcs/tests/AVStreams/Makefile.am
@@ -20,3 +20,4 @@ SUBDIRS = \
         sfp
 
 EXTRA_DIST = README
+
diff --git a/TAO/orbsvcs/tests/AVStreams/benchmark/Makefile.am b/TAO/orbsvcs/tests/AVStreams/benchmark/Makefile.am
index 7361ab6b9e8..4177c191865 100644
--- a/TAO/orbsvcs/tests/AVStreams/benchmark/Makefile.am
+++ b/TAO/orbsvcs/tests/AVStreams/benchmark/Makefile.am
@@ -44,3 +44,10 @@ noinst_HEADERS = \
 noinst_DATA = svc.conf clnt.conf
 
 EXTRA_DIST = $(noinst_DATA)
+
+## Clean up some additional files/directories possibly created during
+## the configure script tests.
+clean-local:
+	-rm -f *.bak *.rpo *.sym lib*.*_pure_* Makefile.old core
+	-rm -rf ptrepository Templates.DB gcctemp.c gcctemp so_locations
+
diff --git a/TAO/orbsvcs/tests/AVStreams/mpeg/source/Makefile.am b/TAO/orbsvcs/tests/AVStreams/mpeg/source/Makefile.am
index 7f6ca007e13..bdcffaba0c7 100644
--- a/TAO/orbsvcs/tests/AVStreams/mpeg/source/Makefile.am
+++ b/TAO/orbsvcs/tests/AVStreams/mpeg/source/Makefile.am
@@ -26,3 +26,4 @@ EXTRA_DIST = TODO
 dist-hook:
         $(mkinstalldirs) $(distdir)/$(subdir)
         tar cf - ./include | (cd $(distdir)/$(subdir); tar xfBp -)
+
diff --git a/TAO/orbsvcs/tests/AVStreams/mpeg/source/client/Makefile.am b/TAO/orbsvcs/tests/AVStreams/mpeg/source/client/Makefile.am
index 638be06e202..a795144da28 100644
--- a/TAO/orbsvcs/tests/AVStreams/mpeg/source/client/Makefile.am
+++ b/TAO/orbsvcs/tests/AVStreams/mpeg/source/client/Makefile.am
@@ -26,3 +26,10 @@ vcr_SOURCES = \
 noinst_DATA = svc.conf
 
 EXTRA_DIST = $(noinst_DATA)
+
+## Clean up some additional files/directories possibly created during
+## the configure script tests.
+clean-local:
+	-rm -f *.bak *.rpo *.sym lib*.*_pure_* Makefile.old core
+	-rm -rf ptrepository Templates.DB gcctemp.c gcctemp so_locations
+
diff --git a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/Makefile.am b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/Makefile.am
index 448264323fc..c473df5ddfa 100644
--- a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/Makefile.am
+++ b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/Makefile.am
@@ -74,3 +74,10 @@ noinst_HEADERS = \
 dist-hook:
         $(mkinstalldirs) $(distdir)/$(subdir)
         tar cf - ./interface | (cd $(distdir)/$(subdir); tar xfBp -)
+
+## Clean up some additional files/directories possibly created during
+## the configure script tests.
+clean-local:
+	-rm -f *.bak *.rpo *.sym lib*.*_pure_* Makefile.old core
+	-rm -rf ptrepository Templates.DB gcctemp.c gcctemp so_locations
+
diff --git a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_mib/Makefile.am b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_mib/Makefile.am
index 4c667eec5ba..5f8b621bfdd 100644
--- a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_mib/Makefile.am
+++ b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_mib/Makefile.am
@@ -39,3 +39,10 @@ libmpeg_mib_SOURCES = \
 noinst_HEADERS = \
         mibload.h \
         mibwidgets.h
+
+## Clean up some additional files/directories possibly created during
+## the configure script tests.
+clean-local:
+	-rm -f *.bak *.rpo *.sym lib*.*_pure_* Makefile.old core
+	-rm -rf ptrepository Templates.DB gcctemp.c gcctemp so_locations
+
diff --git a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_server/Makefile.am b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_server/Makefile.am
index 783d7abc8d6..34b5e2dd2ca 100644
--- a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_server/Makefile.am
+++ b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_server/Makefile.am
@@ -43,3 +43,10 @@ noinst_HEADERS = \
         Video_Control_i.h \
         Video_Server.h \
         server_proto.h
+
+## Clean up some additional files/directories possibly created during
+## the configure script tests.
+clean-local:
+	-rm -f *.bak *.rpo *.sym lib*.*_pure_* Makefile.old core
+	-rm -rf ptrepository Templates.DB gcctemp.c gcctemp so_locations
+
diff --git a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/Makefile.am b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/Makefile.am
index 54db7b32bdf..77a59176d2b 100644
--- a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/Makefile.am
+++ b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/Makefile.am
@@ -76,3 +76,10 @@ BUILT_SOURCES = \
         MMDevice_ExporterS.h
 
 EXTRA_DIST = $(IDL_SOURCES)
+
+## Clean up some additional files/directories possibly created during
+## the configure script tests.
+clean-local:
+	-rm -f *.bak *.rpo *.sym lib*.*_pure_* Makefile.old core
+	-rm -rf ptrepository Templates.DB gcctemp.c gcctemp so_locations
+
diff --git a/TAO/orbsvcs/tests/AVStreams/mpeg/source/server/Makefile.am b/TAO/orbsvcs/tests/AVStreams/mpeg/source/server/Makefile.am
index 01fd2ccd54f..1241d67df59 100644
--- a/TAO/orbsvcs/tests/AVStreams/mpeg/source/server/Makefile.am
+++ b/TAO/orbsvcs/tests/AVStreams/mpeg/source/server/Makefile.am
@@ -64,3 +64,10 @@ BUILT_SOURCES = \
         Video_RepositoryC.h
 
 EXTRA_DIST = $(IDL_SOURCES)
+
+## Clean up some additional files/directories possibly created during
+## the configure script tests.
+clean-local:
+	-rm -f *.bak *.rpo *.sym lib*.*_pure_* Makefile.old core
+	-rm -rf ptrepository Templates.DB gcctemp.c gcctemp so_locations
+
diff --git a/TAO/orbsvcs/tests/AVStreams/server_discovery/Makefile.am b/TAO/orbsvcs/tests/AVStreams/server_discovery/Makefile.am
index b828e4ffc7f..9a082671544 100644
--- a/TAO/orbsvcs/tests/AVStreams/server_discovery/Makefile.am
+++ b/TAO/orbsvcs/tests/AVStreams/server_discovery/Makefile.am
@@ -50,3 +50,10 @@ noinst_DATA = \
         www1.gif
 
 EXTRA_DIST = AV_Demo README $(IDL_SOURCES) $(JAVA_SOURCES) $(noinst_DATA)
+
+## Clean up some additional files/directories possibly created during
+## the configure script tests.
+clean-local:
+	-rm -f *.bak *.rpo *.sym lib*.*_pure_* Makefile.old core
+	-rm -rf ptrepository Templates.DB gcctemp.c gcctemp so_locations
+
diff --git a/TAO/orbsvcs/tests/AVStreams/sfp/Makefile.am b/TAO/orbsvcs/tests/AVStreams/sfp/Makefile.am
index 47dfa79d6b1..26680175d8c 100644
--- a/TAO/orbsvcs/tests/AVStreams/sfp/Makefile.am
+++ b/TAO/orbsvcs/tests/AVStreams/sfp/Makefile.am
@@ -33,3 +33,10 @@ noinst_HEADERS = \
         common.h
 
 EXTRA_DIST = README
+
+## Clean up some additional files/directories possibly created during
+## the configure script tests.
+clean-local:
+	-rm -f *.bak *.rpo *.sym lib*.*_pure_* Makefile.old core
+	-rm -rf ptrepository Templates.DB gcctemp.c gcctemp so_locations
+
diff --git a/TAO/orbsvcs/tests/Makefile.am b/TAO/orbsvcs/tests/Makefile.am
index 2b22bb1a699..4683ba2c7c2 100644
--- a/TAO/orbsvcs/tests/Makefile.am
+++ b/TAO/orbsvcs/tests/Makefile.am
@@ -37,3 +37,4 @@ SUBDIRS = \
 noinst_SCRIPTS = start_services
 
 EXTRA_DIST = $(noinst_SCRIPTS)
+
diff --git a/TAO/tao/Makefile.am b/TAO/tao/Makefile.am
index 4717b956454..b6686185e46 100644
--- a/TAO/tao/Makefile.am
+++ b/TAO/tao/Makefile.am
@@ -242,3 +242,10 @@ pkginclude_HEADERS = \
 
 EXTRA_DIST = \
          t-sizes.cpp
+
+## Clean up some additional files/directories possibly created during
+## the configure script tests.
+clean-local:
+	-rm -f *.bak *.rpo *.sym lib*.*_pure_* Makefile.old core
+	-rm -rf ptrepository Templates.DB gcctemp.c gcctemp so_locations
+