diff options
| author | Ossama Othman <ossama-othman@users.noreply.github.com> | 2003-10-14 05:12:25 +0000 |
|---|---|---|
| committer | Ossama Othman <ossama-othman@users.noreply.github.com> | 2003-10-14 05:12:25 +0000 |
| commit | e7b9eaa19edf30e4688c2ab4195cb5120e40150e (patch) | |
| tree | 52e2ff968bdd3076ee5c17a6635d0f61bc3b39bf | |
| parent | 502fc33fa460fad54684e78e0794eb035621e8e7 (diff) | |
| download | ATCD-e7b9eaa19edf30e4688c2ab4195cb5120e40150e.tar.gz | |
ChangeLogTag:Mon Oct 13 22:10:35 2003 Ossama Othman <ossama@dre.vanderbilt.edu>
| -rw-r--r-- | TAO/ChangeLog | 18 | ||||
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/Makefile.SSLIOP | 2 | ||||
| -rw-r--r-- | TAO/orbsvcs/tests/LoadBalancing/LoadMonitor/CPU/Makefile | 8 |
3 files changed, 25 insertions, 3 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index c70558faea6..cea567ef2d6 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,21 @@ +Mon Oct 13 22:10:35 2003 Ossama Othman <ossama@dre.vanderbilt.edu> + + * orbsvcs/tests/LoadBalancing/LoadMonitor/CPU/Makefile: + + Do not build the CPU load monitor test if the CosLoadBalancing + ORB services component hasn't been configured/built. Addresses + minimum CORBA build problems. Thanks to Venkita for pointing + out the problem. + + * orbsvcs/orbsvcs/Makefile.SSLIOP (ACE_SHLIBS): + + Reverted "Fri Jan 19 13:16:10 2001 Priyanka Gontla + <pgontla@ece.uci.edu>" change that caused ACE_SHLIBS to be + undefined on HPUX. It's not clear why it was necessary. Allows + the TAO_SSLIOP library to be linked on HPUX again. Thanks to + Torsten Kuepper <torsten.kuepper@nokia.com> for reporting the + problem. [Bug 1590] + Mon Oct 13 16:35:00 2003 Venkita Subramonian <venkita@cs.wustl.edu> * orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils.cpp: diff --git a/TAO/orbsvcs/orbsvcs/Makefile.SSLIOP b/TAO/orbsvcs/orbsvcs/Makefile.SSLIOP index 00a89e5ab66..49ccd2053b2 100644 --- a/TAO/orbsvcs/orbsvcs/Makefile.SSLIOP +++ b/TAO/orbsvcs/orbsvcs/Makefile.SSLIOP @@ -86,9 +86,7 @@ CPPFLAGS += -I$(TAO_ROOT) -I$(TAO_ROOT)/orbsvcs $(PLATFORM_SSL_CPPFLAGS) LDFLAGS += -L$(TAO_ROOT)/tao -L$(TAO_ROOT)/orbsvcs/orbsvcs $(PLATFORM_SSL_LDFLAGS) LIBS += $(PLATFORM_SSL_LIBS) -ifeq ($(HPUX_VERS),) ACE_SHLIBS = -lTAO_Security -lTAO_PortableServer -lTAO -lACE_SSL -lACE -lssl -lcrypto -endif # HPUX_VERS # Extra dependencies not caught by make depend. diff --git a/TAO/orbsvcs/tests/LoadBalancing/LoadMonitor/CPU/Makefile b/TAO/orbsvcs/tests/LoadBalancing/LoadMonitor/CPU/Makefile index 0f778ea4c6e..14f002f9217 100644 --- a/TAO/orbsvcs/tests/LoadBalancing/LoadMonitor/CPU/Makefile +++ b/TAO/orbsvcs/tests/LoadBalancing/LoadMonitor/CPU/Makefile @@ -10,7 +10,7 @@ ifndef TAO_ROOT TAO_ROOT = $(ACE_ROOT)/TAO endif # ! TAO_ROOT -BIN = client +BIN2 = client SRC = $(addsuffix .cpp, $(BIN)) @@ -27,6 +27,12 @@ LDLIBS = \ include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU include $(TAO_ROOT)/rules.tao.GNU +#### If the TAO orbsvcs library wasn't built with sufficient components, +#### don't try to build here. +TAO_ORBSVCS := $(shell sh $(ACE_ROOT)/bin/ace_components --orbsvcs) +ifeq (CosLoadBalancing,$(findstring CosLoadBalancing,$(TAO_ORBSVCS))) + BIN = $(BIN2) +endif # CosLoadBalancing include $(ACE_ROOT)/include/makeinclude/macros.GNU include $(ACE_ROOT)/include/makeinclude/rules.common.GNU include $(ACE_ROOT)/include/makeinclude/rules.nonested.GNU |