ChangeLogTag:Fri Nov 21 02:57:35 UTC 2003 Don Hinton <dhinton@dresystems.com

6 files changed, 12 insertions, 25 deletions

diff --git a/TAO/orbsvcs/tests/EC_Custom_Marshal/Makefile b/TAO/orbsvcs/tests/EC_Custom_Marshal/Makefile
index 04f5fd3d73d..d36d72147ea 100644
--- a/TAO/orbsvcs/tests/EC_Custom_Marshal/Makefile
+++ b/TAO/orbsvcs/tests/EC_Custom_Marshal/Makefile
@@ -10,14 +10,11 @@ CPPFLAGS += -I$(TAO_ROOT)/orbsvcs \
             -I$(TAO_ROOT)
 
 IDL_FILES = data
-IDL_SRC = dataC dataS
-IDL_HDR = dataC dataS
 
-ECM_Supplier_OBJS=$(addsuffix .o,$(IDL_SRC) ECM_Supplier ECM_Data)
-ECM_Consumer_OBJS=$(addsuffix .o,$(IDL_SRC) ECM_Consumer ECM_Data)
+ECM_Supplier_OBJS=$(addsuffix .o, ECM_Supplier ECM_Data) $(IDL_SRC:%.cpp=%.o)
+ECM_Consumer_OBJS=$(addsuffix .o, ECM_Consumer ECM_Data) $(IDL_SRC:%.cpp=%.o)
 
 SRC =  $(addsuffix .cpp, $(BIN2)) \
-        $(addsuffix .cpp, $(IDL_SRC)) \
         ECM_Data.cpp
 
 BIN2 = ECM_Supplier ECM_Consumer
@@ -43,17 +40,12 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU
 
 #### Local rules and variables...
 
-.PRECIOUS: $(addsuffix .h, $(IDL_SRC)) $(addsuffix .i, $(IDL_SRC)) $(addsuffix .cpp, $(IDL_SRC))
-
 ECM_Supplier: $(addprefix $(VDIR),$(ECM_Supplier_OBJS))
 	$(LINK.cc) $(LDFLAGS) -o $@ $^ $(VLDLIBS) $(POSTLINK)
 
 ECM_Consumer: $(addprefix $(VDIR),$(ECM_Consumer_OBJS))
 	$(LINK.cc) $(LDFLAGS) -o $@ $^ $(VLDLIBS) $(POSTLINK)
 
-realclean:
-	$(RM) dataC.* dataS.* dataS_T.*
-
 #----------------------------------------------------------------------------
 #       Dependencies
 #----------------------------------------------------------------------------
diff --git a/TAO/orbsvcs/tests/FaultTolerance/IOGR/Makefile b/TAO/orbsvcs/tests/FaultTolerance/IOGR/Makefile
index c32e89d7ba1..3c290a0aa6c 100644
--- a/TAO/orbsvcs/tests/FaultTolerance/IOGR/Makefile
+++ b/TAO/orbsvcs/tests/FaultTolerance/IOGR/Makefile
@@ -13,12 +13,11 @@ ifndef TAO_ROOT
 endif # ! TAO_ROOT
 
 IDL_FILES=test
-IDL_SRC = testC testS
 BIN_UNCHECKED = server Manager
 
-SRC = $(addsuffix .cpp, $(BIN_UNCHECKED) $(IDL_SRC) test_i)
+SRC = $(addsuffix .cpp, $(BIN_UNCHECKED) test_i) $(IDL_SRC)
 
-SERVER_OBJS = server.o test_i.o $(addsuffix .o, $(IDL_SRC))
+SERVER_OBJS = server.o test_i.o $(IDL_SRC:%.cpp=%.o) 
 MANAGER_OBJS = Manager.o testC.o
 
 CPPFLAGS += -I$(TAO_ROOT) -I$(TAO_ROOT)/orbsvcs
diff --git a/TAO/orbsvcs/tests/IOR_MCast/Makefile b/TAO/orbsvcs/tests/IOR_MCast/Makefile
index 43a26fadea9..b77bfafd4aa 100644
--- a/TAO/orbsvcs/tests/IOR_MCast/Makefile
+++ b/TAO/orbsvcs/tests/IOR_MCast/Makefile
@@ -13,17 +13,16 @@ ifndef TAO_ROOT
 endif # ! TAO_ROOT
 
 IDL_FILES = MCast
-IDL_SRC = MCastC MCastS
 
 LDLIBS = -lTAO_CosNaming -lTAO_Svc_Utils -lTAO_IORTable -lTAO_PortableServer -lTAO_Valuetype -lTAO_ObjRefTemplate -lTAO_IORInterceptor -lTAO -lACE
 
 CPPFLAGS += -I$(TAO_ROOT)/orbsvcs
 BIN = server client
 
-SRC = $(addsuffix .cpp, $(BIN) $(IDL_SRC) server_i ior_mcast_client_i MCast_Server_i)
+SRC = $(addsuffix .cpp, $(BIN) server_i ior_mcast_client_i MCast_Server_i) $(IDL_SRC)
 
-SERVER_OBJS = $(addsuffix .o, server server_i MCast_Server_i $(IDL_SRC))
-CLIENT_OBJS = $(addsuffix .o, client ior_mcast_client_i server_i MCast_Server_i $(IDL_SRC))
+SERVER_OBJS = $(addsuffix .o, server server_i MCast_Server_i) $(IDL_SRC:.cpp=.o)
+CLIENT_OBJS = $(addsuffix .o, client ior_mcast_client_i server_i MCast_Server_i) $(IDL_SRC:.cpp=.o)
 
 TAO_IDLFLAGS += -Ge 1
 #----------------------------------------------------------------------------
diff --git a/TAO/orbsvcs/tests/Notify/Structured_Filter/Makefile b/TAO/orbsvcs/tests/Notify/Structured_Filter/Makefile
index 23d29835577..1e650afc289 100644
--- a/TAO/orbsvcs/tests/Notify/Structured_Filter/Makefile
+++ b/TAO/orbsvcs/tests/Notify/Structured_Filter/Makefile
@@ -15,9 +15,8 @@ endif # ! TAO_ROOT
 BIN =  Structured_Supplier Structured_Consumer
 
 IDL_FILES = control
-IDL_SRCS = controlC controlS
 
-SRC = $(addsuffix .cpp, $(IDL_SRCS)) \
+SRC = $(IDL_SRCS) \
 	Structured_Supplier.cpp Structured_Consumer.cpp Notify_Push_Consumer.cpp
 
 SUPPLIER_OBJS = Structured_Supplier.o controlS.o controlC.o
diff --git a/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Makefile b/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Makefile
index 4ec74263ec0..b3dac2d7e2d 100644
--- a/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Makefile
+++ b/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Makefile
@@ -15,9 +15,8 @@ endif # ! TAO_ROOT
 BIN =  Structured_Supplier Structured_Consumer
 
 IDL_FILES = control
-IDL_SRCS = controlC controlS
 
-SRC = $(addsuffix .cpp, $(IDL_SRCS)) \
+SRC = $(IDL_SRCS) \
 	Structured_Supplier.cpp Structured_Consumer.cpp Notify_Push_Supplier.cpp Notify_Push_Consumer.cpp
 
 SUPPLIER_OBJS = Structured_Supplier.o Notify_Push_Supplier.o controlS.o controlC.o
diff --git a/TAO/orbsvcs/tests/ior_corbaname/Makefile b/TAO/orbsvcs/tests/ior_corbaname/Makefile
index d0dd6d7bc13..e7fc1f2c498 100644
--- a/TAO/orbsvcs/tests/ior_corbaname/Makefile
+++ b/TAO/orbsvcs/tests/ior_corbaname/Makefile
@@ -13,17 +13,16 @@ ifndef TAO_ROOT
 endif # ! TAO_ROOT
 
 IDL_FILES = corbaname
-IDL_SRC = corbanameC corbanameS
 
 LDLIBS = -lTAO_CosNaming -lTAO_Svc_Utils $(TAO_SRVR_LIBS)
 
 CPPFLAGS += -I$(TAO_ROOT)/orbsvcs
 BIN = server client
 
-SRC = $(addsuffix .cpp, $(BIN) $(IDL_SRC) status_i ior_corbaname_client_i)
+SRC = $(addsuffix .cpp, $(BIN) status_i ior_corbaname_client_i) $(IDL_SRC)
 
-SERVER_OBJS = $(addsuffix .o, server status_i $(IDL_SRC))
-CLIENT_OBJS = $(addsuffix .o, client ior_corbaname_client_i status_i $(IDL_SRC))
+SERVER_OBJS = $(addsuffix .o, server status_i) $(IDL_SRC:%.cpp=%.o)
+CLIENT_OBJS = $(addsuffix .o, client ior_corbaname_client_i status_i) $(IDL_SRC:%.cpp=%.o)
 
 TAO_IDLFLAGS += -Ge 1
 #----------------------------------------------------------------------------