summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhil Mesnier <mesnier_p@ociweb.com>2003-03-12 00:19:39 +0000
committerPhil Mesnier <mesnier_p@ociweb.com>2003-03-12 00:19:39 +0000
commit4e2cf7eec3bbf6c2fd8b92f9a8ad7e2c59347402 (patch)
tree7a5211b20bb4b4c1a8c86cdc41b3e4374ebadf4e
parenta2d2da5daead92a7df8d4545e8b87ac0d5837a46 (diff)
downloadATCD-4e2cf7eec3bbf6c2fd8b92f9a8ad7e2c59347402.tar.gz
ChangeLog tag: Tue Mar 11 18:00:12 2003 Phil Mesnier <mesnier_p@ociweb.com>
-rw-r--r--TAO/ChangeLog7
-rw-r--r--TAO/orbsvcs/tests/Security/MT_IIOP_SSL/Makefile4
2 files changed, 10 insertions, 1 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index bdecd1d7fd6..1797f3f7c0c 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,10 @@
+Tue Mar 11 18:00:12 2003 Phil Mesnier <mesnier_p@ociweb.com>
+
+ * orbsvcs/tests/Security/MT_IIOP_SSL/Makefile: Added
+ PLATFORM_SSL_* variables to the CPPFLAGS and LDFLAGS "make"
+ variables in the manner Ossama used to modify the
+ Secure_Invocation and SecurityLevel1 tests makefiles.
+
Tue Mar 11 11:58:12 2003 Ossama Othman <ossama@uci.edu>
* orbsvcs/tests/Security/Secure_Invocation/Makefile:
diff --git a/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/Makefile b/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/Makefile
index 0eb77b4338b..fbca43b91bd 100644
--- a/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/Makefile
+++ b/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/Makefile
@@ -14,7 +14,7 @@ endif # ! TAO_ROOT
IDL_FILES = test
IDL_SRC = testC.cpp testS.cpp
-BIN_UNCHECKED = client server
+BIN_UNCHECKED = client server
SRC = $(addsuffix .cpp, $(BIN) test_i Client_Worker Server_Worker) $(IDL_SRC)
@@ -37,6 +37,8 @@ include $(TAO_ROOT)/rules.tao.GNU
TAO_ORBSVCS := $(shell sh $(ACE_ROOT)/bin/ace_components --orbsvcs)
ifeq (SSLIOP,$(findstring SSLIOP,$(TAO_ORBSVCS)))
BIN = $(BIN_UNCHECKED)
+ CPPFLAGS += $(PLATFORM_SSL_CPPFLAGS)
+ LDFLAGS += $(PLATFORM_SSL_LDFLAGS)
endif #SSLIOP
include $(ACE_ROOT)/include/makeinclude/rules.common.GNU
include $(ACE_ROOT)/include/makeinclude/rules.nonested.GNU