ChangeLogTag: Sat Jan 18 09:02:12 UTC 2002 Johnny Willemsen <jwillemsen@remedy.nl>

13 files changed, 140 insertions, 15 deletions

diff --git a/ChangeLog b/ChangeLog
index e5e4af9b5be..179eb0d8d8d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+Sat Jan 18 09:07:12 UTC 2003  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tests/Makefile.DLL_Test:
+        * tests/Makefile.Framework_Component_DLL:
+        * tests/Makefile.Service_Config_DLL:
+        * examples/Service_Configurator/IPC-tests/server/Makefile:
+          Set the correct x_BUILD_DLL defines. These are needed for the
+          Cygwin/MingW and Kylix compiler.
+
 Fri Jan 17 12:34:51 2003  Steve Huston  <shuston@riverace.com>
 
         * ACE-INSTALL.html: Updated platform and compiler information.
@@ -17,7 +26,7 @@ Thu Jan 16 19:06:19 2003  Stephen Torri <storri@cse.wustl.edu>
 Thu Jan 16 16:25:45 2003  Balachandran Natarajan  <bala@isis-server.isis.vanderbilt.edu>
 
 	* bin/auto_run_tests.lst: Added a TAO/orbsvcs/tests/EC_MT_Mcast
-	  test to the daily builds. 
+	  test to the daily builds.
 
 Thu Jan 16 12:27:24 2003  Balachandran Natarajan  <bala@isis-server.isis.vanderbilt.edu>
 
@@ -31,7 +40,7 @@ Wed Jan 15 18:02:01 2003  Bala  <bala@cs.wustl.edu>
 
 Wed Jan 15 10:48:11 2003  Balachandran Natarajan  <bala@isis-server.isis.vanderbilt.edu>
 
-	* bin/make_release: Did the following enhancements 
+	* bin/make_release: Did the following enhancements
 
 	  - If it is a minor release do not append the beta version. Looks
 	    like somone broke this and the script started writing out
@@ -40,8 +49,8 @@ Wed Jan 15 10:48:11 2003  Balachandran Natarajan  <bala@isis-server.isis.vanderb
 	  - We now POSIX.1 tar, instead of old tar format with the -H
 	    option in cpio. This helps to tar files deep in the hierarchy
 	    tree to be properly zipped. We were loosing this in many
-	    betas. 
-	    
+	    betas.
+
 	  - Fixes for the generated filenames copied into the
 	    previous_versions directory.
 
diff --git a/ChangeLogs/ChangeLog-03a b/ChangeLogs/ChangeLog-03a
index e5e4af9b5be..179eb0d8d8d 100644
--- a/ChangeLogs/ChangeLog-03a
+++ b/ChangeLogs/ChangeLog-03a
@@ -1,3 +1,12 @@
+Sat Jan 18 09:07:12 UTC 2003  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tests/Makefile.DLL_Test:
+        * tests/Makefile.Framework_Component_DLL:
+        * tests/Makefile.Service_Config_DLL:
+        * examples/Service_Configurator/IPC-tests/server/Makefile:
+          Set the correct x_BUILD_DLL defines. These are needed for the
+          Cygwin/MingW and Kylix compiler.
+
 Fri Jan 17 12:34:51 2003  Steve Huston  <shuston@riverace.com>
 
         * ACE-INSTALL.html: Updated platform and compiler information.
@@ -17,7 +26,7 @@ Thu Jan 16 19:06:19 2003  Stephen Torri <storri@cse.wustl.edu>
 Thu Jan 16 16:25:45 2003  Balachandran Natarajan  <bala@isis-server.isis.vanderbilt.edu>
 
 	* bin/auto_run_tests.lst: Added a TAO/orbsvcs/tests/EC_MT_Mcast
-	  test to the daily builds. 
+	  test to the daily builds.
 
 Thu Jan 16 12:27:24 2003  Balachandran Natarajan  <bala@isis-server.isis.vanderbilt.edu>
 
@@ -31,7 +40,7 @@ Wed Jan 15 18:02:01 2003  Bala  <bala@cs.wustl.edu>
 
 Wed Jan 15 10:48:11 2003  Balachandran Natarajan  <bala@isis-server.isis.vanderbilt.edu>
 
-	* bin/make_release: Did the following enhancements 
+	* bin/make_release: Did the following enhancements
 
 	  - If it is a minor release do not append the beta version. Looks
 	    like somone broke this and the script started writing out
@@ -40,8 +49,8 @@ Wed Jan 15 10:48:11 2003  Balachandran Natarajan  <bala@isis-server.isis.vanderb
 	  - We now POSIX.1 tar, instead of old tar format with the -H
 	    option in cpio. This helps to tar files deep in the hierarchy
 	    tree to be properly zipped. We were loosing this in many
-	    betas. 
-	    
+	    betas.
+
 	  - Fixes for the generated filenames copied into the
 	    previous_versions directory.
 
diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index 00c25d06dde..75068d9b7c3 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,14 @@
+Sat Jan 18 09:08:12 UTC 2003  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * TAO_IDL/Makefile.BE:
+        * TAO_IDL/Makefile.FE:
+        * tao/Domain/Makefile:
+        * tao/RTCORBA/Makefile:
+        * tao/RTPortableServer/Makefile:
+        * tao/TypeCodeFactory/Makefile:
+          Set the correct x_BUILD_DLL defines. These are needed for the
+          Cygwin/MingW and Kylix compiler.
+
 Fri Jan 17 14:22:48 2003  Chris Cleeland  <cleeland_c@ociweb.com>
 
 	* orbsvcs/orbsvcs/Notify/Properties.cpp: Fixed explicit
@@ -23,13 +34,13 @@ Thu Jan 16 17:24:30 2003  Pradeep Gore  <pradeep@oomworks.com>
 	  Extend the ChannelFactory interface to include a destroy method.
 	  This allows us to check for memory leaks using a tool like
 	  purify when the channel factory is destroyed.
-	
+
 	* orbsvcs/orbsvcs/Notify/EventType.cpp:
 	* orbsvcs/orbsvcs/Notify/EventType.h:
 	* orbsvcs/orbsvcs/Notify/EventTypeSeq.cpp:
 	* orbsvcs/orbsvcs/Notify/EventTypeSeq.h:
 	  Made the <dump> methods const.
-	
+
 	* orbsvcs/orbsvcs/Notify/Object.cpp:
 	* orbsvcs/orbsvcs/Notify/Object_T.cpp:
 	* orbsvcs/orbsvcs/Notify/Object_T.h:
@@ -45,19 +56,19 @@ Thu Jan 16 17:24:30 2003  Pradeep Gore  <pradeep@oomworks.com>
 	  Changed the <subscribed_types> method to return a copy of the
 	  curent subscriptions. This method has been corrected to be
 	  thread safe.
-	
+
 	* orbsvcs/orbsvcs/Notify/Peer.cpp:
 	  Changed to new usage of Proxy::subscribed_types.
-	
+
 	* orbsvcs/orbsvcs/Notify/Properties.h:
-	  Use TAO_Singleton instead of ACE_Singleton.  
+	  Use TAO_Singleton instead of ACE_Singleton.
 
 Thu Jan 16 16:27:59 2003  Balachandran Natarajan  <bala@isis-server.isis.vanderbilt.edu>
 
        * orbsvcs/orbsvcs/Event/EC_Gateway_UDP.{h,cpp}: Added patches from
 	 this checkin "Mon Oct 28 18:21:18 CET 2002  Oliver Kellogg
          <oliver.kellogg@sysde.eads.net>". The patches mysteriously
-	 dissappeared. Thanks to Oliver Kellogg for alerting me. 
+	 dissappeared. Thanks to Oliver Kellogg for alerting me.
 
 Thu Jan 16 13:25:10 2003  Nanbor Wang  <nanbor@cs.wustl.edu>
 
diff --git a/TAO/TAO_IDL/Makefile.BE b/TAO/TAO_IDL/Makefile.BE
index 66094599eba..f3fadfe68a9 100644
--- a/TAO/TAO_IDL/Makefile.BE
+++ b/TAO/TAO_IDL/Makefile.BE
@@ -129,6 +129,18 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU
 
 CPPFLAGS += -Iinclude -Ibe_include -Ife
 
+ifeq ($(shared_libs),1)
+ifneq ($(SHLIB),)
+CPPFLAGS     += -DTAO_IDL_BE_BUILD_DLL
+endif
+endif
+
+ifeq ($(static_libs),1)
+ifneq ($(LIB),)
+CPPFLAGS     += -DTAO_AS_STATIC_LIBS
+endif
+endif
+
 realclean: clean
 
 #----------------------------------------------------------------------------
diff --git a/TAO/TAO_IDL/Makefile.FE b/TAO/TAO_IDL/Makefile.FE
index 16b2ad530d0..a955554dc41 100644
--- a/TAO/TAO_IDL/Makefile.FE
+++ b/TAO/TAO_IDL/Makefile.FE
@@ -114,6 +114,18 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU
 
 CPPFLAGS += -Iinclude -Ife
 
+ifeq ($(shared_libs),1)
+ifneq ($(SHLIB),)
+CPPFLAGS     += -DTAO_IDL_FE_BUILD_DLL
+endif
+endif
+
+ifeq ($(static_libs),1)
+ifneq ($(LIB),)
+CPPFLAGS     += -DTAO_AS_STATIC_LIBS
+endif
+endif
+
 realclean: clean
 
 #----------------------------------------------------------------------------
diff --git a/TAO/tao/Domain/Makefile b/TAO/tao/Domain/Makefile
index 6b5816860e0..7daee1a0515 100644
--- a/TAO/tao/Domain/Makefile
+++ b/TAO/tao/Domain/Makefile
@@ -41,6 +41,18 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU
 LDFLAGS += -L$(TAO_ROOT)/tao
 CPPFLAGS += -I$(TAO_ROOT)
 
+ifeq ($(shared_libs),1)
+ifneq ($(SHLIB),)
+CPPFLAGS     += -DTAO_DOMAIN_BUILD_DLL
+endif
+endif
+
+ifeq ($(static_libs),1)
+ifneq ($(LIB),)
+CPPFLAGS     += -DTAO_AS_STATIC_LIBS
+endif
+endif
+
 #----------------------------------------------------------------------------
 #       Dependencies
 #----------------------------------------------------------------------------
diff --git a/TAO/tao/RTCORBA/Makefile b/TAO/tao/RTCORBA/Makefile
index ee208fb3910..82a379b8f72 100644
--- a/TAO/tao/RTCORBA/Makefile
+++ b/TAO/tao/RTCORBA/Makefile
@@ -77,6 +77,18 @@ ifeq ($(corba_messaging),1)
 LDFLAGS += -L$(TAO_ROOT)/tao
 CPPFLAGS += -I$(TAO_ROOT)
 
+ifeq ($(shared_libs),1)
+ifneq ($(SHLIB),)
+CPPFLAGS     += -DTAO_RTCORBA_BUILD_DLL
+endif
+endif
+
+ifeq ($(static_libs),1)
+ifneq ($(LIB),)
+CPPFLAGS     += -DTAO_AS_STATIC_LIBS
+endif
+endif
+
 else
 all:
 endif # corba_messaging
diff --git a/TAO/tao/RTPortableServer/Makefile b/TAO/tao/RTPortableServer/Makefile
index afcab9a23b2..8531e7d53d1 100644
--- a/TAO/tao/RTPortableServer/Makefile
+++ b/TAO/tao/RTPortableServer/Makefile
@@ -57,6 +57,18 @@ ifeq ($(corba_messaging),1)
 LDFLAGS += -L$(TAO_ROOT)/tao
 CPPFLAGS += -I$(TAO_ROOT)
 
+ifeq ($(shared_libs),1)
+ifneq ($(SHLIB),)
+CPPFLAGS     += -DTAO_RTPORTABLESERVER_BUILD_DLL
+endif
+endif
+
+ifeq ($(static_libs),1)
+ifneq ($(LIB),)
+CPPFLAGS     += -DTAO_AS_STATIC_LIBS
+endif
+endif
+
 else
 # Dummy Target
 all:
diff --git a/TAO/tao/TypeCodeFactory/Makefile b/TAO/tao/TypeCodeFactory/Makefile
index d0a8cbe292b..03f2a2d5229 100644
--- a/TAO/tao/TypeCodeFactory/Makefile
+++ b/TAO/tao/TypeCodeFactory/Makefile
@@ -52,6 +52,18 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU
 
 LDFLAGS += -L$(TAO_ROOT)/tao
 
+ifeq ($(shared_libs),1)
+ifneq ($(SHLIB),)
+CPPFLAGS     += -DTAO_TYPECODEFACTORY_BUILD_DLL
+endif
+endif
+
+ifeq ($(static_libs),1)
+ifneq ($(LIB),)
+CPPFLAGS     += -DTAO_AS_STATIC_LIBS
+endif
+endif
+
 realclean: clean
 
 # DO NOT DELETE THIS LINE -- g++dep uses it.
diff --git a/examples/Service_Configurator/IPC-tests/server/Makefile b/examples/Service_Configurator/IPC-tests/server/Makefile
index 5a623a49785..618753452ae 100644
--- a/examples/Service_Configurator/IPC-tests/server/Makefile
+++ b/examples/Service_Configurator/IPC-tests/server/Makefile
@@ -53,6 +53,12 @@ else
 $(VBIN): $(VSHLIB)
 endif
 
+ifeq ($(shared_libs),1)
+ifneq ($(SHLIB),)
+CPPFLAGS     += -DACE_SVC_BUILD_DLL
+endif
+endif
+
 #----------------------------------------------------------------------------
 #	Dependencies
 #----------------------------------------------------------------------------
diff --git a/tests/Makefile.DLL_Test b/tests/Makefile.DLL_Test
index de2d53aebb6..bf4a89775ad 100644
--- a/tests/Makefile.DLL_Test
+++ b/tests/Makefile.DLL_Test
@@ -39,6 +39,12 @@ endif
 #       Local targets
 #----------------------------------------------------------------------------
 
+ifeq ($(shared_libs),1)
+ifneq ($(SHLIB),)
+CPPFLAGS     += -DACE_BUILD_SVC_DLL
+endif
+endif
+
 #----------------------------------------------------------------------------
 #       Dependencies
 #----------------------------------------------------------------------------
diff --git a/tests/Makefile.Framework_Component_DLL b/tests/Makefile.Framework_Component_DLL
index cf76f0b5818..dc3cea8403a 100644
--- a/tests/Makefile.Framework_Component_DLL
+++ b/tests/Makefile.Framework_Component_DLL
@@ -11,7 +11,7 @@
 LIB     = libFramework_Component_DLL.a
 SHLIB   = libFramework_Component_DLL.$(SOEXT)
 FILES   = Framework_Component_DLL
-LSRC    = $(addsuffix .cpp,$(FILES)) 
+LSRC    = $(addsuffix .cpp,$(FILES))
 LIBS   += $(ACELIB)
 
 BUILD   = $(VLIB) $(VSHLIB)
@@ -38,6 +38,12 @@ endif
 #       Local targets
 #----------------------------------------------------------------------------
 
+ifeq ($(shared_libs),1)
+ifneq ($(SHLIB),)
+CPPFLAGS     += -DFRAMEWORK_COMPONENT_DLL_BUILD_DLL
+endif
+endif
+
 #----------------------------------------------------------------------------
 #       Dependencies
 #----------------------------------------------------------------------------
diff --git a/tests/Makefile.Service_Config_DLL b/tests/Makefile.Service_Config_DLL
index bb2231f9bf4..d439928dff0 100644
--- a/tests/Makefile.Service_Config_DLL
+++ b/tests/Makefile.Service_Config_DLL
@@ -39,6 +39,12 @@ endif
 #       Local targets
 #----------------------------------------------------------------------------
 
+ifeq ($(shared_libs),1)
+ifneq ($(SHLIB),)
+CPPFLAGS     += -DSERVICE_CONFIG_DLL_BUILD_DLL
+endif
+endif
+
 #----------------------------------------------------------------------------
 #       Dependencies
 #----------------------------------------------------------------------------