ChangeLogTag: Thu Jul 03 17:01:12 UTC 2003 Johnny Willemsen <jwillemsen@remedy.nl>

2 files changed, 46 insertions, 28 deletions

diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index bf9d27b9716..d0b98bf3e54 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,9 @@
+Thu Jul 03 17:03:33 UTC 2003  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * orbsvcs/tests/Event/lib/Makefile:
+          Set correct BUILD_DLL define when building shared libs. This fixes
+          link errors in the Cygwin/MinGW and Kylix builds.
+
 Thu Jul 03 16:24:12 UTC 2003  Johnny Willemsen  <jwillemsen@remedy.nl>
 
         * orbsvcs/orbsvcs/Event/ECG_Mcast_Gateway.cpp (init_endpoint):
@@ -205,8 +211,8 @@ Mon Jun 30 16:02:55 2003  Yamuna Krishnamurthy  <yamuna@oomworks.com>
 	  Template build caused by missing return statements in functions
 	  returning non-void. Also moved the creation of an instance of
 	  TAO_RT_Current from TAO_RTSceduler_Current constructor to a
-	  method init. 
-	
+	  method init.
+
 Mon Jun 30 12:19:22 2003  Gan Deng  <gan.deng@vanderbilt.edu>
 
 	* performance-tests/Sequence_Latency/Thread_Pool/Client_Task.cpp
@@ -232,7 +238,7 @@ Mon Jun 30 11:52:22 2003  Pradeep Gore  <pradeep@oomworks.com>
 	* orbsvcs/examples/Notify/Lanes/Supplier_Client.cpp:
 
 	  Removed references to .inl files.
-	
+
 Mon Jun 30 09:33:31 2003  Gan Deng  <gan.deng@vanderbilt.edu>
 
         * performance-tests/Sequence_Latency/Deferred/client.bor
@@ -241,16 +247,16 @@ Mon Jun 30 09:33:31 2003  Gan Deng  <gan.deng@vanderbilt.edu>
 
 Sun Jun 29 02:09:20 2003  Yamuna Krishnamurthy  <yamuna@oomworks.com>
 
-	* orbsvcs/tests/AVStreams/Asynch_Three_Stage/Connection_Manager.cpp: 
+	* orbsvcs/tests/AVStreams/Asynch_Three_Stage/Connection_Manager.cpp:
 
 	  Added explicit template instantiation for hash map of endpoint
 	  addresses. This should fix the compile problem on sun solaris.
-	
+
 Sun Jun 29 00:26:56 2003  Yamuna Krishnamurthy  <yamuna@oomworks.com>
 
-	* tao/corbafwd.h: 
-	* tao/Exeception.h: 	
-	* tao/Exeception.cpp: 		
+	* tao/corbafwd.h:
+	* tao/Exeception.h:
+	* tao/Exeception.cpp:
 
 	  Added THREAD_CANCELLED to CORBA system exception. The exception
 	  is thrown when a Distributable Thread is cancelled. This should
@@ -258,8 +264,8 @@ Sun Jun 29 00:26:56 2003  Yamuna Krishnamurthy  <yamuna@oomworks.com>
 
 	* TAOACE.dsw:
 	* tao/TAO.dsw:
-	* tao/RTScheduling/TAO_RTScheduler.dsp:	
-	* tao/RTScheduling/TAO_RTScheduler.rc:		
+	* tao/RTScheduling/TAO_RTScheduler.dsp:
+	* tao/RTScheduling/TAO_RTScheduler.rc:
 
 	  Added project and workspace files to build RTScheduler library on
 	  windows.
@@ -278,14 +284,14 @@ Fri Jun 27 12:12:09 2003  Chris Cleeland  <cleeland_c@ociweb.com>
 	  instantiation builds didn't trip the problem because they had
 	  exceptions turned on.
 
-Thu Jun 26 22:34:10 2003  Yamuna Krishnamurthy  <yamuna@oomworks.com>	
+Thu Jun 26 22:34:10 2003  Yamuna Krishnamurthy  <yamuna@oomworks.com>
 
 	The following checkins correspond to the implementation of Dynamic
 	Scheduling in TAO. This implementation is based on OMG's
 	RTCORBA 2.0 specification.
-	
-	* tao/ORB_Core.h: 
-	* tao/ORB_Core.cpp: 
+
+	* tao/ORB_Core.h:
+	* tao/ORB_Core.cpp:
 
 	  Added member variables rtscheduler_current_impl_ and
 	  rtscheduler_previous_current_impl_ to TSS to store the
@@ -298,24 +304,24 @@ Thu Jun 26 22:34:10 2003  Yamuna Krishnamurthy  <yamuna@oomworks.com>
 
 	  The psuedo IDL file and corresponding stubs/skeletons defining
 	  the various interfaces constituting the dynamic scheduling
-	  framework as defined by the RTCORBA 2.0 specification. 
-	
-	* tao/RTScheduling/Current.cpp: 
+	  framework as defined by the RTCORBA 2.0 specification.
+
+	* tao/RTScheduling/Current.cpp:
 	* tao/RTScheduling/Current.h:
 
 	  Contains implementation of the RTScheduling::Current
 	  interface. The operations of the Current interface facilitate
 	  creation, termination and updation of scheduling segments and
 	  Distributable Threads (DTs).
-	
+
 	* tao/RTScheduling/Distributable_Thread.cpp:
-	* tao/RTScheduling/Distributable_Thread.h: 
+	* tao/RTScheduling/Distributable_Thread.h:
 
 	  Implements the RTScheduling::DistributableThread interface. This
 	  interface is used to cancel the corresponding DT.
 
 	* tao/RTScheduling/Request_Interceptor.cpp:
-	* tao/RTScheduling/Request_Interceptor.h:	
+	* tao/RTScheduling/Request_Interceptor.h:
 
 	  Provide interception points when sending/receiving requests so
 	  the ORB can interact with the scheduler. This helps the
@@ -324,12 +330,12 @@ Thu Jun 26 22:34:10 2003  Yamuna Krishnamurthy  <yamuna@oomworks.com>
 
 	* tao/RTScheduling/RTScheduler_Manager.cpp:
 	* tao/RTScheduling/RTScheduler_Manager.h:
-	* tao/RTScheduling/RTScheduler_Manager.i:  
+	* tao/RTScheduling/RTScheduler_Manager.i:
 
 	  Manages addition/removal of schedulers implementing specific
 	  scheduling disciplines. The scheduler manager facilitates
 	  changing schedulers at run-time.
-		
+
 	* tao/RTScheduling/RTScheduler_Initializer.cpp:
 	* tao/RTScheduling/RTScheduler_Initializer.h:
 
@@ -338,15 +344,15 @@ Thu Jun 26 22:34:10 2003  Yamuna Krishnamurthy  <yamuna@oomworks.com>
 	  queried with the corresponding names using
 	  resolve_initial_references. It also registers the Client and
 	  Server interceptors defined in Request_Interceptor.{h,cpp}.
-	
+
 	* tao/RTScheduling/RTScheduler_Loader.cpp:
 	* tao/RTScheduling/RTScheduler_Loader.h:
 
 	  Registers the orb initializer, RTScheduler_Initializer.
 
-	* tao/RTScheduling/RTScheduler.cpp: 
+	* tao/RTScheduling/RTScheduler.cpp:
 	* tao/RTScheduling/RTScheduler.h:
-	  
+
 	  Bootstraps the dynamic scheduling framework by loading in the
 	  RTScheduler_Loader. The header file 'MUST' be included in the
 	  application that wants to use the RTScheduler library.
@@ -355,12 +361,12 @@ Thu Jun 26 22:34:10 2003  Yamuna Krishnamurthy  <yamuna@oomworks.com>
 
 	  Defines the RTScheduling::Thread_Action interface that is used
 	  as an entry point when spawning new DTs.
-	
+
 	* tao/RTScheduling/Makefile
 	* tao/Makefile.dirs
 
 	  Corresponding Makefiles to compile RTScheduler library.
-	
+
 Thu Jun 26 17:35:00 2003  Justin Michel  <michel_j@ociweb.com>
 
         * TAOACE.mwc:
@@ -401,7 +407,7 @@ Thu Jun 26 14:03:48 2003  Jeff Parsons <j.parsons@vanderbilt.edu>
 	  Mon Jun 23 19:04:03 2003  Jeff Parsons <j.parsons@vanderbilt.edu>
 
 	  added a global "::" prefix to the scoped name. This eliminates
-	  confusion when a module name reappears at a more deeply nested 
+	  confusion when a module name reappears at a more deeply nested
 	  level.
 
 Thu Jun 26 17:35:11 UTC 2003  Johnny Willemsen  <jwillemsen@remedy.nl>
diff --git a/TAO/orbsvcs/tests/Event/lib/Makefile b/TAO/orbsvcs/tests/Event/lib/Makefile
index a381b37b58e..14116f857e9 100644
--- a/TAO/orbsvcs/tests/Event/lib/Makefile
+++ b/TAO/orbsvcs/tests/Event/lib/Makefile
@@ -45,6 +45,18 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU
 #       Local targets (and local hacks)
 #----------------------------------------------------------------------------
 
+ifeq ($(shared_libs),1)
+ifneq ($(SHLIB),)
+CPPFLAGS     += -DEC_TEST_BUILD_DLL
+endif
+endif
+
+ifeq ($(static_libs),1)
+ifneq ($(LIB),)
+CPPFLAGS     += -DTAO_AS_STATIC_LIBS -DACE_AS_STATIC_LIBS
+endif
+endif
+
 LDFLAGS  += -L$(TAO_ROOT)/tao
 CPPFLAGS += -I$(TAO_ROOT) -I$(TAO_ROOT)/orbsvcs