7 files changed, 53 insertions, 76 deletions
diff --git a/TAO/orbsvcs/LoadBalancer/Makefile b/TAO/orbsvcs/LoadBalancer/Makefile
index df81123f61b..5b59348484d 100644
--- a/TAO/orbsvcs/LoadBalancer/Makefile
+++ b/TAO/orbsvcs/LoadBalancer/Makefile
@@ -13,8 +13,6 @@ ifndef TAO_ROOT
 endif
 
 
-
-
 #----------------------------------------------------------------------------
 #       Include macros and targets
 #----------------------------------------------------------------------------
@@ -23,55 +21,14 @@ include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU
 include $(ACE_ROOT)/include/makeinclude/macros.GNU
 include $(TAO_ROOT)/rules.tao.GNU
 
-#### If the TAO orbsvcs library wasn't built with sufficient components,
-#### don't try to build here.
-TAO_ORBSVCS := $(shell sh $(ACE_ROOT)/bin/ace_components --orbsvcs)
-
-ifeq (CosLoadBalancing,$(findstring CosLoadBalancing,$(TAO_ORBSVCS)))
-
-  BIN = LoadManager LoadMonitor
-
-# The Load Balancer requires AMI.
-  ifeq ($(ami),0)
-    BIN =
-  endif  # !ami
-
-  ifeq ($(interceptors),0)
-    BIN =
-  endif  # !interceptors
-
-endif  # CosLoadBalancing
-
-include $(ACE_ROOT)/include/makeinclude/rules.common.GNU
-include $(ACE_ROOT)/include/makeinclude/rules.nested.GNU
-include $(ACE_ROOT)/include/makeinclude/rules.local.GNU
-
 #----------------------------------------------------------------------------
 #       Local targets
 #----------------------------------------------------------------------------
 
-all: $(BIN)
-
-LoadManager:
-	$(MAKE) -f Makefile.LoadManager
-
-LoadMonitor:
-	$(MAKE) -f Makefile.LoadMonitor
-
-realclean depend:
-	@for m in Makefile.LoadManager Makefile.LoadMonitor; do \
-          $(MAKE) -f $$m MAKEFILE=$$m $(@:.nested=); \
-	done
-
-.PHONY: LoadManager LoadMonitor
-
-#----------------------------------------------------------------------------
-#       Dependencies
-#----------------------------------------------------------------------------
-
-# DO NOT DELETE THIS LINE -- g++dep uses it.
-# DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
-
-
+MKLIST = Makefile.LoadManager Makefile.LoadMonitor
 
-# IF YOU PUT ANYTHING HERE IT WILL GO AWAY
+all debug profile optimize install deinstall clean realclean clobber depend idl_stubs:
+	@for m in $(MKLIST); do \
+	echo $$m; \
+        $(MAKE) -f $$m MAKEFILE=$$m $(@:.nested=); \
+        done
diff --git a/TAO/orbsvcs/LoadBalancer/Makefile.LoadManager b/TAO/orbsvcs/LoadBalancer/Makefile.LoadManager
index 036575c28aa..5263dbf1f7b 100644
--- a/TAO/orbsvcs/LoadBalancer/Makefile.LoadManager
+++ b/TAO/orbsvcs/LoadBalancer/Makefile.LoadManager
@@ -21,7 +21,7 @@ LDLIBS = \
   -lTAO_Messaging \
   $(TAO_SRVR_LIBS)
 
-BIN = LoadManager
+BIN_UNCHECKED = LoadManager
 
 #----------------------------------------------------------------------------
 #       Include macros and targets
@@ -30,6 +30,21 @@ BIN = LoadManager
 include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU
 include $(TAO_ROOT)/rules.tao.GNU
 include $(ACE_ROOT)/include/makeinclude/macros.GNU
+
+#### If the TAO orbsvcs library wasn't built with sufficient components,
+#### don't try to build here.
+TAO_ORBSVCS := $(shell sh $(ACE_ROOT)/bin/ace_components --orbsvcs)
+
+ifeq (CosLoadBalancing,$(findstring CosLoadBalancing,$(TAO_ORBSVCS)))
+
+# The Load Balancer requires AMI.
+  ifeq ($(ami),1)
+    ifneq ($(interceptors),1)
+      BIN = $(BIN_UNCHECKED)
+    endif  # interceptors
+  endif # ami
+endif  # CosLoadBalancing
+
 include $(ACE_ROOT)/include/makeinclude/rules.common.GNU
 include $(ACE_ROOT)/include/makeinclude/rules.nonested.GNU
 include $(ACE_ROOT)/include/makeinclude/rules.bin.GNU
diff --git a/TAO/orbsvcs/LoadBalancer/Makefile.LoadMonitor b/TAO/orbsvcs/LoadBalancer/Makefile.LoadMonitor
index 866a1587c0b..7d431056156 100644
--- a/TAO/orbsvcs/LoadBalancer/Makefile.LoadMonitor
+++ b/TAO/orbsvcs/LoadBalancer/Makefile.LoadMonitor
@@ -25,7 +25,7 @@ LDLIBS = \
   -lTAO_Messaging \
   $(TAO_SRVR_LIBS)
 
-BIN = LoadMonitor
+BIN_UNCHECKED = LoadMonitor
 
 #----------------------------------------------------------------------------
 #       Include macros and targets
@@ -34,6 +34,21 @@ BIN = LoadMonitor
 include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU
 include $(ACE_ROOT)/include/makeinclude/macros.GNU
 include $(TAO_ROOT)/rules.tao.GNU
+
+#### If the TAO orbsvcs library wasn't built with sufficient components,
+#### don't try to build here.
+TAO_ORBSVCS := $(shell sh $(ACE_ROOT)/bin/ace_components --orbsvcs)
+
+ifeq (CosLoadBalancing,$(findstring CosLoadBalancing,$(TAO_ORBSVCS)))
+
+  # The Load Balancer requires AMI.
+  ifeq ($(ami),1)
+    ifneq ($(interceptors),1)
+      BIN = $(BIN_UNCHECKED)
+    endif  # interceptors
+  endif # ami
+endif  # CosLoadBalancing
+
 include $(ACE_ROOT)/include/makeinclude/rules.common.GNU
 include $(ACE_ROOT)/include/makeinclude/rules.nonested.GNU
 include $(ACE_ROOT)/include/makeinclude/rules.bin.GNU
diff --git a/TAO/orbsvcs/orbsvcs/Makefile b/TAO/orbsvcs/orbsvcs/Makefile
index aed6bf122f6..744d745277b 100644
--- a/TAO/orbsvcs/orbsvcs/Makefile
+++ b/TAO/orbsvcs/orbsvcs/Makefile
@@ -254,7 +254,8 @@ endif
 
 all: ORBSVCS_COMPONENTS
 
-realclean: ORBSVCS_COMPONENTS_realclean
+realclean:
+	-$(RM) ORBSVCS_COMPONENTS.list
 
 ## Makefile.Svc_Utils.mkfile is a dummy target which will cause
 ## $(MAKE) -f Makefile.Svc_Utils to be invoked
@@ -277,16 +278,3 @@ endif
 .PHONY: ORBSVCS_COMPONENTS
 ORBSVCS_COMPONENTS:
 	@sh $(ACE_ROOT)/bin/ace_components --orbsvcs --set ' $(TAO_ORBSVCS) '
-
-.PHONY: ORBSVCS_COMPONENTS_realclean
-ORBSVCS_COMPONENTS_realclean:
-	-$(RM) ORBSVCS_COMPONENTS.list
-
-#----------------------------------------------------------------------------
-#       Dependencies
-#----------------------------------------------------------------------------
-# DO NOT DELETE THIS LINE -- g++dep uses it.
-# DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
-
-
-# IF YOU PUT ANYTHING HERE IT WILL GO AWAY
diff --git a/TAO/orbsvcs/orbsvcs/Makefile.RTCosScheduling b/TAO/orbsvcs/orbsvcs/Makefile.RTCosScheduling
index 9f470cb71cd..6fb80e2fdfc 100644
--- a/TAO/orbsvcs/orbsvcs/Makefile.RTCosScheduling
+++ b/TAO/orbsvcs/orbsvcs/Makefile.RTCosScheduling
@@ -10,8 +10,8 @@
 #
 #----------------------------------------------------------------------------
 MAKEFILE        = Makefile.RTCosScheduling
-LIB             = libTAO_RTCosScheduling.a
-SHLIB           = libTAO_RTCosScheduling.$(SOEXT)
+LIB_UNCHECKED   = libTAO_RTCosScheduling.a
+SHLIB_UNCHECKED = libTAO_RTCosScheduling.$(SOEXT)
 
 ifndef TAO_ROOT
   TAO_ROOT = $(ACE_ROOT)/TAO
@@ -64,6 +64,10 @@ $(TEMPINCDIR):
 
 endif
 
+# go ahead and set these here, it's less typing than fixing the mess below.
+LIB = $(LIB_UNCHECKED)
+SHLIB = $(SHLIB_UNCHECKED)
+
 CURRENT_COMPONENTS := $(shell sh $(ACE_ROOT)/bin/ace_components --orbsvcs)
 ifeq ($(interceptors),1)
 ifeq ($(rt_corba),1)
@@ -174,9 +178,6 @@ require_warning:
 ORBSVCS_COMPONENTS:
 	@sh ../../../bin/ace_components --orbsvcs --append '$(ORBSVCS_COMPONENTS)'
 
-compclean:
-	@sh ../../../bin/ace_components --orbsvcs --remove
-
 ADDITIONAL_IDL_TARGETS =
 # IDL File Directory: .
 
@@ -186,7 +187,7 @@ endif
 
 .PRECIOUS: $(foreach ext, $(IDL_EXT), $(foreach file, $(IDL_FILES), $(file)$(ext)))
 
-realclean: clean compclean
+realclean: clean
 	-$(RM) $(foreach ext, $(IDL_EXT), $(foreach file, $(IDL_FILES), $(file)$(ext)))
 ifneq ($(GENERATED_DIRTY),)
 	-$(RM) -r $(GENERATED_DIRTY)
diff --git a/TAO/orbsvcs/orbsvcs/Makefile.RT_Notification b/TAO/orbsvcs/orbsvcs/Makefile.RT_Notification
index facff2174df..3506a3a09ec 100644
--- a/TAO/orbsvcs/orbsvcs/Makefile.RT_Notification
+++ b/TAO/orbsvcs/orbsvcs/Makefile.RT_Notification
@@ -88,9 +88,6 @@ ACE_SHLIBS = -lTAO_CosNotification -lTAO_Svc_Utils -lTAO_ETCL -lTAO_DynamicAny -
 ORBSVCS_COMPONENTS:
 	@sh ../../../bin/ace_components --orbsvcs --append '$(ORBSVCS_COMPONENTS)'
 
-compclean:
-	@sh $(ACE_ROOT)/bin/ace_components --orbsvcs --remove
-
 #----------------------------------------------------------------------------
 #       Dependencies
 #----------------------------------------------------------------------------
diff --git a/TAO/orbsvcs/tests/RTCosScheduling/Makefile.commonlib b/TAO/orbsvcs/tests/RTCosScheduling/Makefile.commonlib
index 6e2feddec3a..d93b57f1e13 100644
--- a/TAO/orbsvcs/tests/RTCosScheduling/Makefile.commonlib
+++ b/TAO/orbsvcs/tests/RTCosScheduling/Makefile.commonlib
@@ -1,3 +1,4 @@
+# -*- Makefile -*-
 #----------------------------------------------------------------------------
 #       GNU Makefile
 #
@@ -10,8 +11,11 @@
 #
 #----------------------------------------------------------------------------
 MAKEFILE        = Makefile.commonlib
-LIB             = libtestSched_Common.a
-SHLIB           = libtestSched_Common.$(SOEXT)
+LIB_UNCHECKED   = libtestSched_Common.a
+SHLIB_UNCHECKED = libtestSched_Common.$(SOEXT)
+
+LIB = $(LIB_UNCHECKED)
+SHLIB = $(SHLIB_UNCHECKED)
 
 ifndef TAO_ROOT
   TAO_ROOT = $(ACE_ROOT)/TAO