summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorvenkita <venkita@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2002-01-31 15:44:18 +0000
committervenkita <venkita@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2002-01-31 15:44:18 +0000
commitd892698df8338fa843f337e93f10ecb41fb73b25 (patch)
tree0f7d9eb6872c3dbbbc231fb07db513e0ef7c7232
parent00af8f567407c68b2448c84d3f6b654e12e56dbb (diff)
downloadATCD-d892698df8338fa843f337e93f10ecb41fb73b25.tar.gz
ChangeLogTag: Thu Jan 31 09:39:59 2002 Venkita Subramonian <venkita@cs.wustl.edu>
-rw-r--r--TAO/ChangeLogs/ChangeLog-02a7
-rw-r--r--TAO/orbsvcs/examples/Security/Send_File/Makefile2
-rw-r--r--TAO/orbsvcs/tests/Security/Secure_Invocation/Makefile2
-rw-r--r--TAO/orbsvcs/tests/Security/SecurityLevel1/Makefile2
4 files changed, 10 insertions, 3 deletions
diff --git a/TAO/ChangeLogs/ChangeLog-02a b/TAO/ChangeLogs/ChangeLog-02a
index 7594a620431..fc1806f5381 100644
--- a/TAO/ChangeLogs/ChangeLog-02a
+++ b/TAO/ChangeLogs/ChangeLog-02a
@@ -1,3 +1,10 @@
+Thu Jan 31 09:39:59 2002 Venkita Subramonian <venkita@cs.wustl.edu>
+
+ * orbsvcs/examples/Security/Send_File/Makefile:
+ * orbsvcs/tests/Security/SecurityLevel1/Makefile (SRVR_LIBS):
+ * orbsvcs/tests/Security/Secure_Invocation/Makefile:
+ Fixed KCC error complaining about duplicate shared lib.
+
Thu Jan 31 09:37:22 2002 Chad Elliott <elliott_c@ociweb.com>
* orbsvcs/tests/Notify/Discarding/Sequence_Supplier.cpp:
diff --git a/TAO/orbsvcs/examples/Security/Send_File/Makefile b/TAO/orbsvcs/examples/Security/Send_File/Makefile
index 92402148e72..ac2c6b04f9a 100644
--- a/TAO/orbsvcs/examples/Security/Send_File/Makefile
+++ b/TAO/orbsvcs/examples/Security/Send_File/Makefile
@@ -55,7 +55,7 @@ SRVR_LIBS += -lTAO_SSLIOP
endif # static_libs_only = 1
CLNT_LIBS += -lTAO_PortableServer $(TAO_CLNT_LIBS)
-SRVR_LIBS += -lTAO_PortableServer $(TAO_SRVR_LIBS)
+SRVR_LIBS += $(TAO_SRVR_LIBS)
#----------------------------------------------------------------------------
# Local targets
diff --git a/TAO/orbsvcs/tests/Security/Secure_Invocation/Makefile b/TAO/orbsvcs/tests/Security/Secure_Invocation/Makefile
index 2072b534101..d5bb705922e 100644
--- a/TAO/orbsvcs/tests/Security/Secure_Invocation/Makefile
+++ b/TAO/orbsvcs/tests/Security/Secure_Invocation/Makefile
@@ -58,7 +58,7 @@ endif # static_libs_only = 1
CLNT_LIBS += -lTAO_Security $(TAO_CLNT_LIBS)
SRVR_LIBS += \
- -lTAO_Security -lTAO_PortableServer $(TAO_SRVR_LIBS) -lssl -lcrypto
+ -lTAO_Security $(TAO_SRVR_LIBS) -lssl -lcrypto
#----------------------------------------------------------------------------
# Local targets
diff --git a/TAO/orbsvcs/tests/Security/SecurityLevel1/Makefile b/TAO/orbsvcs/tests/Security/SecurityLevel1/Makefile
index 8dd4bfd5705..ac9e7e46bac 100644
--- a/TAO/orbsvcs/tests/Security/SecurityLevel1/Makefile
+++ b/TAO/orbsvcs/tests/Security/SecurityLevel1/Makefile
@@ -59,7 +59,7 @@ SRVR_LIBS += -lTAO_SSLIOP
endif # static_libs_only = 1
CLNT_LIBS += -lTAO_PortableServer $(TAO_CLNT_LIBS)
-SRVR_LIBS += -lTAO_Security -lTAO_PortableServer $(TAO_SRVR_LIBS) -lssl -lcrypto
+SRVR_LIBS += -lTAO_Security $(TAO_SRVR_LIBS) -lssl -lcrypto
#----------------------------------------------------------------------------
# Local targets