1 files changed, 16 insertions, 59 deletions

diff --git a/TAO/orbsvcs/orbsvcs/CosTrading.mpc b/TAO/orbsvcs/orbsvcs/CosTrading.mpc
index 4029634dff8..ef436ac2479 100644
--- a/TAO/orbsvcs/orbsvcs/CosTrading.mpc
+++ b/TAO/orbsvcs/orbsvcs/CosTrading.mpc
@@ -1,7 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project(CosTrading_IDL) : orbsvcslib, install, tao_versioning_idl_defaults {
+project(CosTrading_IDL) : orbsvcslib, core, tao_versioning_idl_defaults {
   custom_only = 1
   idlflags   += -Wb,stub_export_macro=TAO_Trading_Export -Wb,stub_export_include=orbsvcs/Trader/trading_export.h -Wb,skel_export_macro=TAO_Trading_Skel_Export -Wb,skel_export_include=orbsvcs/Trader/trading_skel_export.h
 
@@ -13,7 +13,7 @@ project(CosTrading_IDL) : orbsvcslib, install, tao_versioning_idl_defaults {
 }
 
 
-project(CosTrading) : orbsvcslib, install {
+project(CosTrading) : orbsvcslib, core {
   sharedname   = TAO_CosTrading
   dynamicflags = TAO_TRADING_BUILD_DLL
   tagchecks   += Trader
@@ -55,7 +55,7 @@ project(CosTrading) : orbsvcslib, install {
 }
 
 
-project(CosTrading_Skel) : orbsvcslib, install, trading, portableserver {
+project(CosTrading_Skel) : orbsvcslib, core, trading, portableserver {
   sharedname   = TAO_CosTrading_Skel
   dynamicflags = TAO_TRADING_SKEL_BUILD_DLL
   tagchecks   += Trader
@@ -73,6 +73,11 @@ project(CosTrading_Skel) : orbsvcslib, install, trading, portableserver {
     CosTradingS.h
     CosTradingReposS.h
     CosTradingDynamicS.h
+
+    CosTradingS_T.h
+    CosTradingReposS_T.h
+    CosTradingDynamicS_T.h
+
     Trader/trading_skel_export.h
   }
 
@@ -80,9 +85,16 @@ project(CosTrading_Skel) : orbsvcslib, install, trading, portableserver {
     CosTradingS.inl
     CosTradingReposS.inl
     CosTradingDynamicS.inl
+
+    CosTradingS_T.inl
+    CosTradingReposS_T.inl
+    CosTradingDynamicS_T.inl
   }
 
   Template_Files {
+    CosTradingS_T.cpp
+    CosTradingReposS_T.cpp
+    CosTradingDynamicS_T.cpp
   }
 
   Pkgconfig_Files {
@@ -91,7 +103,7 @@ project(CosTrading_Skel) : orbsvcslib, install, trading, portableserver {
 }
 
 
-project(CosTrading_Serv) : orbsvcslib, install, trading_skel, dynamicany, svc_utils, utils, iortable {
+project(CosTrading_Serv) : orbsvcslib, core, trading_skel, dynamicany, svc_utils, utils, iortable {
   sharedname   = TAO_CosTrading_Serv
   dynamicflags = TAO_TRADING_SERV_BUILD_DLL
   tagchecks   += Trader
@@ -118,59 +130,4 @@ project(CosTrading_Serv) : orbsvcslib, install, trading_skel, dynamicany, svc_ut
   Pkgconfig_Files {
     TAO_CosTrading_Serv.pc.in
   }
-
-  verbatim(gnuace, local) {
-    Trader/Constraint_l.cpp: Trader/constraint.l
-    "	@echo 'INFORMATION: Potentially outdated $@'"
-    "	@echo '             either touch(1) the file or explicitly'"
-    "	@echo '             generate it using:'"                    
-    "	@echo '    make -f GNUmakefile.CosTrading_Serv Constraint_l'"
-
-    .PHONY: Constraint_l
-    Constraint_l:
-    "	echo '#define YY_NO_UNPUT' > Trader/Constraint_l.cpp"
-    "	$(LEX) -L -t Trader/constraint.l | \\"
-    "	sed -e 's/ NULL/ 0/g' \\"
-    "	    -e 's/int offset /size_t offset /g' \\"
-    "	    -e 's/isatty/ACE_OS::isatty/g' \\"
-    "	    -e 's/YY_BREAK break;/YY_BREAK ACE_NOTREACHED (break;)/g' \\"
-    "	    -e 's/ECHO/TAO_TRADER_ECHO/' \\"
-    "	    -e 's/\\$$Hea''der.*\\$$/$$I''d$$/' \\"
-    "	    -e 's@#include <stdio\.h>@#include \"ace/os_include/os_stdio.h\"@' \\"
-    "	    -e 's@#include <unistd\.h>@#include \"ace/OS_NS_unistd.h\"@' \\"
-    "	    -e '/#include </d' \\"  
-    "	>> Trader/Constraint_l.cpp"
-    "	(cd Trader; patch < Constraint_l.cpp.diff)"
-
-    Trader/Constraint_y.cpp: Trader/constraint.y
-    "	@echo 'INFORMATION: Potentially outdated $@'"
-    "	@echo '             either touch(1) the file or explicitly'"
-    "	@echo '             generate it using:'"                    
-    "	@echo '    make -f GNUmakefile.CosTrading_Serv Constraint_y'"
-
-    .PHONY: Constraint_y
-    Constraint_y:
-    "	yacc -l -d Trader/constraint.y"
-    "	sed -e 's/	/        /g' \\"
-    "	    -e 's/int newsize, i/size_t newsize, i/g' \\"
-    "	    -e 's/static  *int  *yygrowstack();/ /g' \\"
-    "	    -e 's/  *$$\/\/g' \\"
-    "	    -e 's/\|\| defined(__GNUC__)/|| defined(__GNUC__) || defined (WIN32) || defined (__HP_aCC)/g' \\"
-    "	    -e 's/memcpy/ACE_OS::memcpy/g' \\"
-    "	    -e 's/getenv/ACE_OS::getenv/g' \\"
-    "	    -e 's/free/ACE_OS::free/g' \\"
-    "	    -e 's/malloc/ACE_OS::malloc/g' \\"
-    "	    -e 's/realloc/ACE_OS::realloc/g' < y.tab.c > Trader/Constraint_y.cpp"
-    "	echo TAO_END_VERSIONED_NAMESPACE_DECL >> Trader/Constraint_y.cpp"
-    "	echo '\/\/ $$I''d$$' > Trader/Constraint_Tokens.h"
-    "	echo '' >> Trader/Constraint_Tokens.h"
-    "	echo '#ifndef CONSTRAINT_TOKEN_H' >> Trader/Constraint_Tokens.h"
-    "	echo '#define CONSTRAINT_TOKEN_H' >> Trader/Constraint_Tokens.h"
-    "	echo '#include /**/ \"ace/pre.h\"' >> Trader/Constraint_Tokens.h"
-    "	echo '' >> Trader/Constraint_Tokens.h"
-    "	cat y.tab.h >> Trader/Constraint_Tokens.h"
-    "	echo '#include /**/ \"ace/post.h\"' >> Trader/Constraint_Tokens.h"
-    "	echo '#endif /* CONSTRAINT_TOKEN_H */' >> Trader/Constraint_Tokens.h"
-    "	$(RM) y.tab.h y.tab.c"
-  }
 }