diff options
| author | parsons <parsons@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2006-05-29 17:49:36 +0000 |
|---|---|---|
| committer | parsons <parsons@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2006-05-29 17:49:36 +0000 |
| commit | a1cc288370d6465169659c4ff89917210da8858e (patch) | |
| tree | be67769b48a6193c5cfb33c58b49ed567eb85b1c /TAO/CIAO | |
| parent | de8c113a41b792e5985bbdae84c3e10382737ce4 (diff) | |
| download | ATCD-a1cc288370d6465169659c4ff89917210da8858e.tar.gz | |
ChangeLogTag: Mon May 29 17:44:01 UTC 2006 Jeff Parsons <j.parsons@vanderbilt.edu>
Diffstat (limited to 'TAO/CIAO')
| -rw-r--r-- | TAO/CIAO/ChangeLog | 10 | ||||
| -rw-r--r-- | TAO/CIAO/examples/Display/Display_Base/Display_Base.mpc | 16 |
2 files changed, 20 insertions, 6 deletions
diff --git a/TAO/CIAO/ChangeLog b/TAO/CIAO/ChangeLog index cb450211f1c..7f9802752ac 100644 --- a/TAO/CIAO/ChangeLog +++ b/TAO/CIAO/ChangeLog @@ -1,3 +1,13 @@ +Mon May 29 17:44:01 UTC 2006 Jeff Parsons <j.parsons@vanderbilt.edu> + + * examples/Display/Display_Base/Display_Base.mpc: + + Changed the base project of Display_Base_stub from + ciao_client_dnc to ciao_events_base_dnc, in order to pull + in a needed dependency on CIAO_DnC_Container. Thanks to + Ming Xiong <mxiong@dre.vanderbilt.edu> for supplying the + fix. + Mon May 29 15:32:38 UTC 2006 Jeff Parsons <j.parsons@vanderbilt.edu> * examples/Display/NavDisplay/NavDisplay.mpc: diff --git a/TAO/CIAO/examples/Display/Display_Base/Display_Base.mpc b/TAO/CIAO/examples/Display/Display_Base/Display_Base.mpc index 2e58d9ac2fb..04442c09239 100644 --- a/TAO/CIAO/examples/Display/Display_Base/Display_Base.mpc +++ b/TAO/CIAO/examples/Display/Display_Base/Display_Base.mpc @@ -1,10 +1,13 @@ // $Id$ // This file is generated with "generate_component_mpc.pl -n Display_Base" -project(Display_Base_stub): ciao_client_dnc { - +project(Display_Base_stub): ciao_events_base_dnc { + sharedname = Display_Base_stub - idlflags += -Wb,stub_export_macro=DISPLAY_BASE_STUB_Export -Wb,stub_export_include=Display_Base_stub_export.h -Wb,skel_export_macro=DISPLAY_BASE_SVNT_Export -Wb,skel_export_include=Display_Base_svnt_export.h + idlflags += -Wb,stub_export_macro=DISPLAY_BASE_STUB_Export \ + -Wb,stub_export_include=Display_Base_stub_export.h \ + -Wb,skel_export_macro=DISPLAY_BASE_SVNT_Export \ + -Wb,skel_export_include=Display_Base_svnt_export.h dynamicflags = DISPLAY_BASE_STUB_BUILD_DLL IDL_Files { @@ -19,9 +22,10 @@ project(Display_Base_stub): ciao_client_dnc { project(Display_Base_svnt) : ciao_servant_dnc { after += Display_Base_stub sharedname = Display_Base_svnt - libs += Display_Base_stub - - idlflags += -Wb,export_macro=DISPLAY_BASE_SVNT_Export -Wb,export_include=Display_Base_svnt_export.h + libs += Display_Base_stub + + idlflags += -Wb,export_macro=DISPLAY_BASE_SVNT_Export \ + -Wb,export_include=Display_Base_svnt_export.h dynamicflags = DISPLAY_BASE_SVNT_BUILD_DLL IDL_Files { |