ChangeLogTag: Fri Dec 28 10:51:08 2001 Johnny Willemsen <jwillemsen@remedy.nl>

4 files changed, 31 insertions, 11 deletions

diff --git a/ChangeLog b/ChangeLog
index 7ceab6840e3..702776f4f48 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,16 +1,21 @@
+Fri Dec 28 10:52:12 2001  Johnny Willemsen <jwillemsen@remedy.nl>
+
+        * tests/SSL/Makefile.bor:
+          Added ACE_SSL_LIB to fix linker errors in BCB build
+
 Thu Dec 27 22:14:30 2001  Balachandran Natarajan  <bala@cs.wustl.edu>
 
 	* ace/Global_Macros.h: A new file that will house the macros used
 	  by ACE and applications. Have moved a very few macros from OS.h
 	  to this file. The real need for this was the need to include
-	  OS.h even if one wants to use a simple macro like 
+	  OS.h even if one wants to use a simple macro like
 	  ACE_UNIMPLEMENTED_FUNC or something as simple as that. Over a
 	  period of time we need to move more macros into this file so
 	  that applications can use this instead of OS.h. It would be nice
 	  to split this file into pieces having macros for every specific
 	  functionality. That was getting too tedious and error
-	  prone. Thought that this could be a first step to move further. 
-	
+	  prone. Thought that this could be a first step to move further.
+
 	* ace/OS.h: Moved a few macros into Global_Macros.h file. Also
 	  included the file in OS.h The need for inclusion comes from the
 	  fact that there are dependencies that exist between the macros
diff --git a/ChangeLogs/ChangeLog-02a b/ChangeLogs/ChangeLog-02a
index 7ceab6840e3..702776f4f48 100644
--- a/ChangeLogs/ChangeLog-02a
+++ b/ChangeLogs/ChangeLog-02a
@@ -1,16 +1,21 @@
+Fri Dec 28 10:52:12 2001  Johnny Willemsen <jwillemsen@remedy.nl>
+
+        * tests/SSL/Makefile.bor:
+          Added ACE_SSL_LIB to fix linker errors in BCB build
+
 Thu Dec 27 22:14:30 2001  Balachandran Natarajan  <bala@cs.wustl.edu>
 
 	* ace/Global_Macros.h: A new file that will house the macros used
 	  by ACE and applications. Have moved a very few macros from OS.h
 	  to this file. The real need for this was the need to include
-	  OS.h even if one wants to use a simple macro like 
+	  OS.h even if one wants to use a simple macro like
 	  ACE_UNIMPLEMENTED_FUNC or something as simple as that. Over a
 	  period of time we need to move more macros into this file so
 	  that applications can use this instead of OS.h. It would be nice
 	  to split this file into pieces having macros for every specific
 	  functionality. That was getting too tedious and error
-	  prone. Thought that this could be a first step to move further. 
-	
+	  prone. Thought that this could be a first step to move further.
+
 	* ace/OS.h: Moved a few macros into Global_Macros.h file. Also
 	  included the file in OS.h The need for inclusion comes from the
 	  fact that there are dependencies that exist between the macros
diff --git a/ChangeLogs/ChangeLog-03a b/ChangeLogs/ChangeLog-03a
index 7ceab6840e3..702776f4f48 100644
--- a/ChangeLogs/ChangeLog-03a
+++ b/ChangeLogs/ChangeLog-03a
@@ -1,16 +1,21 @@
+Fri Dec 28 10:52:12 2001  Johnny Willemsen <jwillemsen@remedy.nl>
+
+        * tests/SSL/Makefile.bor:
+          Added ACE_SSL_LIB to fix linker errors in BCB build
+
 Thu Dec 27 22:14:30 2001  Balachandran Natarajan  <bala@cs.wustl.edu>
 
 	* ace/Global_Macros.h: A new file that will house the macros used
 	  by ACE and applications. Have moved a very few macros from OS.h
 	  to this file. The real need for this was the need to include
-	  OS.h even if one wants to use a simple macro like 
+	  OS.h even if one wants to use a simple macro like
 	  ACE_UNIMPLEMENTED_FUNC or something as simple as that. Over a
 	  period of time we need to move more macros into this file so
 	  that applications can use this instead of OS.h. It would be nice
 	  to split this file into pieces having macros for every specific
 	  functionality. That was getting too tedious and error
-	  prone. Thought that this could be a first step to move further. 
-	
+	  prone. Thought that this could be a first step to move further.
+
 	* ace/OS.h: Moved a few macros into Global_Macros.h file. Also
 	  included the file in OS.h The need for inclusion comes from the
 	  fact that there are dependencies that exist between the macros
diff --git a/tests/SSL/Makefile.bor b/tests/SSL/Makefile.bor
index 2819dfc4f14..3cda022aa1c 100644
--- a/tests/SSL/Makefile.bor
+++ b/tests/SSL/Makefile.bor
@@ -8,11 +8,16 @@ NAMES = \
 
 OBJFILES = $(OBJDIR)\$(NAME).obj
 
-CFLAGS = $(ACE_CFLAGS) $(SSL_CFLAGS) $(ACE_SSL_CFLAGS)
+CFLAGS = \
+        $(ACE_CFLAGS) \
+        $(SSL_CFLAGS) \
+        $(ACE_SSL_CFLAGS)
 
 CPPDIR = .
 
-LIBFILES = $(ACE_LIB)
+LIBFILES = \
+        $(ACE_LIB) \
+        $(ACE_SSL_LIB)
 
 !include <$(ACE_ROOT)\include\makeinclude\recurse.bor>
 !include <$(ACE_ROOT)\include\makeinclude\build_exe.bor>