diff options
| author | lut <lut@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2004-06-08 22:23:18 +0000 |
|---|---|---|
| committer | lut <lut@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2004-06-08 22:23:18 +0000 |
| commit | e07a52a2ca1c2b31eed7a61ef77f45bb7e54d900 (patch) | |
| tree | 0124b275188013dcda5407d509188ae057ab5009 /TAO | |
| parent | 28eaf06a58341297fbadc4fde1d1d9f6f0f5b9cf (diff) | |
| download | ATCD-e07a52a2ca1c2b31eed7a61ef77f45bb7e54d900.tar.gz | |
*** empty log message ***
Diffstat (limited to 'TAO')
| -rw-r--r-- | TAO/CIAO/ChangeLog | 6 | ||||
| -rw-r--r-- | TAO/CIAO/DnC/NodeApplication/NodeApplication.mpc | 9 | ||||
| -rw-r--r-- | TAO/CIAO/DnC/ciao/CCM_Core.mpc | 6 |
3 files changed, 9 insertions, 12 deletions
diff --git a/TAO/CIAO/ChangeLog b/TAO/CIAO/ChangeLog index bcbc5bf77d5..f88dbcc1175 100644 --- a/TAO/CIAO/ChangeLog +++ b/TAO/CIAO/ChangeLog @@ -1,3 +1,9 @@ +Tue Jun 8 17:18:28 2004 Tao Lu <lu@dre.vanderbilt.edu> + + * DnC/NodeApplication/NodeApplication.mpc: + * DnC/ciao/CCM_Core.mpc: + Fixed another set of linking problem about export macros. + Tue Jun 8 14:15:31 2004 Gan Deng <dengg@dre.vanderbilt.edu> * DnC/RepositoryManager/RepositoryManager.mpc: diff --git a/TAO/CIAO/DnC/NodeApplication/NodeApplication.mpc b/TAO/CIAO/DnC/NodeApplication/NodeApplication.mpc index 6d694f14ebc..5783285136f 100644 --- a/TAO/CIAO/DnC/NodeApplication/NodeApplication.mpc +++ b/TAO/CIAO/DnC/NodeApplication/NodeApplication.mpc @@ -12,12 +12,3 @@ project(NodeApplication): ciao_server_dnc, ciao_deployment_stub { NodeApplication.cpp } } - -//project(NodeApplication_test_client) : ciao_server { -// requries +=dnc -// exename =NodeApplication_client -// Source_Files { -// NodeApplication_test_client.cpp -// } - -//} diff --git a/TAO/CIAO/DnC/ciao/CCM_Core.mpc b/TAO/CIAO/DnC/ciao/CCM_Core.mpc index 62e4f3d04cc..8d0ebd9afbe 100644 --- a/TAO/CIAO/DnC/ciao/CCM_Core.mpc +++ b/TAO/CIAO/DnC/ciao/CCM_Core.mpc @@ -99,9 +99,7 @@ project(Deployment_stub) : taolib_with_idl, valuetype , ciao_server_dnc { Source_Files { DeploymentC.cpp - NodeApp_CB_Impl.cpp NodeApplication_CallBackC.cpp - NodeApplication_CallBackS.cpp } } @@ -111,12 +109,14 @@ project(Deployment_svnt) : taolib_with_idl, portableserver, ciao_server_dnc { sharedname = Deployment_svnt dynamicflags = DEPLOYMENT_SVNT_BUILD_DLL libs += Deployment_stub - idlflags += -Wb,export_macro=Deployment_svnt_Export -Wb,export_include=Deployment_svnt_export.h + idlflags += -Wb,stub_export_macro=Deployment_stub_Export -Wb,stub_export_include=Deployment_stub_export.h -Wb,skel_export_macro=Deployment_svnt_Export -Wb,skel_export_include=Deployment_svnt_export.h IDL_Files { } Source_Files { DeploymentS.cpp + NodeApp_CB_Impl.cpp + NodeApplication_CallBackS.cpp } } |