diff options
| author | bala <balanatarajan@users.noreply.github.com> | 2003-05-11 14:32:30 +0000 |
|---|---|---|
| committer | bala <balanatarajan@users.noreply.github.com> | 2003-05-11 14:32:30 +0000 |
| commit | f4d68d2b25807b70b70386234ee358d160acc006 (patch) | |
| tree | 5c15635364241ed51bb6f9decadc29ed2aeed8a7 | |
| parent | eee40f5c4f8130c3ef8b458e8a0b842c3d3089ca (diff) | |
| download | ATCD-f4d68d2b25807b70b70386234ee358d160acc006.tar.gz | |
ChangeLogTag:Sun May 11 09:28:39 2003 Balachandran Natarajan <bala@dre.vanderbilt.edu>
20 files changed, 42 insertions, 21 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index 19acff564b4..8e3db89c79c 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,26 @@ +Sun May 11 09:28:39 2003 Balachandran Natarajan <bala@dre.vanderbilt.edu> + + * orbsvcs/LoadBalancer/Makefile.LoadManager: + * orbsvcs/LoadBalancer/Makefile.LoadMonitor: + * orbsvcs/Logging_Service/Event_Logging_Service/Makefile: + * orbsvcs/Logging_Service/Notify_Logging_Service/Makefile: + * orbsvcs/Logging_Service/RTEvent_Logging_Service/Makefile: + * orbsvcs/Trading_Service/Makefile: + * orbsvcs/tests/Concurrency/Makefile: + * orbsvcs/tests/CosEvent/Basic/Makefile: + * orbsvcs/tests/EC_Custom_Marshal/Makefile: + * orbsvcs/tests/EC_MT_Mcast/Makefile: + * orbsvcs/tests/EC_Mcast/Makefile: + * orbsvcs/tests/EC_Multiple/Makefile: + * orbsvcs/tests/EC_Throughput/Makefile: + * orbsvcs/tests/Event/Basic/Makefile: + * orbsvcs/tests/Event/Performance/Makefile: + * orbsvcs/tests/Property/Makefile: + * orbsvcs/tests/Sched_Conf/Makefile: + * orbsvcs/tests/Simple_Naming/Makefile: + * orbsvcs/tests/Time/Makefile: Another set fixes to get static + builds linking fine. + Sun May 11 09:26:29 2003 Balachandran Natarajan <bala@dre.vanderbilt.edu> * tests/Bug_1482_Regression/Makefile: Updated dependencies once diff --git a/TAO/orbsvcs/LoadBalancer/Makefile.LoadManager b/TAO/orbsvcs/LoadBalancer/Makefile.LoadManager index 06645644057..e2d851bc2b7 100644 --- a/TAO/orbsvcs/LoadBalancer/Makefile.LoadManager +++ b/TAO/orbsvcs/LoadBalancer/Makefile.LoadManager @@ -19,8 +19,7 @@ LDLIBS = \ -lTAO_PortableGroup \ -lTAO_CosNaming \ -lTAO_Messaging \ - -lTAO_PortableServer \ - -lTAO + $(TAO_SRVR_LIBS) BIN = LoadManager diff --git a/TAO/orbsvcs/LoadBalancer/Makefile.LoadMonitor b/TAO/orbsvcs/LoadBalancer/Makefile.LoadMonitor index 4e241dfee38..bb77a06edab 100644 --- a/TAO/orbsvcs/LoadBalancer/Makefile.LoadMonitor +++ b/TAO/orbsvcs/LoadBalancer/Makefile.LoadMonitor @@ -23,8 +23,7 @@ LDLIBS = \ -lTAO_PortableGroup \ -lTAO_CosNaming \ -lTAO_Messaging \ - -lTAO_PortableServer \ - -lTAO + $(TAO_SRVR_LIBS) BIN = LoadMonitor diff --git a/TAO/orbsvcs/Logging_Service/Event_Logging_Service/Makefile b/TAO/orbsvcs/Logging_Service/Event_Logging_Service/Makefile index c6288071035..e301ddfd657 100755 --- a/TAO/orbsvcs/Logging_Service/Event_Logging_Service/Makefile +++ b/TAO/orbsvcs/Logging_Service/Event_Logging_Service/Makefile @@ -10,7 +10,7 @@ LSRC = Event_Logging_Service.cpp LOG_OBJS=$(LSRC:.cpp=.o) -LDLIBS = -lTAO_DsEventLogAdmin -lTAO_DsLogAdmin -lTAO_CosEvent -lTAO_ETCL -lTAO_CosNaming -lTAO_IORTable -lTAO_DynamicAny -lTAO_Messaging -lTAO_PortableServer -lTAO -lACE +LDLIBS = -lTAO_DsEventLogAdmin -lTAO_DsLogAdmin -lTAO_CosEvent -lTAO_ETCL -lTAO_CosNaming -lTAO_IORTable -lTAO_DynamicAny -lTAO_Messaging $(TAO_SRVR_LIBS) -lACE BIN2 = Event_Logging_Service diff --git a/TAO/orbsvcs/Logging_Service/Notify_Logging_Service/Makefile b/TAO/orbsvcs/Logging_Service/Notify_Logging_Service/Makefile index 9a236005ef6..8c1541c6e03 100755 --- a/TAO/orbsvcs/Logging_Service/Notify_Logging_Service/Makefile +++ b/TAO/orbsvcs/Logging_Service/Notify_Logging_Service/Makefile @@ -19,7 +19,7 @@ CLIENT_OBJS = \ Notify_Logging_Service.o \ Notify_Logging_Server.o -LDLIBS = -lTAO_DsNotifyLogAdmin -lTAO_DsEventLogAdmin -lTAO_DsLogAdmin -lTAO_CosNotification -lTAO_ETCL -lTAO_CosNaming -lTAO_IORTable -lTAO_DynamicAny -lTAO_Messaging -lTAO_PortableServer -lTAO -lACE +LDLIBS = -lTAO_DsNotifyLogAdmin -lTAO_DsEventLogAdmin -lTAO_DsLogAdmin -lTAO_CosNotification -lTAO_ETCL -lTAO_CosNaming -lTAO_IORTable -lTAO_DynamicAny -lTAO_Messaging $(TAO_SRVR_LIBS) -lACE BIN2 = Notify_Logging_Service diff --git a/TAO/orbsvcs/Logging_Service/RTEvent_Logging_Service/Makefile b/TAO/orbsvcs/Logging_Service/RTEvent_Logging_Service/Makefile index f772e634e0e..fbd7f5a0645 100755 --- a/TAO/orbsvcs/Logging_Service/RTEvent_Logging_Service/Makefile +++ b/TAO/orbsvcs/Logging_Service/RTEvent_Logging_Service/Makefile @@ -10,7 +10,7 @@ LSRC = RTEvent_Logging_Service.cpp LOG_OBJS=$(LSRC:.cpp=.o) -LDLIBS = -lTAO_RTEventLogAdmin -lTAO_DsLogAdmin -lTAO_RTOLDEvent -lTAO_RTEvent -lTAO_RTSched -lTAO_ETCL -lTAO_CosNaming -lTAO_Svc_Utils -lTAO_IORTable -lTAO_DynamicAny -lTAO_Messaging -lTAO_PortableServer -lTAO -lACE +LDLIBS = -lTAO_RTEventLogAdmin -lTAO_DsLogAdmin -lTAO_RTOLDEvent -lTAO_RTEvent -lTAO_RTSched -lTAO_ETCL -lTAO_CosNaming -lTAO_Svc_Utils -lTAO_IORTable -lTAO_DynamicAny -lTAO_Messaging $(TAO_SRVR_LIBS) -lACE BIN2 = RTEvent_Logging_Service diff --git a/TAO/orbsvcs/Trading_Service/Makefile b/TAO/orbsvcs/Trading_Service/Makefile index 2243f4a4e83..3fc632782bd 100644 --- a/TAO/orbsvcs/Trading_Service/Makefile +++ b/TAO/orbsvcs/Trading_Service/Makefile @@ -10,7 +10,7 @@ ifndef TAO_ROOT TAO_ROOT = $(ACE_ROOT)/TAO endif -LDLIBS = -lTAO_CosTrading -lTAO_CosNaming -lTAO_Svc_Utils -lTAO_IORTable -lTAO_DynamicAny -lTAO_PortableServer -lTAO +LDLIBS = -lTAO_CosTrading -lTAO_CosNaming -lTAO_Svc_Utils -lTAO_IORTable -lTAO_DynamicAny $(TAO_SRVR_LIBS) SRC = Trading_Server.cpp Trading_Service.cpp diff --git a/TAO/orbsvcs/tests/Concurrency/Makefile b/TAO/orbsvcs/tests/Concurrency/Makefile index 531e8e818e2..c3222d741ea 100644 --- a/TAO/orbsvcs/tests/Concurrency/Makefile +++ b/TAO/orbsvcs/tests/Concurrency/Makefile @@ -14,7 +14,7 @@ ifndef TAO_ROOT TAO_ROOT = $(ACE_ROOT)/TAO endif # ! TAO_ROOT -LDLIBS = -lTAO_CosConcurrency -lTAO_CosNaming -lTAO_Svc_Utils -lTAO_IORTable -lTAO_PortableServer -lTAO +LDLIBS = -lTAO_CosConcurrency -lTAO_CosNaming -lTAO_Svc_Utils -lTAO_IORTable $(TAO_SRVR_LIBS) PROG_SRCS = CC_client.cpp CC_tests.cpp CC_naming_service.cpp \ tmplinst.cpp CC_command.tab.cpp \ diff --git a/TAO/orbsvcs/tests/CosEvent/Basic/Makefile b/TAO/orbsvcs/tests/CosEvent/Basic/Makefile index 679948c963f..2e0ed3b02db 100644 --- a/TAO/orbsvcs/tests/CosEvent/Basic/Makefile +++ b/TAO/orbsvcs/tests/CosEvent/Basic/Makefile @@ -21,7 +21,7 @@ BIN2 = \ Random PSRC=$(addsuffix .cpp,$(BIN2)) -LDLIBS = -lCECTests -lTAO_CosEvent -lTAO_CosNaming -lTAO_Svc_Utils -lTAO_Messaging -lTAO_IORTable -lTAO_PortableServer -lTAO +LDLIBS = -lCECTests -lTAO_CosEvent -lTAO_CosNaming -lTAO_Svc_Utils -lTAO_Messaging -lTAO_IORTable $(TAO_SRVR_LIBS) CPPFLAGS += -I../lib -I$(TAO_ROOT) -I$(TAO_ROOT)/orbsvcs \ $(foreach svc, $(TAO_ORBSVCS), -DTAO_ORBSVCS_HAS_$(svc)) diff --git a/TAO/orbsvcs/tests/EC_Custom_Marshal/Makefile b/TAO/orbsvcs/tests/EC_Custom_Marshal/Makefile index 6c4c3d91044..daf3333e342 100644 --- a/TAO/orbsvcs/tests/EC_Custom_Marshal/Makefile +++ b/TAO/orbsvcs/tests/EC_Custom_Marshal/Makefile @@ -1,6 +1,6 @@ # $Id$ -LDLIBS= -lTAO_RTEvent -lTAO_RTSched -lTAO_CosNaming -lTAO_Svc_Utils -lTAO_IORTable -lTAO_PortableServer -lTAO +LDLIBS= -lTAO_RTEvent -lTAO_RTSched -lTAO_CosNaming -lTAO_Svc_Utils -lTAO_IORTable $(TAO_SRVR_LIBS) ifndef TAO_ROOT TAO_ROOT = $(ACE_ROOT)/TAO diff --git a/TAO/orbsvcs/tests/EC_MT_Mcast/Makefile b/TAO/orbsvcs/tests/EC_MT_Mcast/Makefile index 750d03df361..14861271060 100644 --- a/TAO/orbsvcs/tests/EC_MT_Mcast/Makefile +++ b/TAO/orbsvcs/tests/EC_MT_Mcast/Makefile @@ -15,7 +15,7 @@ endif # ! TAO_ROOT BIN2 = MCast SRC=MCast.cpp Consumer.cpp Supplier.cpp AddrServer.cpp -LDLIBS = -lTAO_RTEvent -lTAO_RTSched -lTAO_CosNaming -lTAO_Svc_Utils -lTAO_IORTable -lTAO_Messaging -lTAO_PortableServer -lTAO +LDLIBS = -lTAO_RTEvent -lTAO_RTSched -lTAO_CosNaming -lTAO_Svc_Utils -lTAO_IORTable -lTAO_Messaging $(TAO_SRVR_LIBS) CPPFLAGS += -I$(TAO_ROOT) -I$(TAO_ROOT)/orbsvcs \ $(foreach svc, $(TAO_ORBSVCS), -DTAO_ORBSVCS_HAS_$(svc)) diff --git a/TAO/orbsvcs/tests/EC_Mcast/Makefile b/TAO/orbsvcs/tests/EC_Mcast/Makefile index 374309a707b..f4977daea8e 100644 --- a/TAO/orbsvcs/tests/EC_Mcast/Makefile +++ b/TAO/orbsvcs/tests/EC_Mcast/Makefile @@ -1,7 +1,7 @@ # $Id$ SRC = $(BIN:%=%$(VAR).cpp) -LDLIBS= -lTAO_RTEvent -lTAO_Svc_Utils -lTAO_Messaging -lTAO_PortableServer -lTAO +LDLIBS= -lTAO_RTEvent -lTAO_Svc_Utils -lTAO_Messaging $(TAO_SRVR_LIBS) ifndef TAO_ROOT TAO_ROOT = $(ACE_ROOT)/TAO diff --git a/TAO/orbsvcs/tests/EC_Multiple/Makefile b/TAO/orbsvcs/tests/EC_Multiple/Makefile index 70571f9b8ce..da1779a0e14 100644 --- a/TAO/orbsvcs/tests/EC_Multiple/Makefile +++ b/TAO/orbsvcs/tests/EC_Multiple/Makefile @@ -1,7 +1,7 @@ # $Id$ SRC = $(BIN:%=%$(VAR).cpp) -LDLIBS= -lTAO_RTOLDEvent -lTAO_RTSchedEvent -lTAO_RTSched -lTAO_RTEvent -lTAO_CosNaming -lTAO_Svc_Utils -lTAO_IORTable -lTAO_PortableServer -lTAO +LDLIBS= -lTAO_RTOLDEvent -lTAO_RTSchedEvent -lTAO_RTSched -lTAO_RTEvent -lTAO_CosNaming -lTAO_Svc_Utils -lTAO_IORTable $(TAO_SRVR_LIBS) ifndef TAO_ROOT TAO_ROOT = $(ACE_ROOT)/TAO diff --git a/TAO/orbsvcs/tests/EC_Throughput/Makefile b/TAO/orbsvcs/tests/EC_Throughput/Makefile index e645d73541c..44f4f5c63d1 100644 --- a/TAO/orbsvcs/tests/EC_Throughput/Makefile +++ b/TAO/orbsvcs/tests/EC_Throughput/Makefile @@ -1,6 +1,6 @@ # $Id$ -LDLIBS = -lTAO_RTOLDEvent -lTAO_RTSched -lTAO_RTEvent -lTAO_CosNaming -lTAO_Svc_Utils -lTAO_IORTable -lTAO_Messaging -lTAO_PortableServer -lTAO +LDLIBS = -lTAO_RTOLDEvent -lTAO_RTSched -lTAO_RTEvent -lTAO_CosNaming -lTAO_Svc_Utils -lTAO_IORTable -lTAO_Messaging $(TAO_SRVR_LIBS) ifndef TAO_ROOT TAO_ROOT = $(ACE_ROOT)/TAO diff --git a/TAO/orbsvcs/tests/Event/Basic/Makefile b/TAO/orbsvcs/tests/Event/Basic/Makefile index 7f34d05c0c9..f405dff36e0 100644 --- a/TAO/orbsvcs/tests/Event/Basic/Makefile +++ b/TAO/orbsvcs/tests/Event/Basic/Makefile @@ -29,7 +29,7 @@ BIN2 = Reconnect \ Random PSRC=$(addsuffix .cpp,$(BIN2)) Schedule.cpp -LDLIBS = -lECTests -lTAO_RTEvent -lTAO_CosNaming -lTAO_Svc_Utils -lTAO_Messaging -lTAO_IORTable -lTAO_PortableServer -lTAO +LDLIBS = -lECTests -lTAO_RTEvent -lTAO_CosNaming -lTAO_Svc_Utils -lTAO_Messaging -lTAO_IORTable $(TAO_SRVR_LIBS) CPPFLAGS += -I../lib -I$(TAO_ROOT) -I$(TAO_ROOT)/orbsvcs \ $(foreach svc, $(TAO_ORBSVCS), -DTAO_ORBSVCS_HAS_$(svc)) diff --git a/TAO/orbsvcs/tests/Event/Performance/Makefile b/TAO/orbsvcs/tests/Event/Performance/Makefile index 94e0537055b..9e99458f252 100644 --- a/TAO/orbsvcs/tests/Event/Performance/Makefile +++ b/TAO/orbsvcs/tests/Event/Performance/Makefile @@ -19,7 +19,7 @@ BIN2 = Throughput \ Latency_Server PSRC=$(addsuffix .cpp,$(BIN2)) -LDLIBS = -lECTests -lTAO_RTEvent -lTAO_CosNaming -lTAO_Svc_Utils -lTAO_IORTable -lTAO_Messaging -lTAO_PortableServer -lTAO_Strategies -lTAO +LDLIBS = -lECTests -lTAO_RTEvent -lTAO_CosNaming -lTAO_Svc_Utils -lTAO_IORTable -lTAO_Messaging -lTAO_PortableServer $(TAO_SRVR_LIBS) CPPFLAGS += -I../lib -I$(TAO_ROOT) -I$(TAO_ROOT)/orbsvcs \ $(foreach svc, $(TAO_ORBSVCS), -DTAO_ORBSVCS_HAS_$(svc)) diff --git a/TAO/orbsvcs/tests/Property/Makefile b/TAO/orbsvcs/tests/Property/Makefile index 01a5528e8e1..981af32ac66 100644 --- a/TAO/orbsvcs/tests/Property/Makefile +++ b/TAO/orbsvcs/tests/Property/Makefile @@ -13,7 +13,7 @@ ifndef TAO_ROOT TAO_ROOT = $(ACE_ROOT)/TAO endif -LDLIBS = -lTAO_CosProperty -lTAO_CosNaming -lTAO_Svc_Utils -lTAO_IORTable -lTAO_PortableServer -lTAO +LDLIBS = -lTAO_CosProperty -lTAO_CosNaming -lTAO_Svc_Utils -lTAO_IORTable $(TAO_SRVR_LIBS) CosProperty_SERVER_OBJS = server.o CosProperty_CLIENT_OBJS = client.o diff --git a/TAO/orbsvcs/tests/Sched_Conf/Makefile b/TAO/orbsvcs/tests/Sched_Conf/Makefile index dc1b8a0dc0b..184552f7127 100644 --- a/TAO/orbsvcs/tests/Sched_Conf/Makefile +++ b/TAO/orbsvcs/tests/Sched_Conf/Makefile @@ -10,7 +10,7 @@ LSRC = $(DUMP_SRCS) SCHEDULE_OBJS = $(SCHEDULE_SRCS:.cpp=.o) DUMP_OBJS = $(DUMP_SRCS:.cpp=.o) -LDLIBS = -lTAO_RTSched -lTAO_CosNaming -lTAO_Svc_Utils -lTAO_IORTable -lTAO_PortableServer -lTAO +LDLIBS = -lTAO_RTSched -lTAO_CosNaming -lTAO_Svc_Utils -lTAO_IORTable $(TAO_SRVR_LIBS) BIN2 = Sched_Conf diff --git a/TAO/orbsvcs/tests/Simple_Naming/Makefile b/TAO/orbsvcs/tests/Simple_Naming/Makefile index afdca99e711..6ef3912393a 100644 --- a/TAO/orbsvcs/tests/Simple_Naming/Makefile +++ b/TAO/orbsvcs/tests/Simple_Naming/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 $(TAO_SRVR_LIBS) IDL_FILES = test_object IDL_SRC = test_objectC.cpp test_objectS.cpp diff --git a/TAO/orbsvcs/tests/Time/Makefile b/TAO/orbsvcs/tests/Time/Makefile index c12dbf200aa..6ef9e641bc5 100644 --- a/TAO/orbsvcs/tests/Time/Makefile +++ b/TAO/orbsvcs/tests/Time/Makefile @@ -12,7 +12,7 @@ ifndef TAO_ROOT TAO_ROOT = $(ACE_ROOT)/TAO endif -LDLIBS = -lTAO_CosTime -lTAO_CosNaming -lTAO_Svc_Utils -lTAO_IORTable -lTAO_PortableServer -lTAO +LDLIBS = -lTAO_CosTime -lTAO_CosNaming -lTAO_Svc_Utils -lTAO_IORTable $(TAO_SRVR_LIBS) PROG_SRCS = \ client.cpp \ |