diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2003-01-31 07:49:06 +0000 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2003-01-31 07:49:06 +0000 |
| commit | 8e03757310fd4ffaa33272c062b74274ac470066 (patch) | |
| tree | 87c6b09f25bfea52f4d2601231c4a27abe0152c1 | |
| parent | 918e805aac6e09e47bbb3716599eda603e52e42a (diff) | |
| download | ATCD-8e03757310fd4ffaa33272c062b74274ac470066.tar.gz | |
ChangeLogTag: Fri Jan 31 07:44:12 UTC 2002 Johnny Willemsen <jwillemsen@remedy.nl>
| -rw-r--r-- | TAO/ChangeLog | 17 | ||||
| -rw-r--r-- | TAO/TAO_IDL/Makefile.BE | 2 | ||||
| -rw-r--r-- | TAO/TAO_IDL/Makefile.FE | 2 | ||||
| -rw-r--r-- | TAO/orbsvcs/IFR_Service/IFR_Service.mpc | 3 | ||||
| -rw-r--r-- | TAO/orbsvcs/IFR_Service/Makefile.BE | 11 |
5 files changed, 30 insertions, 5 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index 4b1cd0d5e6a..baedbad0a35 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,16 @@ +Fri Jan 31 07:47:32 UTC 2003 Johnny Willemsen <jwillemsen@remedy.nl> + + * orbsvcs/IFR_Service/IFR_Service.mpc: + Add missing dllflags + + * orbsvcs/IFR_Service/Makefile.BE: + Set the correct x_BUILD_DLL define. This is needed for the + Cygwin/MingW and Kylix compiler. + + * TAO_IDL/Makefile.BE: + * TAO_IDL/Makefile.FE: + Adding missing ACE_AS_STATIC_LIBS when building statically + Thu Jan 30 17:30:04 2003 Balachandran Natarajan <bala@isis-server.isis.vanderbilt.edu> * tao/IIOP_Connection_Handler.cpp: @@ -6,9 +19,9 @@ Thu Jan 30 17:30:04 2003 Balachandran Natarajan <bala@isis-server.isis.vanderb initializes itself and its base classes without initializing the transport. This is needed since the derived classes may want to initialize its own version of the transport. - + * orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connection_Handler.cpp: Use the - new constructor to initialize the base class. + new constructor to initialize the base class. This fixes [BUG 1421]. Thanks to Jon Reis and Wayne Erchak for reporting the problem. diff --git a/TAO/TAO_IDL/Makefile.BE b/TAO/TAO_IDL/Makefile.BE index f3fadfe68a9..c76400d922a 100644 --- a/TAO/TAO_IDL/Makefile.BE +++ b/TAO/TAO_IDL/Makefile.BE @@ -137,7 +137,7 @@ endif ifeq ($(static_libs),1) ifneq ($(LIB),) -CPPFLAGS += -DTAO_AS_STATIC_LIBS +CPPFLAGS += -DTAO_AS_STATIC_LIBS -DACE_AS_STATIC_LIBS endif endif diff --git a/TAO/TAO_IDL/Makefile.FE b/TAO/TAO_IDL/Makefile.FE index a955554dc41..b07b1042661 100644 --- a/TAO/TAO_IDL/Makefile.FE +++ b/TAO/TAO_IDL/Makefile.FE @@ -122,7 +122,7 @@ endif ifeq ($(static_libs),1) ifneq ($(LIB),) -CPPFLAGS += -DTAO_AS_STATIC_LIBS +CPPFLAGS += -DTAO_AS_STATIC_LIBS -DACE_AS_STATIC_LIBS endif endif diff --git a/TAO/orbsvcs/IFR_Service/IFR_Service.mpc b/TAO/orbsvcs/IFR_Service/IFR_Service.mpc index ab40ed35f5f..eb3c81008c0 100644 --- a/TAO/orbsvcs/IFR_Service/IFR_Service.mpc +++ b/TAO/orbsvcs/IFR_Service/IFR_Service.mpc @@ -14,6 +14,7 @@ project(TAO_IFR_BE) : taolib, core { depends += TAO_IDL_FE TAO_IFR_Client sharedname = TAO_IFR_BE libs += TAO_IDL_FE TAO_IFR_Client TAO + dllflags = TAO_IFR_BE_BUILD_DLL includes += $(TAO_ROOT)/TAO_IDL/include $(TAO_ROOT)/TAO_IDL/fe Source_Files { @@ -26,7 +27,7 @@ project(TAO_IFR_BE) : taolib, core { ifr_adding_visitor_union.cpp ifr_removing_visitor.cpp ifr_visitor.cpp - } + } } diff --git a/TAO/orbsvcs/IFR_Service/Makefile.BE b/TAO/orbsvcs/IFR_Service/Makefile.BE index 1dcffefb8a0..7ed2bdfd821 100644 --- a/TAO/orbsvcs/IFR_Service/Makefile.BE +++ b/TAO/orbsvcs/IFR_Service/Makefile.BE @@ -55,6 +55,17 @@ include $(TAO_ROOT)/taoconfig.mk CPPFLAGS += -I../../TAO_IDL/include -I../../TAO_IDL/fe LDFLAGS += -I$(TAO_ROOT)/tao +ifeq ($(shared_libs),1) +ifneq ($(SHLIB),) +CPPFLAGS += -DTAO_IFR_BE_BUILD_DLL +endif +endif +ifeq ($(static_libs),1) +ifneq ($(LIB),) +CPPFLAGS += -DTAO_AS_STATIC_LIBS -DACE_AS_STATIC_LIBS +endif +endif + realclean: clean #---------------------------------------------------------------------------- |