11 files changed, 19 insertions, 23 deletions
diff --git a/TAO/orbsvcs/Dump_Schedule/Makefile b/TAO/orbsvcs/Dump_Schedule/Makefile
index 010d521b61b..652b3e682d2 100644
--- a/TAO/orbsvcs/Dump_Schedule/Makefile
+++ b/TAO/orbsvcs/Dump_Schedule/Makefile
@@ -1,7 +1,7 @@
 # $Id$
 
 BIN = Dump_Schedule
-BUILD = $(BIN)
+VBIN = $(BIN:%=%$(VAR))
 
 DUMP_SRCS = \
 	Dump_Schedule.cpp
diff --git a/TAO/orbsvcs/Event_Service/Makefile b/TAO/orbsvcs/Event_Service/Makefile
index 48a85b5b079..457a031a40e 100644
--- a/TAO/orbsvcs/Event_Service/Makefile
+++ b/TAO/orbsvcs/Event_Service/Makefile
@@ -3,7 +3,7 @@
 #
 
 BIN = Event_Service
-BUILD = $(BIN)
+VBIN = $(BIN:%=%$(VAR))
 
 LSRC = 	\
 	Event_Service.cpp \
diff --git a/TAO/orbsvcs/LifeCycle_Service/Makefile b/TAO/orbsvcs/LifeCycle_Service/Makefile
index 3873b2f09bb..22d73b0b731 100644
--- a/TAO/orbsvcs/LifeCycle_Service/Makefile
+++ b/TAO/orbsvcs/LifeCycle_Service/Makefile
@@ -1,7 +1,7 @@
 #
 # $Id$
-# 
-# =TITLE 
+#
+# =TITLE
 #  Makefile to create the LifeCycle_Service
 
 ifndef TAO_ROOT
@@ -12,13 +12,11 @@ TAO_IDLFLAGS=-I$(TAO_ROOT)/orbsvcs/orbsvcs
 
 
 BIN = Life_Cycle_Service
+VBIN = $(BIN:%=%$(VAR))
 
 # The following lines tell the souce code that the trading
 # service is available.
 
-BUILD = $(BIN)
-
-
 LIFE_CYCLE_SERVICE_SRCS = \
 	Life_Cycle_Service.cpp Life_Cycle_Service_i.cpp \
 	Factory_Trader.cpp Criteria_Evaluator.cpp
diff --git a/TAO/orbsvcs/Logging_Service/Makefile b/TAO/orbsvcs/Logging_Service/Makefile
index 77c0ce416cf..2cb7c8b2b04 100644
--- a/TAO/orbsvcs/Logging_Service/Makefile
+++ b/TAO/orbsvcs/Logging_Service/Makefile
@@ -10,16 +10,15 @@
 #----------------------------------------------------------------------------
 
 BIN 	= Logging_Service
+VBIN    = $(BIN:%=%$(VAR))
 
-SRC	= Logging_Service_i.cpp Logging_Service.cpp 
+SRC	= Logging_Service_i.cpp Logging_Service.cpp
 
 LDLIBS	= -lorbsvcs -lTAO
 
 VLDLIBS = $(LDLIBS:%=%$(VAR))
 
-BUILD 	= $(BIN)
-
-LOGGING_OBJS = 	Logging_Service_i.o Logging_Service.o 
+LOGGING_OBJS = 	Logging_Service_i.o Logging_Service.o
 
 ifndef TAO_ROOT
   TAO_ROOT = $(ACE_ROOT)/TAO
diff --git a/TAO/orbsvcs/Scheduling_Service/Makefile b/TAO/orbsvcs/Scheduling_Service/Makefile
index 454e34871c1..9cb11804d8d 100644
--- a/TAO/orbsvcs/Scheduling_Service/Makefile
+++ b/TAO/orbsvcs/Scheduling_Service/Makefile
@@ -3,7 +3,7 @@
 #
 
 BIN = Scheduling_Service
-BUILD = $(BIN)
+VBIN = $(BIN:%=%$(VAR))
 
 SCHEDULE_SRCS = \
 	Scheduling_Service.cpp
diff --git a/TAO/orbsvcs/tests/EC_Custom_Marshal/Makefile b/TAO/orbsvcs/tests/EC_Custom_Marshal/Makefile
index d390fb0d4c8..1aa6752b11e 100644
--- a/TAO/orbsvcs/tests/EC_Custom_Marshal/Makefile
+++ b/TAO/orbsvcs/tests/EC_Custom_Marshal/Makefile
@@ -1,6 +1,7 @@
 # $Id$
 
-BUILD = ECM_Supplier ECM_Consumer
+BIN = ECM_Supplier ECM_Consumer
+VBIN = $(BIN:%=%$(VAR))
 LDLIBS= -lorbsvcs -lTAO
 
 ifndef TAO_ROOT
@@ -16,7 +17,7 @@ IDL_SRC	= dataC dataS
 ECM_Supplier_OBJS=$(addsuffix .o,ECM_Supplier ECM_Data $(IDL_SRC))
 ECM_Consumer_OBJS=$(addsuffix .o,ECM_Consumer ECM_Data $(IDL_SRC))
 
-SRC =   $(addsuffix .cpp, $(BUILD)) \
+SRC =   $(addsuffix .cpp, $(BIN)) \
 	$(addsuffix .cpp, $(IDL_SRC)) \
 	ECM_Data.cpp
 
@@ -49,7 +50,7 @@ ECM_Consumer: $(addprefix $(VDIR),$(ECM_Consumer_OBJS))
 
 realclean:
 	$(RM) -f dataC.* dataS.* dataS_T.*
-	$(RM) -f $(BUILD)
+	$(RM) -f $(BIN)
 
 #----------------------------------------------------------------------------
 #       Dependencies
diff --git a/TAO/orbsvcs/tests/EC_Mcast/Makefile b/TAO/orbsvcs/tests/EC_Mcast/Makefile
index b2ac164b0eb..2f1a94f90a7 100644
--- a/TAO/orbsvcs/tests/EC_Mcast/Makefile
+++ b/TAO/orbsvcs/tests/EC_Mcast/Makefile
@@ -1,7 +1,6 @@
 # $Id$
 
 BIN = EC_Mcast
-BUILD = $(BIN)
 SRC = $(BIN:%=%$(VAR).cpp)
 LDLIBS= -lorbsvcs -lTAO
 
diff --git a/TAO/orbsvcs/tests/EC_Multiple/Makefile b/TAO/orbsvcs/tests/EC_Multiple/Makefile
index 286807698bf..2d28601ec7f 100644
--- a/TAO/orbsvcs/tests/EC_Multiple/Makefile
+++ b/TAO/orbsvcs/tests/EC_Multiple/Makefile
@@ -1,7 +1,6 @@
 # $Id$
 
 BIN = EC_Multiple
-BUILD = $(BIN)
 SRC = $(BIN:%=%$(VAR).cpp)
 LDLIBS= -lorbsvcs -lTAO
 
diff --git a/TAO/orbsvcs/tests/EC_Throughput/Makefile b/TAO/orbsvcs/tests/EC_Throughput/Makefile
index aa3fe87d169..923bced4d41 100644
--- a/TAO/orbsvcs/tests/EC_Throughput/Makefile
+++ b/TAO/orbsvcs/tests/EC_Throughput/Makefile
@@ -1,6 +1,7 @@
 # $Id$
 
-BUILD = ECT_Supplier ECT_Consumer
+BIN = ECT_Supplier ECT_Consumer
+VBIN = $(BIN:%=%$(VAR))
 LDLIBS= -lorbsvcs -lTAO
 
 ifndef TAO_ROOT
@@ -13,7 +14,7 @@ CPPFLAGS += -I$(TAO_ROOT)/orbsvcs \
 ECT_Supplier_OBJS=$(addsuffix .o,ECT_Supplier)
 ECT_Consumer_OBJS=$(addsuffix .o,ECT_Consumer)
 
-SRC =   $(addsuffix .cpp, $(BUILD))
+SRC =   $(addsuffix .cpp, $(BIN))
 
 ifdef quantify
   CCFLAGS += -Dquantify
@@ -41,7 +42,7 @@ ECT_Consumer: $(addprefix $(VDIR),$(ECT_Consumer_OBJS))
 	$(LINK.cc) $(LDFLAGS) -o $@ $^ $(VLDLIBS) $(POSTLINK)
 
 realclean:
-	$(RM) -f $(BUILD)
+	$(RM) -f $(BIN)
 
 #----------------------------------------------------------------------------
 #       Dependencies
diff --git a/TAO/orbsvcs/tests/Event_Latency/Makefile b/TAO/orbsvcs/tests/Event_Latency/Makefile
index 80a5cdb5207..dd26e4e96c8 100644
--- a/TAO/orbsvcs/tests/Event_Latency/Makefile
+++ b/TAO/orbsvcs/tests/Event_Latency/Makefile
@@ -1,8 +1,7 @@
 # $Id$
 
 BIN = Event_Latency
-
-BUILD = $(BIN)
+VBIN = $(BIN:%=%$(VAR))
 
 EVENT_LATENCY_SRCS= \
 	Event_Latency.cpp
diff --git a/TAO/orbsvcs/tests/Logger/Makefile b/TAO/orbsvcs/tests/Logger/Makefile
index 2e3c2dca2ea..37b3476653e 100644
--- a/TAO/orbsvcs/tests/Logger/Makefile
+++ b/TAO/orbsvcs/tests/Logger/Makefile
@@ -21,7 +21,7 @@ SRC = 	Logging_Test.cpp \
 LOGGING_TEST_OBJS = Logging_Test_i.o Logging_Test.o
 
 BIN = Logging_Test
-BUILD = $(BIN)
+VBIN = $(BIN:%=%$(VAR))
 VLDLIBS = $(LDLIBS:%=%$(VAR))
 
 #----------------------------------------------------------------------------