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

4 files changed, 7 insertions, 32 deletions

diff --git a/TAO/docs/tutorials/Quoter/AMI/Makefile b/TAO/docs/tutorials/Quoter/AMI/Makefile
index 75b544d487f..d5b3340f836 100644
--- a/TAO/docs/tutorials/Quoter/AMI/Makefile
+++ b/TAO/docs/tutorials/Quoter/AMI/Makefile
@@ -13,15 +13,14 @@ ifndef TAO_ROOT
 endif # ! TAO_ROOT
 
 IDL_FILES = Quoter
-IDL_SRC = QuoterC QuoterS
 BIN = client server
 
 LDLIBS = -lTAO_Messaging -lTAO_PortableServer -lTAO_Valuetype -lTAO_ObjRefTemplate -lTAO_IORInterceptor -lTAO 
 
-SRC = $(addsuffix .cpp, $(BIN) $(IDL_SRC) Handler_i Stock_i Stock_Factory_i)
+SRC = $(addsuffix .cpp, $(BIN) Handler_i Stock_i Stock_Factory_i) $(IDL_SRC)
 
-CLIENT_OBJS = $(addsuffix .o, client Handler_i $(IDL_SRC))
-SERVER_OBJS = $(addsuffix .o, server Stock_i Stock_Factory_i $(IDL_SRC))
+CLIENT_OBJS = $(addsuffix .o, client Handler_i) $(IDL_OBJS)
+SERVER_OBJS = $(addsuffix .o, server Stock_i Stock_Factory_i) $(IDL_OBJS)
 
 TAO_IDLFLAGS=-GC -in
 
@@ -41,17 +40,12 @@ include $(TAO_ROOT)/taoconfig.mk
 #       Local targets
 #----------------------------------------------------------------------------
 
-.PRECIOUS: $(foreach ext, $(IDL_EXT), Quoter$(ext))
-
 client: $(addprefix $(VDIR),$(CLIENT_OBJS))
 	$(LINK.cc) $(LDFLAGS) -o $@ $^ $(VLDLIBS) $(POSTLINK)
 
 server: $(addprefix $(VDIR),$(SERVER_OBJS))
 	$(LINK.cc) $(LDFLAGS) -o $@ $^ $(VLDLIBS) $(POSTLINK)
 
-realclean: clean
-	-$(RM) $(foreach ext, $(IDL_EXT), Quoter$(ext))
-
 # DO NOT DELETE THIS LINE -- g++dep uses it.
 # DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
 
diff --git a/TAO/docs/tutorials/Quoter/Event_Service/Makefile b/TAO/docs/tutorials/Quoter/Event_Service/Makefile
index bcb948e918c..947cfea3838 100644
--- a/TAO/docs/tutorials/Quoter/Event_Service/Makefile
+++ b/TAO/docs/tutorials/Quoter/Event_Service/Makefile
@@ -16,7 +16,6 @@ LDLIBS = -lTAO_CosEvent -lTAO_CosNaming -lTAO_Svc_Utils -lTAO_IORTable -lTAO_Por
 CPPFLAGS += -I$(TAO_ROOT)/orbsvcs
 
 IDL_FILES = Quoter
-IDL_SRC = QuoterC.cpp QuoterS.cpp
 BIN2 = client server
 
 #### If the TAO orbsvcs library wasn't built with sufficient components,
@@ -49,17 +48,12 @@ include $(TAO_ROOT)/taoconfig.mk
 #       Local targets
 #----------------------------------------------------------------------------
 
-.PRECIOUS: $(foreach ext, $(IDL_EXT), Quoter$(ext))
-
 client: $(addprefix $(VDIR),$(CLIENT_OBJS))
 	$(LINK.cc) $(LDFLAGS) -o $@ $^ $(VLDLIBS) $(POSTLINK)
 
 server: $(addprefix $(VDIR),$(SERVER_OBJS))
 	$(LINK.cc) $(LDFLAGS) -o $@ $^ $(VLDLIBS) $(POSTLINK)
 
-realclean: clean
-	-$(RM) $(foreach ext, $(IDL_EXT), Quoter$(ext))
-
 # DO NOT DELETE THIS LINE -- g++dep uses it.
 # DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
 
diff --git a/TAO/docs/tutorials/Quoter/On_Demand_Activation/Makefile b/TAO/docs/tutorials/Quoter/On_Demand_Activation/Makefile
index e03eb35610e..f4fc5098a11 100644
--- a/TAO/docs/tutorials/Quoter/On_Demand_Activation/Makefile
+++ b/TAO/docs/tutorials/Quoter/On_Demand_Activation/Makefile
@@ -13,15 +13,14 @@ ifndef TAO_ROOT
 endif # ! TAO_ROOT
 
 IDL_FILES = Quoter
-IDL_SRC = QuoterC QuoterS
 BIN_UNCHECKED = client server
 
 LDLIBS = -lTAO_Messaging -lTAO_PortableServer -lTAO_Valuetype -lTAO_ObjRefTemplate -lTAO_IORInterceptor -lTAO
 
-SRC = $(addsuffix .cpp, $(BIN) $(IDL_SRC) Handler_i Stock_i Stock_Factory_i Stock_Factory_Locator_i)
+SRC = $(addsuffix .cpp, $(BIN) Handler_i Stock_i Stock_Factory_i Stock_Factory_Locator_i) $(IDL_SRC)
 
-CLIENT_OBJS = $(addsuffix .o, client Handler_i $(IDL_SRC))
-SERVER_OBJS = $(addsuffix .o, server Stock_i Stock_Factory_i Stock_Factory_Locator_i $(IDL_SRC))
+CLIENT_OBJS = $(addsuffix .o, client Handler_i) $(IDL_SRC:.cpp=.o)
+SERVER_OBJS = $(addsuffix .o, server Stock_i Stock_Factory_i Stock_Factory_Locator_i) $(IDL_SRC:.cpp=.o)
 
 TAO_IDLFLAGS=-GC -in
 
@@ -46,17 +45,12 @@ include $(TAO_ROOT)/taoconfig.mk
 #       Local targets
 #----------------------------------------------------------------------------
 
-.PRECIOUS: $(foreach ext, $(IDL_EXT), Quoter$(ext))
-
 client: $(addprefix $(VDIR),$(CLIENT_OBJS))
 	$(LINK.cc) $(LDFLAGS) -o $@ $^ $(VLDLIBS) $(POSTLINK)
 
 server: $(addprefix $(VDIR),$(SERVER_OBJS))
 	$(LINK.cc) $(LDFLAGS) -o $@ $^ $(VLDLIBS) $(POSTLINK)
 
-realclean: clean
-	-$(RM) $(foreach ext, $(IDL_EXT), Quoter$(ext))
-
 # DO NOT DELETE THIS LINE -- g++dep uses it.
 # DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
 
diff --git a/TAO/docs/tutorials/Quoter/idl/Makefile b/TAO/docs/tutorials/Quoter/idl/Makefile
index 747b8303220..f000a4625ad 100644
--- a/TAO/docs/tutorials/Quoter/idl/Makefile
+++ b/TAO/docs/tutorials/Quoter/idl/Makefile
@@ -22,12 +22,10 @@ LIB = libQuoter_Common.a
 SHLIB = libQuoter_Common.$(SOEXT)
 
 IDL_FILES = Quoter
-IDL_SRC = QuoterC QuoterS
 
 ACE_SHLIBS = -lTAO_PortableServer -lTAO_Valuetype -lTAO_ObjRefTemplate -lTAO_IORInterceptor -lTAO -lACE
 LDLIBS = -lTAO_PortableServer -lTAO_Valuetype -lTAO_ObjRefTemplate -lTAO_IORInterceptor -lTAO
-SRCS = $(IDL_SRC)
-LSRC = $(addsuffix .cpp,$(IDL_SRC) )
+LSRC = $(IDL_SRC)
 
 #----------------------------------------------------------------------------
 #       Include macros and targets
@@ -49,11 +47,6 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU
 LDFLAGS  += -L$(TAO_ROOT)/tao
 CPPFLAGS += -I$(TAO_ROOT) -I$(TAO_ROOT)/orbsvcs
 
-.PRECIOUS: $(foreach file, $(IDL_FILES), $(foreach ext, $(IDL_EXT), $(file)$(ext))))
-
-realclean: clean
-	-$(RM) $(foreach file, $(IDL_FILES), $(foreach ext, $(IDL_EXT), $(file)$(ext)))
-
 # DO NOT DELETE THIS LINE -- g++dep uses it.
 # DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.