diff options
| author | nanbor <nanbor@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2003-05-09 17:52:59 +0000 |
|---|---|---|
| committer | nanbor <nanbor@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2003-05-09 17:52:59 +0000 |
| commit | 7868bb0afa23166da160ad7e4549c76a9f8511fd (patch) | |
| tree | 2100e10292e8e6e6ba0ea321b59c211635e85037 | |
| parent | 753d0b19c1c49955b83bfd68ba264a49382df5a2 (diff) | |
| download | ATCD-7868bb0afa23166da160ad7e4549c76a9f8511fd.tar.gz | |
ChangeLogTag:Fri May 09 12:51:03 2003 Nanbor Wang <nanbor@cs.wustl.edu>
| -rw-r--r-- | TAO/CIAO/ChangeLog | 9 | ||||
| -rw-r--r-- | TAO/CIAO/README | 1 | ||||
| -rw-r--r-- | TAO/CIAO/ciao/CCM_Core.mpc | 13 |
3 files changed, 17 insertions, 6 deletions
diff --git a/TAO/CIAO/ChangeLog b/TAO/CIAO/ChangeLog index 69babcdf484..585acfeb9c4 100644 --- a/TAO/CIAO/ChangeLog +++ b/TAO/CIAO/ChangeLog @@ -1,3 +1,10 @@ +Fri May 09 12:51:03 2003 Nanbor Wang <nanbor@cs.wustl.edu> + + * README: Updated the list of libraries that CIAO depends on, + based on the recent subsetting effort in TAO. + + * ciao/CCM_Core.mpc: Fixed several problems. + Fri May 9 10:57:14 2003 Balachandran Natarajan <bala@dre.vanderbilt.edu> * ciao/Component_Base.idl: Removed references to the Notification @@ -7,7 +14,7 @@ Fri May 9 10:54:47 2003 Balachandran Natarajan <bala@dre.vanderbilt.edu> * ciao/Container_Impl.cpp: Used .inout () while doing a deep copy so that the right operator= on TAO_Unbounded_Sequence is - invoked without any warning in g++. + invoked without any warning in g++. Wed May 7 17:24:46 2003 Balachandran Natarajan <bala@dre.vanderbilt.edu> diff --git a/TAO/CIAO/README b/TAO/CIAO/README index 0ebc8468788..00cde93db06 100644 --- a/TAO/CIAO/README +++ b/TAO/CIAO/README @@ -9,6 +9,7 @@ to compile them first. Here is a non-exhaustive list: ACEXML, + Valuetype Security PortableServer IFR_Client diff --git a/TAO/CIAO/ciao/CCM_Core.mpc b/TAO/CIAO/ciao/CCM_Core.mpc index b5cc7c0ab9b..e9fc227a679 100644 --- a/TAO/CIAO/ciao/CCM_Core.mpc +++ b/TAO/CIAO/ciao/CCM_Core.mpc @@ -1,9 +1,10 @@ project (CIAO_Client) : taolib_with_idl { depends += IFR_Client sharedname = CIAO_Client - libs += TAO TAO_IFR_Client - idlflags += -I $(TAO_ROOT) -Wb,stub_export_include=CIAO_Client_Export.h -Wb,skel_export_include=CIAO_Container_Export.h -Wb,pre_include="ace/pre.h" -Wb,post_include="ace/post.h" + libs += TAO TAO_IFR_Client TAO_Valuetype + idlflags += -I $(TAO_ROOT) -Wb,stub_export_include=CIAO_Client_Export.h -Wb,stub_export_macro=CIAO_CLIENT_Export -Wb,skel_export_include=CIAO_Container_Export.h -Wb,skel_export_macro=CIAO_CONTAINER_Export -Wb,pre_include="ace/pre.h" -Wb,post_include="ace/post.h" dllflags = CIAO_CLIENT_BUILD_DLL + libpaths += $(TAO_ROOT)/tao/IFR_Client $(TAO_ROOT)/tao/Valuetype IDL_Files { CCM_Base.idl @@ -25,9 +26,10 @@ project (CIAO_Container) : taolib_with_idl { depends += CIAO_Client PortableServer Security sharedname = CIAO_Container libs += TAO TAO_PortableServer TAO_IORInterceptor TAO_ObjRefTemplate TAO_Valuetype TAO_IFR_Client TAO_Security CIAO_Client - idlflags += -I $(TAO_ROOT) -I$ $(TAO_ROOT)/orbsvcs/orbsvcs -Wb,export_include=CIAO_Container_Export.h -Wb,pre_include="ace/pre.h" -Wb,post_include="ace/post.h" + idlflags += -I $(TAO_ROOT) -I $(TAO_ROOT)/orbsvcs/orbsvcs -Wb,export_include=CIAO_Container_Export.h -Wb,export_macro=CIAO_CONTAINER_Export -Wb,pre_include="ace/pre.h" -Wb,post_include="ace/post.h" dllflags = CIAO_CONTAINER_BUILD_DLL includes += $(TAO_ROOT)/orbsvcs/orbsvcs + libpaths += $(TAO_ROOT)/tao/PortableServer $(TAO_ROOT)/tao/IORInterceptor $(TAO_ROOT)/tao/ObjRefTemplate $(TAO_ROOT)/tao/IFR_Client $(TAO_ROOT)/tao/Valuetype $(TAO_ROOT)/orbsvcs/orbsvcs IDL_Files { CCM_Transaction.idl @@ -51,11 +53,12 @@ project (CIAO_Container) : taolib_with_idl { project (CIAO_Server) :taolib_with_idl { depends += CIAO_Container sharedname = CIAO_Server - libs += TAO TAO_PortableServer TAO_IORInterceptor TAO_ObjRefTemplate TAO_Valuetype TAO_IFR_Client TAO_Security - idlflags += -I$(TAO_ROOT) -I$(TAO_ROOT)/orbsvcs/orbsvcs -Wb,export_include=CIAO_Server_Export.h -Wb,pre_include="ace/pre.h" -Wb,post_include="ace/post.h" + libs += TAO TAO_PortableServer TAO_IORInterceptor TAO_ObjRefTemplate TAO_Valuetype TAO_IFR_Client TAO_Security CIAO_Client + idlflags += -I$(TAO_ROOT) -I$(TAO_ROOT)/orbsvcs/orbsvcs -Wb,export_include=CIAO_Server_Export.h -Wb,export_macro=CIAO_SERVER_Export -Wb,pre_include="ace/pre.h" -Wb,post_include="ace/post.h" dllflags = CIAO_SERVER_BUILD_DLL includes += $(TAO_ROOT)/orbsvcs/orbsvcs + libpaths += $(TAO_ROOT)/tao/PortableServer $(TAO_ROOT)/tao/IORInterceptor $(TAO_ROOT)/tao/ObjRefTemplate $(TAO_ROOT)/tao/IFR_Client $(TAO_ROOT)/tao/Valuetype $(TAO_ROOT)/orbsvcs/orbsvcs IDL_Files { CCM_Deployment.idl |