diff options
| author | Simon McQueen <simon.mcqueen@gmail.com> | 2003-05-15 13:17:05 +0000 |
|---|---|---|
| committer | Simon McQueen <simon.mcqueen@gmail.com> | 2003-05-15 13:17:05 +0000 |
| commit | 9eaaeaa0c48b6138aface4a0743f520ce794f353 (patch) | |
| tree | a50f3c6c0fb1d7a9961e4dd2605413bdea797360 | |
| parent | 88254b320ccadfcb885786cc07ba5b11cd8c9a68 (diff) | |
| download | ATCD-9eaaeaa0c48b6138aface4a0743f520ce794f353.tar.gz | |
ChangeLogTag: Thu May 15 14:07:33 2003 Simon McQueen <sm@prismtechnologies.com>
91 files changed, 200 insertions, 101 deletions
diff --git a/TAO/CIAO/tools/Simple_Component_Server/Makefile b/TAO/CIAO/tools/Simple_Component_Server/Makefile index 6025957c787..482421561fe 100644 --- a/TAO/CIAO/tools/Simple_Component_Server/Makefile +++ b/TAO/CIAO/tools/Simple_Component_Server/Makefile @@ -20,7 +20,7 @@ LDLIBS = -lTAO_IFR_Client \ -lCIAO_Container \ -lCIAO_Server \ -lTAO_CosNaming \ - -lTAO_PortableServer \ + -lTAO_PortableServer -lTAO_Valuetype -lTAO_ObjRefTemplate -lTAO_IORInterceptor \ -lTAO SRC = Simple_Component_Server.cpp diff --git a/TAO/ChangeLog b/TAO/ChangeLog index b3ee3f080ae..fcbd62154ca 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,102 @@ +Thu May 15 14:07:33 2003 Simon McQueen <sm@prismtechnologies.com> + + * CIAO/tools/Simple_Component_Server/Makefile: + * docs/tutorials/Quoter/AMI/Makefile: + * docs/tutorials/Quoter/Event_Service/Makefile: + * docs/tutorials/Quoter/idl/Makefile: + * docs/tutorials/Quoter/Naming_Service/Makefile: + * docs/tutorials/Quoter/On_Demand_Activation/Makefile: + * docs/tutorials/Quoter/RT_Event_Service/Makefile: + * docs/tutorials/Quoter/Simple/Client/Makefile: + * docs/tutorials/Quoter/Simple/Impl-Repo/Makefile: + * docs/tutorials/Quoter/Simple/ImprovedServer/Makefile: + * docs/tutorials/Quoter/Simple/Persistent/Makefile: + * docs/tutorials/Quoter/Simple/Server/Makefile: + * examples/Advanced/ch_18/Makefile: + * examples/Advanced/ch_21/Makefile: + * examples/Advanced/ch_3/Makefile: + * examples/Advanced/ch_8_and_10/Makefile: + * examples/AMI/FL_Callback/Makefile: + * examples/Buffered_AMI/Makefile: + * examples/Content_Server/AMI_Iterator/Makefile: + * examples/Content_Server/AMI_Observer/Makefile: + * examples/Content_Server/SMI_Iterator/Makefile: + * examples/Event_Comm/Makefile: + * examples/ior_corbaloc/Makefile: + * examples/Load_Balancing/Makefile: + * examples/Load_Balancing_persistent/Makefile: + * examples/Logging/Makefile: + * examples/OBV/Typed_Events/Makefile: + * examples/Persistent_Grid/Makefile: + * examples/PluggableUDP/tests/Basic/Makefile: + * examples/PluggableUDP/tests/Performance/Makefile: + * examples/PluggableUDP/tests/SimplePerformance/Makefile: + * examples/POA/Adapter_Activator/Makefile: + * examples/POA/Explicit_Activation/Makefile: + * examples/POA/FindPOA/Makefile: + * examples/POA/Loader/Makefile: + * examples/POA/NewPOA/Makefile: + * examples/POA/On_Demand_Activation/Makefile: + * examples/POA/On_Demand_Loading/Makefile: + * examples/POA/POA_BiDir/Makefile: + * examples/POA/RootPOA/Makefile: + * examples/Quoter/Makefile: + * examples/Simple/bank/Makefile: + * examples/Simple/echo/Makefile: + * examples/Simple/grid/Makefile: + * examples/Simple/time/Makefile: + * examples/Simple/time-date/Makefile: + * examples/Simulator/Event_Supplier/Makefile: + * orbsvcs/examples/CosEC/RtEC_Based/lib/Makefile: + * orbsvcs/examples/Log/Basic/Makefile: + * orbsvcs/examples/PSS/Makefile: + * orbsvcs/examples/Security/SecurityLevel1/Makefile: + * orbsvcs/examples/Security/Send_File/Makefile: + * orbsvcs/performance-tests/RTEvent/Colocated_Roundtrip/Makefile: + * orbsvcs/performance-tests/RTEvent/Federated_Roundtrip/Makefile: + * orbsvcs/performance-tests/RTEvent/lib/Makefile: + * orbsvcs/performance-tests/RTEvent/Roundtrip/Makefile: + * orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/Makefile: + * orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/Makefile: + * orbsvcs/performance-tests/RTEvent/TCP_Baseline/Makefile: + * orbsvcs/PSS/Makefile: + * orbsvcs/tests/AVStreams/Modify_QoS/Makefile: + * orbsvcs/tests/AVStreams/Multiple_Flows/Makefile: + * orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/Makefile: + * orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/Makefile: + * orbsvcs/tests/CosEvent/lib/Makefile: + * orbsvcs/tests/Event/lib/Makefile: + * orbsvcs/tests/FaultTolerance/IOGRManipulation/Makefile: + * orbsvcs/tests/IOR_MCast/Makefile: + * orbsvcs/tests/Log/Basic_Log_Test/Makefile: + * orbsvcs/tests/Notify/lib/Makefile: + * orbsvcs/tests/Sched/Makefile: + * orbsvcs/tests/Security/Crash_Test/Makefile: + * orbsvcs/tests/Security/SecurityLevel1/Makefile: + * performance-tests/Cubit/TAO/IDL_Cubit/Makefile: + * performance-tests/Cubit/TAO/MT_Cubit/Makefile: + * performance-tests/POA/Demux/Makefile: + * performance-tests/POA/Object_Creation_And_Registration/Makefile: + * performance-tests/RTCorba/Multiple_Endpoints/Common/Makefile: + * tao/Domain/Makefile: + * tao/DynamicInterface/Makefile: + * tao/Messaging/Makefile: + * tao/RTPortableServer/Makefile: + * tao/Utils/Makefile: + * tests/Client_Leaks/Makefile: + * tests/Crashed_Callback/Makefile: + * tests/IDL_Test/Makefile: + * tests/Object_Loader/Makefile: + * tests/Smart_Proxies/Makefile: + * tests/Smart_Proxies/On_Demand/Makefile: + * utils/nslist/Makefile: + * utils/wxNamingViewer/Makefile: + + Replaced "-lTAO_PortableServer" with "-lTAO_PortableServer + -lTAO_Valuetype -lTAO_ObjRefTemplate -lTAO_IORInterceptor" wherever + it occured. Should just about clear up the last of the static build + errors caused by the TAO sub setting. + Wed May 14 12:46:34 2003 Balachandran Natarajan <bala@dre.vanderbilt.edu> * tao/ObjectKey_Table.cpp (destroy): Iterating conditions while @@ -599,7 +698,7 @@ Tue May 6 17:52:53 2003 Balachandran Natarajan <bala@dre.vanderbilt.edu> * tests/Faults/test_i.h: Fixed servant memory management problems. Thanks to Ira Burton <imburton@micron.com> for motivating to take a look. - + Tue May 6 15:52:42 2003 Ossama Othman <ossama@dre.vanderbilt.edu> * orbsvcs/orbsvcs/Makefile.CosLoadBalancing (ACE_SHLIBS): diff --git a/TAO/docs/tutorials/Quoter/AMI/Makefile b/TAO/docs/tutorials/Quoter/AMI/Makefile index 605ec9af54c..a460d1da47a 100644 --- a/TAO/docs/tutorials/Quoter/AMI/Makefile +++ b/TAO/docs/tutorials/Quoter/AMI/Makefile @@ -16,7 +16,7 @@ IDL_FILES = Quoter IDL_SRC = QuoterC QuoterS BIN = client server -LDLIBS = -lTAO_Messaging -lTAO_Valuetype -lTAO_PortableServer -lTAO +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) diff --git a/TAO/docs/tutorials/Quoter/Event_Service/Makefile b/TAO/docs/tutorials/Quoter/Event_Service/Makefile index a4fafe2a1f7..efb3b1d6e36 100644 --- a/TAO/docs/tutorials/Quoter/Event_Service/Makefile +++ b/TAO/docs/tutorials/Quoter/Event_Service/Makefile @@ -12,7 +12,7 @@ ifndef TAO_ROOT TAO_ROOT = $(ACE_ROOT)/TAO endif # ! TAO_ROOT -LDLIBS = -lTAO_CosEvent -lTAO_CosNaming -lTAO_Svc_Utils -lTAO_IORTable -lTAO_PortableServer -lTAO +LDLIBS = -lTAO_CosEvent -lTAO_CosNaming -lTAO_Svc_Utils -lTAO_IORTable -lTAO_PortableServer -lTAO_Valuetype -lTAO_ObjRefTemplate -lTAO_IORInterceptor -lTAO CPPFLAGS += -I$(TAO_ROOT)/orbsvcs IDL_FILES = Quoter diff --git a/TAO/docs/tutorials/Quoter/Naming_Service/Makefile b/TAO/docs/tutorials/Quoter/Naming_Service/Makefile index 4937fd6c235..f5ba27e15d2 100644 --- a/TAO/docs/tutorials/Quoter/Naming_Service/Makefile +++ b/TAO/docs/tutorials/Quoter/Naming_Service/Makefile @@ -12,7 +12,7 @@ ifndef TAO_ROOT TAO_ROOT = $(ACE_ROOT)/TAO endif # ! TAO_ROOT -LDLIBS = -lQuoter_Common -lTAO_CosNaming -lTAO_Svc_Utils -lTAO_IORTable -lTAO_PortableServer -lTAO +LDLIBS = -lQuoter_Common -lTAO_CosNaming -lTAO_Svc_Utils -lTAO_IORTable -lTAO_PortableServer -lTAO_Valuetype -lTAO_ObjRefTemplate -lTAO_IORInterceptor -lTAO CPPFLAGS += -I$(TAO_ROOT)/orbsvcs CPPFLAGS += -I../idl BIN2 = client server diff --git a/TAO/docs/tutorials/Quoter/On_Demand_Activation/Makefile b/TAO/docs/tutorials/Quoter/On_Demand_Activation/Makefile index 0407f6e7d49..449bf28078c 100644 --- a/TAO/docs/tutorials/Quoter/On_Demand_Activation/Makefile +++ b/TAO/docs/tutorials/Quoter/On_Demand_Activation/Makefile @@ -16,7 +16,7 @@ IDL_FILES = Quoter IDL_SRC = QuoterC QuoterS BIN_UNCHECKED = client server -LDLIBS = -lTAO_Messaging -lTAO_Valuetype -lTAO_PortableServer -lTAO +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) diff --git a/TAO/docs/tutorials/Quoter/RT_Event_Service/Makefile b/TAO/docs/tutorials/Quoter/RT_Event_Service/Makefile index 4dd85994cb1..c9e22eff72c 100644 --- a/TAO/docs/tutorials/Quoter/RT_Event_Service/Makefile +++ b/TAO/docs/tutorials/Quoter/RT_Event_Service/Makefile @@ -12,7 +12,7 @@ ifndef TAO_ROOT TAO_ROOT = $(ACE_ROOT)/TAO endif # ! TAO_ROOT -LDLIBS = -lTAO_RTEvent -lTAO_CosNaming -lTAO_Svc_Utils -lTAO_IORTable -lTAO_PortableServer -lTAO +LDLIBS = -lTAO_RTEvent -lTAO_CosNaming -lTAO_Svc_Utils -lTAO_IORTable -lTAO_PortableServer -lTAO_Valuetype -lTAO_ObjRefTemplate -lTAO_IORInterceptor -lTAO CPPFLAGS += -I$(TAO_ROOT)/orbsvcs IDL_FILES = Quoter diff --git a/TAO/docs/tutorials/Quoter/Simple/Client/Makefile b/TAO/docs/tutorials/Quoter/Simple/Client/Makefile index 99192735625..70cd60367ec 100644 --- a/TAO/docs/tutorials/Quoter/Simple/Client/Makefile +++ b/TAO/docs/tutorials/Quoter/Simple/Client/Makefile @@ -12,7 +12,7 @@ ifndef TAO_ROOT TAO_ROOT = $(ACE_ROOT)/TAO endif # ! TAO_ROOT -LDLIBS = -lQuoter_Common -lTAO_PortableServer -lTAO +LDLIBS = -lQuoter_Common -lTAO_PortableServer -lTAO_Valuetype -lTAO_ObjRefTemplate -lTAO_IORInterceptor -lTAO CPPFLAGS += -I$(TAO_ROOT)/orbsvc BIN = client diff --git a/TAO/docs/tutorials/Quoter/Simple/Impl-Repo/Makefile b/TAO/docs/tutorials/Quoter/Simple/Impl-Repo/Makefile index 45ef07efbdb..c9448038e34 100644 --- a/TAO/docs/tutorials/Quoter/Simple/Impl-Repo/Makefile +++ b/TAO/docs/tutorials/Quoter/Simple/Impl-Repo/Makefile @@ -12,7 +12,7 @@ ifndef TAO_ROOT TAO_ROOT = $(ACE_ROOT)/TAO endif # ! TAO_ROOT -LDLIBS = -lQuoter_Common -lTAO_IORTable -lTAO_PortableServer -lTAO +LDLIBS = -lQuoter_Common -lTAO_IORTable -lTAO_PortableServer -lTAO_Valuetype -lTAO_ObjRefTemplate -lTAO_IORInterceptor -lTAO # IDL_FILES = Quoter # IDL_SRC = QuoterC.cpp QuoterS.cpp diff --git a/TAO/docs/tutorials/Quoter/Simple/ImprovedServer/Makefile b/TAO/docs/tutorials/Quoter/Simple/ImprovedServer/Makefile index a59f0e87df4..91341f56012 100644 --- a/TAO/docs/tutorials/Quoter/Simple/ImprovedServer/Makefile +++ b/TAO/docs/tutorials/Quoter/Simple/ImprovedServer/Makefile @@ -12,7 +12,7 @@ ifndef TAO_ROOT TAO_ROOT = $(ACE_ROOT)/TAO endif # ! TAO_ROOT -LDLIBS = -lQuoter_Common -lTAO_PortableServer -lTAO +LDLIBS = -lQuoter_Common -lTAO_PortableServer -lTAO_Valuetype -lTAO_ObjRefTemplate -lTAO_IORInterceptor -lTAO BIN = server diff --git a/TAO/docs/tutorials/Quoter/Simple/Persistent/Makefile b/TAO/docs/tutorials/Quoter/Simple/Persistent/Makefile index 68eee390df1..69895bc4f62 100644 --- a/TAO/docs/tutorials/Quoter/Simple/Persistent/Makefile +++ b/TAO/docs/tutorials/Quoter/Simple/Persistent/Makefile @@ -12,7 +12,7 @@ ifndef TAO_ROOT TAO_ROOT = $(ACE_ROOT)/TAO endif # ! TAO_ROOT -LDLIBS = -lQuoter_Common -lTAO_PortableServer -lTAO +LDLIBS = -lQuoter_Common -lTAO_PortableServer -lTAO_Valuetype -lTAO_ObjRefTemplate -lTAO_IORInterceptor -lTAO # IDL_FILES = Quoter # IDL_SRC = QuoterC.cpp QuoterS.cpp diff --git a/TAO/docs/tutorials/Quoter/Simple/Server/Makefile b/TAO/docs/tutorials/Quoter/Simple/Server/Makefile index c348342e732..0dc8e67fd0a 100644 --- a/TAO/docs/tutorials/Quoter/Simple/Server/Makefile +++ b/TAO/docs/tutorials/Quoter/Simple/Server/Makefile @@ -12,7 +12,7 @@ ifndef TAO_ROOT TAO_ROOT = $(ACE_ROOT)/TAO endif # ! TAO_ROOT -LDLIBS = -lQuoter_Common -lTAO_PortableServer -lTAO +LDLIBS = -lQuoter_Common -lTAO_PortableServer -lTAO_Valuetype -lTAO_ObjRefTemplate -lTAO_IORInterceptor -lTAO BIN = server diff --git a/TAO/docs/tutorials/Quoter/idl/Makefile b/TAO/docs/tutorials/Quoter/idl/Makefile index 583e3c3e82f..0927092e9d5 100644 --- a/TAO/docs/tutorials/Quoter/idl/Makefile +++ b/TAO/docs/tutorials/Quoter/idl/Makefile @@ -24,8 +24,8 @@ SHLIB = libQuoter_Common.$(SOEXT) IDL_FILES = Quoter IDL_SRC = QuoterC QuoterS -ACE_SHLIBS = -lTAO_PortableServer -lTAO -lACE -LDLIBS = -lTAO_PortableServer -lTAO +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) ) diff --git a/TAO/examples/AMI/FL_Callback/Makefile b/TAO/examples/AMI/FL_Callback/Makefile index 3769dede87c..e5772d5594f 100644 --- a/TAO/examples/AMI/FL_Callback/Makefile +++ b/TAO/examples/AMI/FL_Callback/Makefile @@ -12,7 +12,7 @@ ifndef TAO_ROOT TAO_ROOT = $(ACE_ROOT)/TAO endif # ! TAO_ROOT -LDLIBS = -lTAO_Valuetype -lTAO_PortableServer -lTAO +LDLIBS = -lTAO_PortableServer -lTAO_Valuetype -lTAO_ObjRefTemplate -lTAO_IORInterceptor -lTAO IDL_FILES = test IDL_SRC = testC.cpp testS.cpp diff --git a/TAO/examples/Advanced/ch_18/Makefile b/TAO/examples/Advanced/ch_18/Makefile index 93c155c7666..15e25a4fadf 100644 --- a/TAO/examples/Advanced/ch_18/Makefile +++ b/TAO/examples/Advanced/ch_18/Makefile @@ -12,7 +12,7 @@ ifndef TAO_ROOT TAO_ROOT = $(ACE_ROOT)/TAO endif -LDLIBS = -lTAO_CosNaming -lTAO -lTAO_PortableServer +LDLIBS = -lTAO_CosNaming -lTAO -lTAO_PortableServer -lTAO_Valuetype -lTAO_ObjRefTemplate -lTAO_IORInterceptor IDL_FILES = CCS IDL_SRC = CCSC.cpp CCSS.cpp IDL_HDR = CCSC.h CCSS.h diff --git a/TAO/examples/Advanced/ch_21/Makefile b/TAO/examples/Advanced/ch_21/Makefile index dd2c937f67a..a83fea083f5 100644 --- a/TAO/examples/Advanced/ch_21/Makefile +++ b/TAO/examples/Advanced/ch_21/Makefile @@ -12,7 +12,7 @@ ifndef TAO_ROOT TAO_ROOT = $(ACE_ROOT)/TAO endif -LDLIBS = -lTAO -lTAO_PortableServer +LDLIBS = -lTAO -lTAO_PortableServer -lTAO_Valuetype -lTAO_ObjRefTemplate -lTAO_IORInterceptor IDL_FILES = CCS IDL_SRC = CCSC.cpp CCSS.cpp IDL_HDR = CCSC.h CCSS.h diff --git a/TAO/examples/Advanced/ch_3/Makefile b/TAO/examples/Advanced/ch_3/Makefile index 74016040d81..b681999b480 100644 --- a/TAO/examples/Advanced/ch_3/Makefile +++ b/TAO/examples/Advanced/ch_3/Makefile @@ -12,7 +12,7 @@ ifndef TAO_ROOT TAO_ROOT = $(ACE_ROOT)/TAO endif # ! TAO_ROOT -LDLIBS = -lTAO_PortableServer -lTAO +LDLIBS = -lTAO_PortableServer -lTAO_Valuetype -lTAO_ObjRefTemplate -lTAO_IORInterceptor -lTAO IDL_FILES = time IDL_SRC = timeC.cpp timeS.cpp IDL_HDR = timeC.h timeS.h diff --git a/TAO/examples/Advanced/ch_8_and_10/Makefile b/TAO/examples/Advanced/ch_8_and_10/Makefile index 2e3af07c96f..b4bc1619e1d 100644 --- a/TAO/examples/Advanced/ch_8_and_10/Makefile +++ b/TAO/examples/Advanced/ch_8_and_10/Makefile @@ -12,7 +12,7 @@ ifndef TAO_ROOT TAO_ROOT = $(ACE_ROOT)/TAO endif -LDLIBS = -lTAO -lTAO_PortableServer +LDLIBS = -lTAO -lTAO_PortableServer -lTAO_Valuetype -lTAO_ObjRefTemplate -lTAO_IORInterceptor IDL_FILES = CCS IDL_SRC = CCSC.cpp CCSS.cpp IDL_HDR = CCSC.h CCSS.h diff --git a/TAO/examples/Buffered_AMI/Makefile b/TAO/examples/Buffered_AMI/Makefile index 2b7c24b7833..fc2dfd35a1a 100644 --- a/TAO/examples/Buffered_AMI/Makefile +++ b/TAO/examples/Buffered_AMI/Makefile @@ -12,7 +12,7 @@ ifndef TAO_ROOT TAO_ROOT = $(ACE_ROOT)/TAO endif # ! TAO_ROOT -LDLIBS = -LTAO_Valuetype -lTAO_Messaging -lTAO_PortableServer -lTAO +LDLIBS = -lTAO_Messaging -lTAO_PortableServer -lTAO_Valuetype -lTAO_ObjRefTemplate -lTAO_IORInterceptor -lTAO IDL_FILES = test IDL_SRC = testC.cpp testS.cpp diff --git a/TAO/examples/Content_Server/AMI_Iterator/Makefile b/TAO/examples/Content_Server/AMI_Iterator/Makefile index 40cfd2ada3b..a0cf915782a 100644 --- a/TAO/examples/Content_Server/AMI_Iterator/Makefile +++ b/TAO/examples/Content_Server/AMI_Iterator/Makefile @@ -10,7 +10,7 @@ ifndef TAO_ROOT TAO_ROOT = $(ACE_ROOT)/TAO endif -LDLIBS = -lTAO_CosNaming -lTAO_Svc_Utils -lTAO_IORTable -lTAO_Messaging -lTAO_Valuetype -lTAO_PortableServer -lTAO +LDLIBS = -lTAO_CosNaming -lTAO_Svc_Utils -lTAO_IORTable -lTAO_Messaging -lTAO_PortableServer -lTAO_Valuetype -lTAO_ObjRefTemplate -lTAO_IORInterceptor -lTAO include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU include $(TAO_ROOT)/rules.tao.GNU diff --git a/TAO/examples/Content_Server/AMI_Observer/Makefile b/TAO/examples/Content_Server/AMI_Observer/Makefile index 0214af6afd4..686fef6dbc1 100644 --- a/TAO/examples/Content_Server/AMI_Observer/Makefile +++ b/TAO/examples/Content_Server/AMI_Observer/Makefile @@ -11,7 +11,7 @@ ifndef TAO_ROOT TAO_ROOT = $(ACE_ROOT)/TAO endif -LDLIBS = -lTAO_CosNaming -lTAO_Svc_Utils -lTAO_IORTable -lTAO_Messaging -lTAO_Valuetype -lTAO_PortableServer -lTAO +LDLIBS = -lTAO_CosNaming -lTAO_Svc_Utils -lTAO_IORTable -lTAO_Messaging -lTAO_PortableServer -lTAO_Valuetype -lTAO_ObjRefTemplate -lTAO_IORInterceptor -lTAO include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU include $(TAO_ROOT)/rules.tao.GNU diff --git a/TAO/examples/Content_Server/SMI_Iterator/Makefile b/TAO/examples/Content_Server/SMI_Iterator/Makefile index df62c685f0d..6bbb1a0a975 100644 --- a/TAO/examples/Content_Server/SMI_Iterator/Makefile +++ b/TAO/examples/Content_Server/SMI_Iterator/Makefile @@ -11,7 +11,7 @@ ifndef TAO_ROOT TAO_ROOT = $(ACE_ROOT)/TAO endif -LDLIBS = -lTAO_CosNaming -lTAO_Svc_Utils -lTAO_IORTable -lTAO_PortableServer -lTAO +LDLIBS = -lTAO_CosNaming -lTAO_Svc_Utils -lTAO_IORTable -lTAO_PortableServer -lTAO_Valuetype -lTAO_ObjRefTemplate -lTAO_IORInterceptor -lTAO include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU include $(TAO_ROOT)/rules.tao.GNU diff --git a/TAO/examples/Event_Comm/Makefile b/TAO/examples/Event_Comm/Makefile index 756e11effdf..2dfad412651 100644 --- a/TAO/examples/Event_Comm/Makefile +++ b/TAO/examples/Event_Comm/Makefile @@ -12,7 +12,7 @@ ifndef TAO_ROOT TAO_ROOT = $(ACE_ROOT)/TAO endif # ! TAO_ROOT -LDLIBS = -lTAO_CosNaming -lTAO_Svc_Utils -lTAO_IORTable -lTAO_PortableServer -lTAO +LDLIBS = -lTAO_CosNaming -lTAO_Svc_Utils -lTAO_IORTable -lTAO_PortableServer -lTAO_Valuetype -lTAO_ObjRefTemplate -lTAO_IORInterceptor -lTAO PROG_SRCS = Consumer_Handler.cpp \ Consumer_Input_Handler.cpp \ Event_Comm_i.cpp \ diff --git a/TAO/examples/Load_Balancing/Makefile b/TAO/examples/Load_Balancing/Makefile index f3d4bcd16d4..450e2b600dd 100644 --- a/TAO/examples/Load_Balancing/Makefile +++ b/TAO/examples/Load_Balancing/Makefile @@ -9,7 +9,7 @@ endif TAO_IDLFLAGS += -Ge 1 -LDLIBS = -lTAO_PortableServer -lTAO +LDLIBS = -lTAO_PortableServer -lTAO_Valuetype -lTAO_ObjRefTemplate -lTAO_IORInterceptor -lTAO IDL_FILES = Load_Balancer Identity IDL_SRC = \ diff --git a/TAO/examples/Load_Balancing_persistent/Makefile b/TAO/examples/Load_Balancing_persistent/Makefile index cd396856808..83dcaa110c6 100755 --- a/TAO/examples/Load_Balancing_persistent/Makefile +++ b/TAO/examples/Load_Balancing_persistent/Makefile @@ -8,7 +8,7 @@ ifndef TAO_ROOT endif TAO_IDLFLAGS += -Ge 1 -LDLIBS = -lTAO_PortableServer -lTAO +LDLIBS = -lTAO_PortableServer -lTAO_Valuetype -lTAO_ObjRefTemplate -lTAO_IORInterceptor -lTAO IDL_FILES = Load_Balancer Identity IDL_SRC = \ diff --git a/TAO/examples/Logging/Makefile b/TAO/examples/Logging/Makefile index ebd686ec67e..3f8738940f9 100644 --- a/TAO/examples/Logging/Makefile +++ b/TAO/examples/Logging/Makefile @@ -11,7 +11,7 @@ TAO_IDLFLAGS += -I$(TAO_ROOT)/orbsvcs/orbsvcs -Ge 1 # The following lines tell the souce code that the trading # service is available. -LDLIBS = -lTAO_CosNaming -lTAO_Svc_Utils -lTAO_IORTable -lTAO_PortableServer -lTAO +LDLIBS = -lTAO_CosNaming -lTAO_Svc_Utils -lTAO_IORTable -lTAO_PortableServer -lTAO_Valuetype -lTAO_ObjRefTemplate -lTAO_IORInterceptor -lTAO IDL_FILES = Logger IDL_SRC = LoggerC.cpp LoggerS.cpp diff --git a/TAO/examples/OBV/Typed_Events/Makefile b/TAO/examples/OBV/Typed_Events/Makefile index e7da662c60e..bc1f7ca6a96 100644 --- a/TAO/examples/OBV/Typed_Events/Makefile +++ b/TAO/examples/OBV/Typed_Events/Makefile @@ -12,7 +12,7 @@ ifndef TAO_ROOT TAO_ROOT = $(ACE_ROOT)/TAO endif # ! TAO_ROOT -LDLIBS = -lTAO_PortableServer -lTAO +LDLIBS = -lTAO_PortableServer -lTAO_Valuetype -lTAO_ObjRefTemplate -lTAO_IORInterceptor -lTAO IDL_FILES = Event_Types IDL_SRC = Event_TypesC.cpp Event_TypesS.cpp diff --git a/TAO/examples/POA/Adapter_Activator/Makefile b/TAO/examples/POA/Adapter_Activator/Makefile index c0b6cb421dc..9ad9b7ecd2a 100644 --- a/TAO/examples/POA/Adapter_Activator/Makefile +++ b/TAO/examples/POA/Adapter_Activator/Makefile @@ -12,7 +12,7 @@ LSRC = $(addsuffix .cpp,$(BIN)) CPPFLAGS += -I$(TAO_ROOT) -I../Generic_Servant -LDLIBS = -lGeneric_Servant -lTAO_PortableServer -lTAO +LDLIBS = -lGeneric_Servant -lTAO_PortableServer -lTAO_Valuetype -lTAO_ObjRefTemplate -lTAO_IORInterceptor -lTAO LDFLAGS += -L$(TAO_ROOT)/tao -L../Generic_Servant INSTALL = diff --git a/TAO/examples/POA/Explicit_Activation/Makefile b/TAO/examples/POA/Explicit_Activation/Makefile index b98adc27742..e653607a788 100644 --- a/TAO/examples/POA/Explicit_Activation/Makefile +++ b/TAO/examples/POA/Explicit_Activation/Makefile @@ -12,7 +12,7 @@ LSRC = $(addsuffix .cpp,$(BIN)) CPPFLAGS += -I$(TAO_ROOT) -I../Generic_Servant -LDLIBS = -lGeneric_Servant -lTAO_PortableServer -lTAO +LDLIBS = -lGeneric_Servant -lTAO_PortableServer -lTAO_Valuetype -lTAO_ObjRefTemplate -lTAO_IORInterceptor -lTAO LDFLAGS += -L$(TAO_ROOT)/tao -L../Generic_Servant INSTALL = diff --git a/TAO/examples/POA/FindPOA/Makefile b/TAO/examples/POA/FindPOA/Makefile index 8ed5b551072..9b10d4d55c9 100644 --- a/TAO/examples/POA/FindPOA/Makefile +++ b/TAO/examples/POA/FindPOA/Makefile @@ -12,7 +12,7 @@ LSRC = $(addsuffix .cpp,$(BIN)) CPPFLAGS += -I$(TAO_ROOT) -LDLIBS = -lTAO_PortableServer -lTAO +LDLIBS = -lTAO_PortableServer -lTAO_Valuetype -lTAO_ObjRefTemplate -lTAO_IORInterceptor -lTAO LDFLAGS += -L$(TAO_ROOT)/tao INSTALL = diff --git a/TAO/examples/POA/Loader/Makefile b/TAO/examples/POA/Loader/Makefile index 1cfc2fee119..5009de80256 100644 --- a/TAO/examples/POA/Loader/Makefile +++ b/TAO/examples/POA/Loader/Makefile @@ -15,7 +15,7 @@ OBJ = $(addsuffix .o,$(MYFILES)) CPPFLAGS += -I$(TAO_ROOT) -LDLIBS = -lTAO_PortableServer -lTAO +LDLIBS = -lTAO_PortableServer -lTAO_Valuetype -lTAO_ObjRefTemplate -lTAO_IORInterceptor -lTAO LDFLAGS += -L$(TAO_ROOT)/tao INSTALL = diff --git a/TAO/examples/POA/NewPOA/Makefile b/TAO/examples/POA/NewPOA/Makefile index b740185622a..3b0092627fc 100644 --- a/TAO/examples/POA/NewPOA/Makefile +++ b/TAO/examples/POA/NewPOA/Makefile @@ -12,7 +12,7 @@ LSRC = $(addsuffix .cpp,$(BIN)) CPPFLAGS += -I$(TAO_ROOT) -LDLIBS = -lTAO_PortableServer -lTAO +LDLIBS = -lTAO_PortableServer -lTAO_Valuetype -lTAO_ObjRefTemplate -lTAO_IORInterceptor -lTAO LDFLAGS += -L$(TAO_ROOT)/tao INSTALL = diff --git a/TAO/examples/POA/On_Demand_Activation/Makefile b/TAO/examples/POA/On_Demand_Activation/Makefile index bc0576b84b4..382d7dd50ea 100644 --- a/TAO/examples/POA/On_Demand_Activation/Makefile +++ b/TAO/examples/POA/On_Demand_Activation/Makefile @@ -15,7 +15,7 @@ OBJ = $(addsuffix .o,$(MYFILES)) CPPFLAGS += -I$(TAO_ROOT) -I../Generic_Servant -LDLIBS = -lGeneric_Servant -lTAO_PortableServer -lTAO +LDLIBS = -lGeneric_Servant -lTAO_PortableServer -lTAO_Valuetype -lTAO_ObjRefTemplate -lTAO_IORInterceptor -lTAO LDFLAGS += -L$(TAO_ROOT)/tao -L../Generic_Servant INSTALL = diff --git a/TAO/examples/POA/On_Demand_Loading/Makefile b/TAO/examples/POA/On_Demand_Loading/Makefile index 3fecb4c4e2f..9910295b96d 100644 --- a/TAO/examples/POA/On_Demand_Loading/Makefile +++ b/TAO/examples/POA/On_Demand_Loading/Makefile @@ -18,7 +18,7 @@ OBJ = $(addsuffix .o,$(MYFILES)) CPPFLAGS += -I$(TAO_ROOT) -LDLIBS = -lTAO_PortableServer -lTAO +LDLIBS = -lTAO_PortableServer -lTAO_Valuetype -lTAO_ObjRefTemplate -lTAO_IORInterceptor -lTAO LDFLAGS += -L$(TAO_ROOT)/tao INSTALL = diff --git a/TAO/examples/POA/POA_BiDir/Makefile b/TAO/examples/POA/POA_BiDir/Makefile index b151c8b61c2..f2d869514cd 100644 --- a/TAO/examples/POA/POA_BiDir/Makefile +++ b/TAO/examples/POA/POA_BiDir/Makefile @@ -12,7 +12,7 @@ LSRC = $(addsuffix .cpp,$(BIN)) CPPFLAGS += -I$(TAO_ROOT) -LDLIBS = -lTAO_BiDirGIOP -lTAO_PortableServer -lTAO +LDLIBS = -lTAO_BiDirGIOP -lTAO_PortableServer -lTAO_Valuetype -lTAO_ObjRefTemplate -lTAO_IORInterceptor -lTAO LDFLAGS += -L$(TAO_ROOT)/tao INSTALL = diff --git a/TAO/examples/POA/RootPOA/Makefile b/TAO/examples/POA/RootPOA/Makefile index f4e8b2f0c2d..1d299f10797 100644 --- a/TAO/examples/POA/RootPOA/Makefile +++ b/TAO/examples/POA/RootPOA/Makefile @@ -12,7 +12,7 @@ LSRC = $(addsuffix .cpp,$(BIN)) CPPFLAGS += -I$(TAO_ROOT) -LDLIBS = -lTAO_PortableServer -lTAO +LDLIBS = -lTAO_PortableServer -lTAO_Valuetype -lTAO_ObjRefTemplate -lTAO_IORInterceptor -lTAO LDFLAGS += -L$(TAO_ROOT)/tao INSTALL = diff --git a/TAO/examples/Persistent_Grid/Makefile b/TAO/examples/Persistent_Grid/Makefile index 8781fe1db8a..cf90af4f39e 100644 --- a/TAO/examples/Persistent_Grid/Makefile +++ b/TAO/examples/Persistent_Grid/Makefile @@ -13,7 +13,7 @@ ifndef TAO_ROOT endif #LDLIBS = -lTAO_CosNaming -lTAO -LDLIBS = -lTAO_PortableServer -lTAO +LDLIBS = -lTAO_PortableServer -lTAO_Valuetype -lTAO_ObjRefTemplate -lTAO_IORInterceptor -lTAO IDL_FILES = Grid IDL_SRC = GridC.cpp GridS.cpp diff --git a/TAO/examples/PluggableUDP/tests/Basic/Makefile b/TAO/examples/PluggableUDP/tests/Basic/Makefile index e1c009336ae..f2e1a89efe1 100644 --- a/TAO/examples/PluggableUDP/tests/Basic/Makefile +++ b/TAO/examples/PluggableUDP/tests/Basic/Makefile @@ -12,7 +12,7 @@ ifndef TAO_ROOT TAO_ROOT = $(ACE_ROOT)/TAO endif # ! TAO_ROOT -LDLIBS = -lTAO_Strategies -lTAO_PortableServer -lTAO +LDLIBS = -lTAO_Strategies -lTAO_PortableServer -lTAO_Valuetype -lTAO_ObjRefTemplate -lTAO_IORInterceptor -lTAO IDL_FILES = UDP IDL_SRC = UDPC.cpp UDPS.cpp diff --git a/TAO/examples/PluggableUDP/tests/Performance/Makefile b/TAO/examples/PluggableUDP/tests/Performance/Makefile index f0ff3c79e70..881e1170744 100644 --- a/TAO/examples/PluggableUDP/tests/Performance/Makefile +++ b/TAO/examples/PluggableUDP/tests/Performance/Makefile @@ -12,7 +12,7 @@ ifndef TAO_ROOT TAO_ROOT = $(ACE_ROOT)/TAO endif -LDLIBS = -lTAO_Strategies -lTAO_PortableServer -lTAO +LDLIBS = -lTAO_Strategies -lTAO_PortableServer -lTAO_Valuetype -lTAO_ObjRefTemplate -lTAO_IORInterceptor -lTAO IDL_FILES = UDP IDL_SRC = UDPC.cpp UDPS.cpp diff --git a/TAO/examples/PluggableUDP/tests/SimplePerformance/Makefile b/TAO/examples/PluggableUDP/tests/SimplePerformance/Makefile index 7672fa5ca12..223b74376f4 100644 --- a/TAO/examples/PluggableUDP/tests/SimplePerformance/Makefile +++ b/TAO/examples/PluggableUDP/tests/SimplePerformance/Makefile @@ -12,7 +12,7 @@ ifndef TAO_ROOT TAO_ROOT = $(ACE_ROOT)/TAO endif # ! TAO_ROOT -LDLIBS = -lTAO_Strategies -lTAO_PortableServer -lTAO +LDLIBS = -lTAO_Strategies -lTAO_PortableServer -lTAO_Valuetype -lTAO_ObjRefTemplate -lTAO_IORInterceptor -lTAO IDL_FILES = test IDL_SRC = testC.cpp testS.cpp diff --git a/TAO/examples/Quoter/Makefile b/TAO/examples/Quoter/Makefile index f7a27300b12..c2f804678ef 100644 --- a/TAO/examples/Quoter/Makefile +++ b/TAO/examples/Quoter/Makefile @@ -13,7 +13,7 @@ ifdef trader CPPFLAGS += -DTRADER_AVAILABLE endif # trader -LDLIBS = -lTAO_CosLifeCycle -lTAO_CosNaming -lTAO_Svc_Utils -lTAO_IORTable -lTAO_PortableServer -lTAO +LDLIBS = -lTAO_CosLifeCycle -lTAO_CosNaming -lTAO_Svc_Utils -lTAO_IORTable -lTAO_PortableServer -lTAO_Valuetype -lTAO_ObjRefTemplate -lTAO_IORInterceptor -lTAO IDL_FILES = Quoter IDL_SRC = QuoterC.cpp QuoterS.cpp diff --git a/TAO/examples/Simple/bank/Makefile b/TAO/examples/Simple/bank/Makefile index 9fbda451aed..45e70bc251e 100644 --- a/TAO/examples/Simple/bank/Makefile +++ b/TAO/examples/Simple/bank/Makefile @@ -12,7 +12,7 @@ ifndef TAO_ROOT TAO_ROOT = $(ACE_ROOT)/TAO endif -LDLIBS = -lTAO_CosNaming -lTAO_Svc_Utils -lTAO_IORTable -lTAO_PortableServer -lTAO +LDLIBS = -lTAO_CosNaming -lTAO_Svc_Utils -lTAO_IORTable -lTAO_PortableServer -lTAO_Valuetype -lTAO_ObjRefTemplate -lTAO_IORInterceptor -lTAO IDL_FILES = Bank IDL_SRC = BankC.cpp BankS.cpp diff --git a/TAO/examples/Simple/echo/Makefile b/TAO/examples/Simple/echo/Makefile index 10f5980305d..9478b000cc7 100644 --- a/TAO/examples/Simple/echo/Makefile +++ b/TAO/examples/Simple/echo/Makefile @@ -12,7 +12,7 @@ ifndef TAO_ROOT TAO_ROOT = $(ACE_ROOT)/TAO endif # ! TAO_ROOT -LDLIBS = -lTAO_CosNaming -lTAO_Svc_Utils -lTAO_IORTable -lTAO_PortableServer -lTAO +LDLIBS = -lTAO_CosNaming -lTAO_Svc_Utils -lTAO_IORTable -lTAO_PortableServer -lTAO_Valuetype -lTAO_ObjRefTemplate -lTAO_IORInterceptor -lTAO IDL_FILES = Echo IDL_SRC = EchoC.cpp EchoS.cpp diff --git a/TAO/examples/Simple/grid/Makefile b/TAO/examples/Simple/grid/Makefile index add031d0b5d..8cd6a0f9413 100644 --- a/TAO/examples/Simple/grid/Makefile +++ b/TAO/examples/Simple/grid/Makefile @@ -12,7 +12,7 @@ ifndef TAO_ROOT TAO_ROOT = $(ACE_ROOT)/TAO endif -LDLIBS = -lTAO_CosNaming -lTAO_Svc_Utils -lTAO_IORTable -lTAO_PortableServer -lTAO +LDLIBS = -lTAO_CosNaming -lTAO_Svc_Utils -lTAO_IORTable -lTAO_PortableServer -lTAO_Valuetype -lTAO_ObjRefTemplate -lTAO_IORInterceptor -lTAO IDL_FILES = Grid IDL_SRC = GridC.cpp GridS.cpp diff --git a/TAO/examples/Simple/time-date/Makefile b/TAO/examples/Simple/time-date/Makefile index f45aa7901da..9465e28bf2e 100644 --- a/TAO/examples/Simple/time-date/Makefile +++ b/TAO/examples/Simple/time-date/Makefile @@ -19,8 +19,8 @@ SHLIB = $(LIBNAME).$(SOEXT) FILES = Time_Date Time_Date_i Time_DateS Time_DateC LSRC = $(addsuffix .cpp,$(FILES)) -LDLIBS = -lTAO_CosNaming -lTAO_Svc_Utils -lTAO_IORTable -lTAO_PortableServer -lTAO -ACE_SHLIBS = -lTAO_CosNaming -lTAO_Svc_Utils -lTAO_IORTable -lTAO_PortableServer -lTAO -lACE +LDLIBS = -lTAO_CosNaming -lTAO_Svc_Utils -lTAO_IORTable -lTAO_PortableServer -lTAO_Valuetype -lTAO_ObjRefTemplate -lTAO_IORInterceptor -lTAO +ACE_SHLIBS = -lTAO_CosNaming -lTAO_Svc_Utils -lTAO_IORTable -lTAO_PortableServer -lTAO_Valuetype -lTAO_ObjRefTemplate -lTAO_IORInterceptor -lTAO -lACE IDL_FILES = Time_Date IDL_SRC = Time_DateC.cpp Time_DateS.cpp diff --git a/TAO/examples/Simple/time/Makefile b/TAO/examples/Simple/time/Makefile index a6b5d732735..b474ef8fa66 100644 --- a/TAO/examples/Simple/time/Makefile +++ b/TAO/examples/Simple/time/Makefile @@ -12,7 +12,7 @@ ifndef TAO_ROOT TAO_ROOT = $(ACE_ROOT)/TAO endif -LDLIBS = -lTAO_CosNaming -lTAO_Svc_Utils -lTAO_IORTable -lTAO_PortableServer -lTAO +LDLIBS = -lTAO_CosNaming -lTAO_Svc_Utils -lTAO_IORTable -lTAO_PortableServer -lTAO_Valuetype -lTAO_ObjRefTemplate -lTAO_IORInterceptor -lTAO IDL_FILES = Time IDL_SRC = TimeC.cpp TimeS.cpp diff --git a/TAO/examples/Simulator/Event_Supplier/Makefile b/TAO/examples/Simulator/Event_Supplier/Makefile index db555458801..ece395d0c17 100644 --- a/TAO/examples/Simulator/Event_Supplier/Makefile +++ b/TAO/examples/Simulator/Event_Supplier/Makefile @@ -21,7 +21,7 @@ EVENT_CON_OBJS = NavWeapC.o NavWeapS.o Event_Con.o LOGGING_SUP_OBJS = NavWeapC.o NavWeapS.o Logging_Sup.o DOVE_Supplier.o DUALEC_SUP_OBJS = NavWeapC.o NavWeapS.o DualEC_Sup.o DOVE_Supplier.o -LDLIBS = -lTAO_Messaging -lTAO_RTOLDEvent -lTAO_RTEvent -lTAO_RTSched -lTAO_CosNaming -lTAO_Svc_Utils -lTAO_IORTable -lTAO_PortableServer -lTAO +LDLIBS = -lTAO_Messaging -lTAO_RTOLDEvent -lTAO_RTEvent -lTAO_RTSched -lTAO_CosNaming -lTAO_Svc_Utils -lTAO_IORTable -lTAO_PortableServer -lTAO_Valuetype -lTAO_ObjRefTemplate -lTAO_IORInterceptor -lTAO BIN2 = Event_Sup Logging_Sup DualEC_Sup Event_Con diff --git a/TAO/examples/ior_corbaloc/Makefile b/TAO/examples/ior_corbaloc/Makefile index b0df89ac55e..1c961126ccc 100644 --- a/TAO/examples/ior_corbaloc/Makefile +++ b/TAO/examples/ior_corbaloc/Makefile @@ -15,7 +15,7 @@ endif # ! TAO_ROOT IDL_FILES = corbaloc IDL_SRC = corbalocC corbalocS -LDLIBS = -lTAO_CosNaming -lTAO_PortableServer -lTAO +LDLIBS = -lTAO_CosNaming -lTAO_PortableServer -lTAO_Valuetype -lTAO_ObjRefTemplate -lTAO_IORInterceptor -lTAO #CPPFLAGS += -I$(TAO_ROOT)/orbsvcs BIN = server client corbaname_client diff --git a/TAO/orbsvcs/PSS/Makefile b/TAO/orbsvcs/PSS/Makefile index 373e4df3e0c..d4e100012ee 100644 --- a/TAO/orbsvcs/PSS/Makefile +++ b/TAO/orbsvcs/PSS/Makefile @@ -12,7 +12,7 @@ LIBNAME = libTAO_PSDL LIB = $(LIBNAME).a SHLIB = $(LIBNAME).$(SOEXT) -ACE_SHLIBS = -lTAO_PortableServer -lTAO -lACE +ACE_SHLIBS = -lTAO_PortableServer -lTAO_Valuetype -lTAO_ObjRefTemplate -lTAO_IORInterceptor -lTAO -lACE #---------------------------------------------------------------------------- # Include macros and targets diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/Makefile b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/Makefile index 23d0c1eeef5..45687407e0f 100644 --- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/Makefile +++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/Makefile @@ -23,10 +23,10 @@ endif # RTEvent endif # CosEvent ACE_SHLIBS = -lTAO_RTEvent -lTAO_CosEvent \ - -lTAO_Svc_Utils -lTAO_PortableServer -lTAO -lACE + -lTAO_Svc_Utils -lTAO_PortableServer -lTAO_Valuetype -lTAO_ObjRefTemplate -lTAO_IORInterceptor -lTAO -lACE LDLIBS = -lTAO_RTEvent -lTAO_CosEvent -lTAO_Svc_Utils \ - -lTAO_PortableServer -lTAO -lACE + -lTAO_PortableServer -lTAO_Valuetype -lTAO_ObjRefTemplate -lTAO_IORInterceptor -lTAO -lACE CPP_SRCS += \ ConsumerAdmin_i \ diff --git a/TAO/orbsvcs/examples/Log/Basic/Makefile b/TAO/orbsvcs/examples/Log/Basic/Makefile index 864cb19d365..bba6de8e30d 100644 --- a/TAO/orbsvcs/examples/Log/Basic/Makefile +++ b/TAO/orbsvcs/examples/Log/Basic/Makefile @@ -12,7 +12,7 @@ ifndef TAO_ROOT TAO_ROOT = $(ACE_ROOT)/TAO endif -LDLIBS = -lTAO_DsLogAdmin -lTAO_CosNaming -lTAO_PortableServer -lTAO +LDLIBS = -lTAO_DsLogAdmin -lTAO_CosNaming -lTAO_PortableServer -lTAO_Valuetype -lTAO_ObjRefTemplate -lTAO_IORInterceptor -lTAO PROG_SRCS = \ TLS_Client.cpp \ diff --git a/TAO/orbsvcs/examples/PSS/Makefile b/TAO/orbsvcs/examples/PSS/Makefile index f30a5c8e9d7..56699653b13 100644 --- a/TAO/orbsvcs/examples/PSS/Makefile +++ b/TAO/orbsvcs/examples/PSS/Makefile @@ -12,7 +12,7 @@ ifndef TAO_ROOT TAO_ROOT = $(ACE_ROOT)/TAO endif -LDLIBS = -lTAO_PSDL_DataStore -lTAO_PortableServer -lTAO +LDLIBS = -lTAO_PSDL_DataStore -lTAO_PortableServer -lTAO_Valuetype -lTAO_ObjRefTemplate -lTAO_IORInterceptor -lTAO PSDL_FILES_EXT = psdl PSDL_FILES = naming_data diff --git a/TAO/orbsvcs/examples/Security/SecurityLevel1/Makefile b/TAO/orbsvcs/examples/Security/SecurityLevel1/Makefile index eaee95f62cf..2bcca9ff820 100644 --- a/TAO/orbsvcs/examples/Security/SecurityLevel1/Makefile +++ b/TAO/orbsvcs/examples/Security/SecurityLevel1/Makefile @@ -56,8 +56,8 @@ CLNT_LIBS += -lTAO_SSLIOP SRVR_LIBS += -lTAO_SSLIOP endif # static_libs_only = 1 -CLNT_LIBS += -lTAO_PortableServer $(TAO_CLNT_LIBS) -SRVR_LIBS += -lTAO_PortableServer $(TAO_SRVR_LIBS) +CLNT_LIBS += -lTAO_PortableServer -lTAO_Valuetype -lTAO_ObjRefTemplate -lTAO_IORInterceptor $(TAO_CLNT_LIBS) +SRVR_LIBS += -lTAO_PortableServer -lTAO_Valuetype -lTAO_ObjRefTemplate -lTAO_IORInterceptor $(TAO_SRVR_LIBS) #---------------------------------------------------------------------------- # Local targets diff --git a/TAO/orbsvcs/examples/Security/Send_File/Makefile b/TAO/orbsvcs/examples/Security/Send_File/Makefile index 824c097f2a9..aa48abd94ad 100644 --- a/TAO/orbsvcs/examples/Security/Send_File/Makefile +++ b/TAO/orbsvcs/examples/Security/Send_File/Makefile @@ -54,7 +54,7 @@ CLNT_LIBS += -lTAO_SSLIOP SRVR_LIBS += -lTAO_SSLIOP endif # static_libs_only = 1 -CLNT_LIBS += -lTAO_PortableServer $(TAO_CLNT_LIBS) +CLNT_LIBS += -lTAO_PortableServer -lTAO_Valuetype -lTAO_ObjRefTemplate -lTAO_IORInterceptor $(TAO_CLNT_LIBS) SRVR_LIBS += $(TAO_SRVR_LIBS) #---------------------------------------------------------------------------- diff --git a/TAO/orbsvcs/performance-tests/RTEvent/Colocated_Roundtrip/Makefile b/TAO/orbsvcs/performance-tests/RTEvent/Colocated_Roundtrip/Makefile index 1bf26898938..e2d37ae43f9 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/Colocated_Roundtrip/Makefile +++ b/TAO/orbsvcs/performance-tests/RTEvent/Colocated_Roundtrip/Makefile @@ -9,7 +9,7 @@ LDLIBS = -lTAO_RTEC_Perf \ -lTAO_Svc_Utils \ -lTAO_IORTable \ -lTAO_RTPortableServer \ - -lTAO_PortableServer \ + -lTAO_PortableServer -lTAO_Valuetype -lTAO_ObjRefTemplate -lTAO_IORInterceptor \ -lTAO_RTCORBA \ -lTAO_Strategies \ -lTAO_Messaging \ diff --git a/TAO/orbsvcs/performance-tests/RTEvent/Federated_Roundtrip/Makefile b/TAO/orbsvcs/performance-tests/RTEvent/Federated_Roundtrip/Makefile index 7e7b7ba4bcc..31d475fdcb5 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/Federated_Roundtrip/Makefile +++ b/TAO/orbsvcs/performance-tests/RTEvent/Federated_Roundtrip/Makefile @@ -9,7 +9,7 @@ LDLIBS = -lTAO_RTEC_Perf \ -lTAO_Svc_Utils \ -lTAO_IORTable \ -lTAO_RTPortableServer \ - -lTAO_PortableServer \ + -lTAO_PortableServer -lTAO_Valuetype -lTAO_ObjRefTemplate -lTAO_IORInterceptor \ -lTAO_RTCORBA \ -lTAO_Strategies \ -lTAO_Messaging \ diff --git a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/Makefile b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/Makefile index 782239d7c3c..744c6a8adac 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/Makefile +++ b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/Makefile @@ -9,7 +9,7 @@ LDLIBS = -lTAO_RTEC_Perf \ -lTAO_Svc_Utils \ -lTAO_IORTable \ -lTAO_RTPortableServer \ - -lTAO_PortableServer \ + -lTAO_PortableServer -lTAO_Valuetype -lTAO_ObjRefTemplate -lTAO_IORInterceptor \ -lTAO_RTCORBA \ -lTAO_Strategies \ -lTAO_Messaging \ diff --git a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/Makefile b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/Makefile index b666216c7ed..b9d4749ba00 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/Makefile +++ b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/Makefile @@ -9,7 +9,7 @@ LDLIBS = -lTAO_RTEC_Perf \ -lTAO_Svc_Utils \ -lTAO_IORTable \ -lTAO_RTPortableServer \ - -lTAO_PortableServer \ + -lTAO_PortableServer -lTAO_Valuetype -lTAO_ObjRefTemplate -lTAO_IORInterceptor \ -lTAO_RTCORBA \ -lTAO_Strategies \ -lTAO_Messaging \ diff --git a/TAO/orbsvcs/performance-tests/RTEvent/Roundtrip/Makefile b/TAO/orbsvcs/performance-tests/RTEvent/Roundtrip/Makefile index 14c05f054e2..afd81bb2bb4 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/Roundtrip/Makefile +++ b/TAO/orbsvcs/performance-tests/RTEvent/Roundtrip/Makefile @@ -9,7 +9,7 @@ LDLIBS = -lTAO_RTEC_Perf \ -lTAO_Svc_Utils \ -lTAO_IORTable \ -lTAO_RTPortableServer \ - -lTAO_PortableServer \ + -lTAO_PortableServer -lTAO_Valuetype -lTAO_ObjRefTemplate -lTAO_IORInterceptor \ -lTAO_RTCORBA \ -lTAO_Strategies \ -lTAO_Messaging \ diff --git a/TAO/orbsvcs/performance-tests/RTEvent/TCP_Baseline/Makefile b/TAO/orbsvcs/performance-tests/RTEvent/TCP_Baseline/Makefile index 099ce29d4c1..b530c6e7707 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/TCP_Baseline/Makefile +++ b/TAO/orbsvcs/performance-tests/RTEvent/TCP_Baseline/Makefile @@ -9,7 +9,7 @@ LDLIBS = -lTAO_RTEC_Perf \ -lTAO_Svc_Utils \ -lTAO_IORTable \ -lTAO_RTPortableServer \ - -lTAO_PortableServer \ + -lTAO_PortableServer -lTAO_Valuetype -lTAO_ObjRefTemplate -lTAO_IORInterceptor \ -lTAO_RTCORBA \ -lTAO_Strategies \ -lTAO_Messaging \ diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/Makefile b/TAO/orbsvcs/performance-tests/RTEvent/lib/Makefile index 9100bc8a7fb..c27deffe7a1 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/lib/Makefile +++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/Makefile @@ -19,7 +19,7 @@ LDLIBS = \ -lTAO_Svc_Utils \ -lTAO_IORTable \ -lTAO_RTPortableServer \ - -lTAO_PortableServer \ + -lTAO_PortableServer -lTAO_Valuetype -lTAO_ObjRefTemplate -lTAO_IORInterceptor \ -lTAO_RTCORBA \ -lTAO_Strategies \ -lTAO_Messaging \ diff --git a/TAO/orbsvcs/tests/AVStreams/Modify_QoS/Makefile b/TAO/orbsvcs/tests/AVStreams/Modify_QoS/Makefile index cb19ed27485..e6137f240e4 100644 --- a/TAO/orbsvcs/tests/AVStreams/Modify_QoS/Makefile +++ b/TAO/orbsvcs/tests/AVStreams/Modify_QoS/Makefile @@ -9,7 +9,7 @@ # Local macros #---------------------------------------------------------------------------- -LDLIBS = -lTAO_AV -lTAO_CosProperty -lTAO_CosNaming -lTAO_Svc_Utils -lTAO_IORTable -lTAO_PortableServer -lTAO +LDLIBS = -lTAO_AV -lTAO_CosProperty -lTAO_CosNaming -lTAO_Svc_Utils -lTAO_IORTable -lTAO_PortableServer -lTAO_Valuetype -lTAO_ObjRefTemplate -lTAO_IORInterceptor -lTAO RECEIVER_OBJS = receiver.o SENDER_OBJS = sender.o diff --git a/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/Makefile b/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/Makefile index a0d4ef3c63e..cb3bf0f5994 100644 --- a/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/Makefile +++ b/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/Makefile @@ -9,7 +9,7 @@ # Local macros #---------------------------------------------------------------------------- -LDLIBS = -lTAO_AV -lTAO_CosProperty -lTAO_CosNaming -lTAO_Svc_Utils -lTAO_IORTable -lTAO_PortableServer -lTAO +LDLIBS = -lTAO_AV -lTAO_CosProperty -lTAO_CosNaming -lTAO_Svc_Utils -lTAO_IORTable -lTAO_PortableServer -lTAO_Valuetype -lTAO_ObjRefTemplate -lTAO_IORInterceptor -lTAO RECEIVER_OBJS = receiver.o SENDER_OBJS = sender.o diff --git a/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/Makefile b/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/Makefile index b6f1eaa3591..db2069c8d34 100644 --- a/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/Makefile +++ b/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/Makefile @@ -14,8 +14,8 @@ SHLIB = $(LIBNAME).$(SOEXT) VPATH=. -LDLIBS += -lTAO_AV -lTAO_CosProperty -lTAO_CosNaming -lTAO_Svc_Utils -lTAO_PortableServer -lTAO -lACE -ACE_SHLIBS += -lTAO_AV -lTAO_CosProperty -lTAO_CosNaming -lTAO_Svc_Utils -lTAO_PortableServer -lTAO -lACE +LDLIBS += -lTAO_AV -lTAO_CosProperty -lTAO_CosNaming -lTAO_Svc_Utils -lTAO_PortableServer -lTAO_Valuetype -lTAO_ObjRefTemplate -lTAO_IORInterceptor -lTAO -lACE +ACE_SHLIBS += -lTAO_AV -lTAO_CosProperty -lTAO_CosNaming -lTAO_Svc_Utils -lTAO_PortableServer -lTAO_Valuetype -lTAO_ObjRefTemplate -lTAO_IORInterceptor -lTAO -lACE #---------------------------------------------------------------------------- # Include macros and targets diff --git a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/Makefile b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/Makefile index c51ff1ea366..bbe20749957 100644 --- a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/Makefile +++ b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/Makefile @@ -1,6 +1,6 @@ #---------------------------------------------------------------------------- # Makefile,v 1.1 2001/04/20 21:41:17 yamuna Exp -# +# $Id$ # Top-level Makefile for Pluggable testing of AVStreams of TAO. # #---------------------------------------------------------------------------- @@ -9,7 +9,7 @@ # Local macros #---------------------------------------------------------------------------- -LDLIBS = -lTAO_AV -lTAO_CosProperty -lTAO_CosNaming -lTAO_Svc_Utils -lTAO_IORTable -lTAO_PortableServer -lTAO -lACE_QoS +LDLIBS = -lTAO_AV -lTAO_CosProperty -lTAO_CosNaming -lTAO_Svc_Utils -lTAO_IORTable -lTAO_PortableServer -lTAO_Valuetype -lTAO_ObjRefTemplate -lTAO_IORInterceptor -lTAO -lACE_QoS RECEIVER_OBJS = receiver.o SENDER_OBJS = sender.o diff --git a/TAO/orbsvcs/tests/CosEvent/lib/Makefile b/TAO/orbsvcs/tests/CosEvent/lib/Makefile index 76da766ec9d..84fe0a3d209 100644 --- a/TAO/orbsvcs/tests/CosEvent/lib/Makefile +++ b/TAO/orbsvcs/tests/CosEvent/lib/Makefile @@ -19,8 +19,8 @@ ifeq (NativeCosEvent,$(findstring NativeCosEvent,$(TAO_ORBSVCS))) SHLIB = $(SHLIB2) endif # NativeCosEvent -ACE_SHLIBS = -lTAO_CosEvent -lTAO_CosNaming -lTAO_Svc_Utils -lTAO_IORTable -lTAO_PortableServer -lTAO -lACE -LDLIBS = -lTAO_CosEvent -lTAO_CosNaming -lTAO_Svc_Utils -lTAO_IORTable -lTAO_PortableServer -lTAO +ACE_SHLIBS = -lTAO_CosEvent -lTAO_CosNaming -lTAO_Svc_Utils -lTAO_IORTable -lTAO_PortableServer -lTAO_Valuetype -lTAO_ObjRefTemplate -lTAO_IORInterceptor -lTAO -lACE +LDLIBS = -lTAO_CosEvent -lTAO_CosNaming -lTAO_Svc_Utils -lTAO_IORTable -lTAO_PortableServer -lTAO_Valuetype -lTAO_ObjRefTemplate -lTAO_IORInterceptor -lTAO SRCS = Counting_Consumer Counting_Supplier FILES = $(SRCS) diff --git a/TAO/orbsvcs/tests/Event/lib/Makefile b/TAO/orbsvcs/tests/Event/lib/Makefile index ecf7de23d8b..a381b37b58e 100644 --- a/TAO/orbsvcs/tests/Event/lib/Makefile +++ b/TAO/orbsvcs/tests/Event/lib/Makefile @@ -19,8 +19,8 @@ ifeq (RTEvent,$(findstring RTEvent,$(TAO_ORBSVCS))) SHLIB = $(SHLIB2) endif # RTEvent -ACE_SHLIBS = -lTAO_RTEvent -lTAO_CosNaming -lTAO_PortableServer -lTAO -lACE -LDLIBS = -lTAO_RTEvent -lTAO_CosNaming -lTAO_PortableServer -lTAO +ACE_SHLIBS = -lTAO_RTEvent -lTAO_CosNaming -lTAO_PortableServer -lTAO_Valuetype -lTAO_ObjRefTemplate -lTAO_IORInterceptor -lTAO -lACE +LDLIBS = -lTAO_RTEvent -lTAO_CosNaming -lTAO_PortableServer -lTAO_Valuetype -lTAO_ObjRefTemplate -lTAO_IORInterceptor -lTAO SRCS = Driver Consumer Supplier Counting_Consumer Counting_Supplier FILES = $(SRCS) diff --git a/TAO/orbsvcs/tests/FaultTolerance/IOGRManipulation/Makefile b/TAO/orbsvcs/tests/FaultTolerance/IOGRManipulation/Makefile index 217a6a3cb76..152ebb06a91 100644 --- a/TAO/orbsvcs/tests/FaultTolerance/IOGRManipulation/Makefile +++ b/TAO/orbsvcs/tests/FaultTolerance/IOGRManipulation/Makefile @@ -12,7 +12,7 @@ ifndef TAO_ROOT TAO_ROOT = $(ACE_ROOT)/TAO endif # ! TAO_ROOT -LDLIBS = -lTAO_FTORB -lTAO_IORManip -lTAO_PortableServer -lTAO +LDLIBS = -lTAO_FTORB -lTAO_IORManip -lTAO_PortableServer -lTAO_Valuetype -lTAO_ObjRefTemplate -lTAO_IORInterceptor -lTAO PROG_SRCS = IOGRTest.cpp diff --git a/TAO/orbsvcs/tests/IOR_MCast/Makefile b/TAO/orbsvcs/tests/IOR_MCast/Makefile index 8b60e4c088c..b73b2615f34 100644 --- a/TAO/orbsvcs/tests/IOR_MCast/Makefile +++ b/TAO/orbsvcs/tests/IOR_MCast/Makefile @@ -15,7 +15,7 @@ endif # ! TAO_ROOT IDL_FILES = MCast IDL_SRC = MCastC MCastS -LDLIBS = -lTAO_CosNaming -lTAO_Svc_Utils -lTAO_IORTable -lTAO_PortableServer -lTAO -lACE +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 diff --git a/TAO/orbsvcs/tests/Log/Basic_Log_Test/Makefile b/TAO/orbsvcs/tests/Log/Basic_Log_Test/Makefile index e7c62159938..3d4307ab5ea 100644 --- a/TAO/orbsvcs/tests/Log/Basic_Log_Test/Makefile +++ b/TAO/orbsvcs/tests/Log/Basic_Log_Test/Makefile @@ -12,7 +12,7 @@ ifndef TAO_ROOT TAO_ROOT = $(ACE_ROOT)/TAO endif -LDLIBS = -lTAO -lTAO_PortableServer -lTAO_DsLogAdmin -lTAO_CosNaming -lTAO_DynamicAny +LDLIBS = -lTAO -lTAO_PortableServer -lTAO_Valuetype -lTAO_ObjRefTemplate -lTAO_IORInterceptor -lTAO_DsLogAdmin -lTAO_CosNaming -lTAO_DynamicAny PROG_SRCS = \ Basic_Log_Test.cpp \ diff --git a/TAO/orbsvcs/tests/Notify/lib/Makefile b/TAO/orbsvcs/tests/Notify/lib/Makefile index 4cd4ae23d7e..c580ee182d6 100644 --- a/TAO/orbsvcs/tests/Notify/lib/Makefile +++ b/TAO/orbsvcs/tests/Notify/lib/Makefile @@ -88,7 +88,7 @@ endif LDFLAGS += -L$(TAO_ROOT)/tao/PortableServer -L$(TAO_ROOT)/tao/DynamicAny -L$(TAO_ROOT)/tao/IORTable -L$(TAO_ROOT)/orbsvcs/orbsvcs/ETCL -L$(TAO_ROOT)/orbsvcs/orbsvcs -L$(TAO_ROOT)/tao -L$(ACE_ROOT)/ace TAO_IDLFLAGS += -I$(TAO_ROOT) -I$(TAO_ROOT)/orbsvcs -Ge 1 -Sc -ACE_SHLIBS = -lTAO_CosNotification -lTAO_ETCL -lTAO_CosNaming -lTAO_Svc_Utils -lTAO_IORTable -lTAO_DynamicAny -lTAO_PortableServer -lTAO $(ACELIB) +ACE_SHLIBS = -lTAO_CosNotification -lTAO_ETCL -lTAO_CosNaming -lTAO_Svc_Utils -lTAO_IORTable -lTAO_DynamicAny -lTAO_PortableServer -lTAO_Valuetype -lTAO_ObjRefTemplate -lTAO_IORInterceptor -lTAO $(ACELIB) #---------------------------------------------------------------------------- # Local targets diff --git a/TAO/orbsvcs/tests/Sched/Makefile b/TAO/orbsvcs/tests/Sched/Makefile index 9126c3bf07d..c783f3a3e25 100644 --- a/TAO/orbsvcs/tests/Sched/Makefile +++ b/TAO/orbsvcs/tests/Sched/Makefile @@ -5,7 +5,7 @@ ifndef TAO_ROOT endif SRC = $(BIN:%=%$(VAR).cpp) -LDLIBS = -lTAO_RTSched -lTAO_CosNaming -lTAO_Svc_Utils -lTAO_IORTable -lTAO_PortableServer -lTAO +LDLIBS = -lTAO_RTSched -lTAO_CosNaming -lTAO_Svc_Utils -lTAO_IORTable -lTAO_PortableServer -lTAO_Valuetype -lTAO_ObjRefTemplate -lTAO_IORInterceptor -lTAO CPPFLAGS += -I$(TAO_ROOT)/orbsvcs/orbsvcs/Sched \ -I$(TAO_ROOT)/orbsvcs \ diff --git a/TAO/orbsvcs/tests/Security/Crash_Test/Makefile b/TAO/orbsvcs/tests/Security/Crash_Test/Makefile index 824c097f2a9..aa48abd94ad 100644 --- a/TAO/orbsvcs/tests/Security/Crash_Test/Makefile +++ b/TAO/orbsvcs/tests/Security/Crash_Test/Makefile @@ -54,7 +54,7 @@ CLNT_LIBS += -lTAO_SSLIOP SRVR_LIBS += -lTAO_SSLIOP endif # static_libs_only = 1 -CLNT_LIBS += -lTAO_PortableServer $(TAO_CLNT_LIBS) +CLNT_LIBS += -lTAO_PortableServer -lTAO_Valuetype -lTAO_ObjRefTemplate -lTAO_IORInterceptor $(TAO_CLNT_LIBS) SRVR_LIBS += $(TAO_SRVR_LIBS) #---------------------------------------------------------------------------- diff --git a/TAO/orbsvcs/tests/Security/SecurityLevel1/Makefile b/TAO/orbsvcs/tests/Security/SecurityLevel1/Makefile index 8c6056247be..1157cd73946 100644 --- a/TAO/orbsvcs/tests/Security/SecurityLevel1/Makefile +++ b/TAO/orbsvcs/tests/Security/SecurityLevel1/Makefile @@ -61,7 +61,7 @@ CLNT_LIBS += -lTAO_SSLIOP SRVR_LIBS += -lTAO_SSLIOP endif # static_libs_only = 1 -CLNT_LIBS += -lTAO_PortableServer $(TAO_CLNT_LIBS) +CLNT_LIBS += -lTAO_PortableServer -lTAO_Valuetype -lTAO_ObjRefTemplate -lTAO_IORInterceptor $(TAO_CLNT_LIBS) SRVR_LIBS += -lTAO_Security $(TAO_SRVR_LIBS) -lssl -lcrypto #---------------------------------------------------------------------------- diff --git a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Makefile b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Makefile index 101a6619822..d9d86bf5498 100644 --- a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Makefile +++ b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Makefile @@ -12,7 +12,7 @@ ifndef TAO_ROOT TAO_ROOT = $(ACE_ROOT)/TAO endif # ! TAO_ROOT -LDLIBS = -lTAO_Strategies -lTAO_PortableServer -lTAO +LDLIBS = -lTAO_Strategies -lTAO_PortableServer -lTAO_Valuetype -lTAO_ObjRefTemplate -lTAO_IORInterceptor -lTAO IDL_FILES = cubit IDL_SRC = cubitC.cpp cubitS.cpp diff --git a/TAO/performance-tests/Cubit/TAO/MT_Cubit/Makefile b/TAO/performance-tests/Cubit/TAO/MT_Cubit/Makefile index 1c1fd961e3f..34fe164e1ce 100644 --- a/TAO/performance-tests/Cubit/TAO/MT_Cubit/Makefile +++ b/TAO/performance-tests/Cubit/TAO/MT_Cubit/Makefile @@ -12,7 +12,7 @@ ifndef TAO_ROOT TAO_ROOT = $(ACE_ROOT)/TAO endif # ! TAO_ROOT -LDLIBS = -lTAO_Strategies -lTAO_PortableServer -lTAO $(MATHLIB) +LDLIBS = -lTAO_Strategies -lTAO_PortableServer -lTAO_Valuetype -lTAO_ObjRefTemplate -lTAO_IORInterceptor -lTAO $(MATHLIB) IDL_FILES = cubit IDL_SRC = cubitC.cpp cubitS.cpp diff --git a/TAO/performance-tests/POA/Demux/Makefile b/TAO/performance-tests/POA/Demux/Makefile index 695eb80de33..4cc0e801f41 100644 --- a/TAO/performance-tests/POA/Demux/Makefile +++ b/TAO/performance-tests/POA/Demux/Makefile @@ -15,7 +15,7 @@ endif # ! TAO_ROOT #override TAO_IDLFLAGS += \ # -H linear_search \ -LDLIBS = -lTAO_CosNaming -lTAO_Svc_Utils -lTAO_IORTable -lTAO_PortableServer -lTAO +LDLIBS = -lTAO_CosNaming -lTAO_Svc_Utils -lTAO_IORTable -lTAO_PortableServer -lTAO_Valuetype -lTAO_ObjRefTemplate -lTAO_IORInterceptor -lTAO LDFLAGS += -L$(TAO_ROOT)/tao IDL_FILES = demux_test diff --git a/TAO/performance-tests/POA/Object_Creation_And_Registration/Makefile b/TAO/performance-tests/POA/Object_Creation_And_Registration/Makefile index d175ce5d967..c84fd3812f1 100644 --- a/TAO/performance-tests/POA/Object_Creation_And_Registration/Makefile +++ b/TAO/performance-tests/POA/Object_Creation_And_Registration/Makefile @@ -12,7 +12,7 @@ ifndef TAO_ROOT TAO_ROOT = $(ACE_ROOT)/TAO endif # ! TAO_ROOT -LDLIBS = -lTAO_PortableServer -lTAO +LDLIBS = -lTAO_PortableServer -lTAO_Valuetype -lTAO_ObjRefTemplate -lTAO_IORInterceptor -lTAO IDL_FILES = test IDL_SRC = testC.cpp testS.cpp diff --git a/TAO/performance-tests/RTCorba/Multiple_Endpoints/Common/Makefile b/TAO/performance-tests/RTCorba/Multiple_Endpoints/Common/Makefile index 65b8103f58c..9c64e72b052 100644 --- a/TAO/performance-tests/RTCorba/Multiple_Endpoints/Common/Makefile +++ b/TAO/performance-tests/RTCorba/Multiple_Endpoints/Common/Makefile @@ -25,8 +25,8 @@ SHLIB = libRTCORBA_Common.$(SOEXT) IDL_FILES = test IDL_SRC = testC testS -ACE_SHLIBS = -lTAO_PortableServer -lTAO -lACE -LDLIBS = -lTAO_PortableServer -lTAO +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) test_i LSRC = $(addsuffix .cpp,$(IDL_SRC) test_i) diff --git a/TAO/tao/Domain/Makefile b/TAO/tao/Domain/Makefile index a3b4ad5d614..b54c9932219 100644 --- a/TAO/tao/Domain/Makefile +++ b/TAO/tao/Domain/Makefile @@ -12,7 +12,7 @@ LIBNAME = libTAO_Domain LIB = $(LIBNAME).a SHLIB = $(LIBNAME).$(SOEXT) -ACE_SHLIBS = -lTAO_IFR_Client -lTAO_PortableServer -lTAO -lACE +ACE_SHLIBS = -lTAO_IFR_Client -lTAO_PortableServer -lTAO_Valuetype -lTAO_ObjRefTemplate -lTAO_IORInterceptor -lTAO -lACE CPP_SRCS += DomainS diff --git a/TAO/tao/DynamicInterface/Makefile b/TAO/tao/DynamicInterface/Makefile index aa70f016351..0645d6fac3b 100644 --- a/TAO/tao/DynamicInterface/Makefile +++ b/TAO/tao/DynamicInterface/Makefile @@ -12,7 +12,7 @@ LIBNAME = libTAO_DynamicInterface LIB = $(LIBNAME).a SHLIB = $(LIBNAME).$(SOEXT) -ACE_SHLIBS = -lTAO_PortableServer -lTAO -lACE +ACE_SHLIBS = -lTAO_PortableServer -lTAO_Valuetype -lTAO_ObjRefTemplate -lTAO_IORInterceptor -lTAO -lACE #---------------------------------------------------------------------------- # Include macros and targets diff --git a/TAO/tao/Messaging/Makefile b/TAO/tao/Messaging/Makefile index d6fa9a94259..8269cd2a8ed 100644 --- a/TAO/tao/Messaging/Makefile +++ b/TAO/tao/Messaging/Makefile @@ -12,7 +12,7 @@ LIBNAME = libTAO_Messaging LIB = $(LIBNAME).a SHLIB = $(LIBNAME).$(SOEXT) -ACE_SHLIBS = -lTAO_PortableServer -lTAO_ObjRefTemplate \ +ACE_SHLIBS = -lTAO_PortableServer -lTAO_Valuetype -lTAO_ObjRefTemplate -lTAO_IORInterceptor -lTAO_ObjRefTemplate \ -lTAO_Valuetype -lTAO -lACE CPP_SRCS += \ diff --git a/TAO/tao/RTPortableServer/Makefile b/TAO/tao/RTPortableServer/Makefile index 93a728adf26..51dae7853c2 100644 --- a/TAO/tao/RTPortableServer/Makefile +++ b/TAO/tao/RTPortableServer/Makefile @@ -12,7 +12,7 @@ LIBNAME = libTAO_RTPortableServer LIB = $(LIBNAME).a SHLIB = $(LIBNAME).$(SOEXT) -ACE_SHLIBS = -lTAO -lACE -lTAO_RTCORBA -lTAO_PortableServer -lTAO_Valuetype +ACE_SHLIBS = -lTAO -lACE -lTAO_RTCORBA -lTAO_PortableServer -lTAO_Valuetype -lTAO_ObjRefTemplate -lTAO_IORInterceptor -lTAO_Valuetype #---------------------------------------------------------------------------- # Include macros and targets diff --git a/TAO/tao/Utils/Makefile b/TAO/tao/Utils/Makefile index 50ebd17c1d9..f5f204cda9d 100644 --- a/TAO/tao/Utils/Makefile +++ b/TAO/tao/Utils/Makefile @@ -12,7 +12,7 @@ LIBNAME = libTAO_Utils LIB = $(LIBNAME).a SHLIB = $(LIBNAME).$(SOEXT) -ACE_SHLIBS = -lTAO_PortableServer -lTAO -lACE +ACE_SHLIBS = -lTAO_PortableServer -lTAO_Valuetype -lTAO_ObjRefTemplate -lTAO_IORInterceptor -lTAO -lACE CPP_SRCS += \ ORB_Destroyer \ diff --git a/TAO/tests/Client_Leaks/Makefile b/TAO/tests/Client_Leaks/Makefile index 7b64f4fa7f1..13f84e8ce8e 100644 --- a/TAO/tests/Client_Leaks/Makefile +++ b/TAO/tests/Client_Leaks/Makefile @@ -35,7 +35,7 @@ include $(ACE_ROOT)/include/makeinclude/rules.nonested.GNU include $(ACE_ROOT)/include/makeinclude/rules.local.GNU include $(TAO_ROOT)/taoconfig.mk -LDLIBS = -lTAO_PortableServer -lTAO +LDLIBS = -lTAO_PortableServer -lTAO_Valuetype -lTAO_ObjRefTemplate -lTAO_IORInterceptor -lTAO #---------------------------------------------------------------------------- # Local targets diff --git a/TAO/tests/Crashed_Callback/Makefile b/TAO/tests/Crashed_Callback/Makefile index a108c38e865..9cdb7379526 100644 --- a/TAO/tests/Crashed_Callback/Makefile +++ b/TAO/tests/Crashed_Callback/Makefile @@ -39,7 +39,7 @@ include $(ACE_ROOT)/include/makeinclude/rules.nonested.GNU include $(ACE_ROOT)/include/makeinclude/rules.local.GNU include $(TAO_ROOT)/taoconfig.mk -LDLIBS = -lTAO_PortableServer -lTAO +LDLIBS = -lTAO_PortableServer -lTAO_Valuetype -lTAO_ObjRefTemplate -lTAO_IORInterceptor -lTAO #---------------------------------------------------------------------------- # Local targets diff --git a/TAO/tests/IDL_Test/Makefile b/TAO/tests/IDL_Test/Makefile index cd0da5194f3..d06109ba746 100644 --- a/TAO/tests/IDL_Test/Makefile +++ b/TAO/tests/IDL_Test/Makefile @@ -12,7 +12,7 @@ ifndef TAO_ROOT TAO_ROOT = $(ACE_ROOT)/TAO endif # ! TAO_ROOT -LDLIBS += -lTAO_PortableServer -lTAO +LDLIBS += -lTAO_PortableServer -lTAO_Valuetype -lTAO_ObjRefTemplate -lTAO_IORInterceptor -lTAO LDFLAGS += -L$(ACE_ROOT)/bin IDL_ALWAYS = anonymous \ diff --git a/TAO/tests/Object_Loader/Makefile b/TAO/tests/Object_Loader/Makefile index 51398ea1465..740bc5f6743 100644 --- a/TAO/tests/Object_Loader/Makefile +++ b/TAO/tests/Object_Loader/Makefile @@ -25,8 +25,8 @@ LSRC= \ $(IDL_SRC) \ Test_i.cpp \ Loader.cpp -ACE_SHLIBS = -lTAO_PortableServer -lTAO -lACE -LDLIBS = -lTAO_PortableServer -lTAO +ACE_SHLIBS = -lTAO_PortableServer -lTAO_Valuetype -lTAO_ObjRefTemplate -lTAO_IORInterceptor -lTAO -lACE +LDLIBS = -lTAO_PortableServer -lTAO_Valuetype -lTAO_ObjRefTemplate -lTAO_IORInterceptor -lTAO DRIVER_OBJS = driver.o TestC.o PSRC=driver.cpp diff --git a/TAO/tests/Smart_Proxies/Makefile b/TAO/tests/Smart_Proxies/Makefile index 7f04eeac38f..e040633071e 100644 --- a/TAO/tests/Smart_Proxies/Makefile +++ b/TAO/tests/Smart_Proxies/Makefile @@ -12,7 +12,7 @@ ifndef TAO_ROOT TAO_ROOT = $(ACE_ROOT)/TAO endif # ! TAO_ROOT -LDLIBS = -lTAO_PortableServer -lTAO_SmartProxies -lTAO +LDLIBS = -lTAO_PortableServer -lTAO_Valuetype -lTAO_ObjRefTemplate -lTAO_IORInterceptor -lTAO_SmartProxies -lTAO LDFLAGS += -L$(ACE_ROOT)/bin IDL_FILES = test diff --git a/TAO/utils/nslist/Makefile b/TAO/utils/nslist/Makefile index 2b2dade6f40..d9eba55c301 100644 --- a/TAO/utils/nslist/Makefile +++ b/TAO/utils/nslist/Makefile @@ -13,7 +13,7 @@ ifndef TAO_ROOT endif # ! TAO_ROOT CPPFLAGS+= -I$(TAO_ROOT)/orbsvcs -LDLIBS = -lTAO_CosNaming -lTAO_Svc_Utils -lTAO_IORTable -lTAO_PortableServer -lTAO +LDLIBS = -lTAO_CosNaming -lTAO_Svc_Utils -lTAO_IORTable -lTAO_PortableServer -lTAO_Valuetype -lTAO_ObjRefTemplate -lTAO_IORInterceptor -lTAO BIN2 = nslist nsadd nsdel diff --git a/TAO/utils/wxNamingViewer/Makefile b/TAO/utils/wxNamingViewer/Makefile index 048d97417df..d0d73d0957d 100644 --- a/TAO/utils/wxNamingViewer/Makefile +++ b/TAO/utils/wxNamingViewer/Makefile @@ -12,7 +12,7 @@ endif # ! TAO_ROOT CPPFLAGS += -I$(TAO_ROOT)/orbsvcs LDFLAGS += -L$(TAO_ROOT)/orbsvcs -LDLIBS = -lTAO_CosNaming -lTAO_Svc_Utils -lTAO_PortableServer -lTAO +LDLIBS = -lTAO_CosNaming -lTAO_Svc_Utils -lTAO_PortableServer -lTAO_Valuetype -lTAO_ObjRefTemplate -lTAO_IORInterceptor -lTAO BIN_UNCHECKED = wxNamingViewer |