Wed Nov 4 11:50:31 UTC 2009 Johnny Willemsen <jwillemsen@remedy.nl>

        * ccm/ComponentServer/CCM_ComponentServer.mpc:
          Reduced the number of source files generates, generate
          export files

        * ccm/ComponentServer/DAnCE_ComponentServer_stub_export.h:
        * ccm/ComponentServer/DAnCE_ComponentServer_svnt_export.h:
          Removed, will be generated by TAO_IDL from now

4 files changed, 25 insertions, 122 deletions

diff --git a/CIAO/ChangeLog b/CIAO/ChangeLog
index 35d132cbb9c..944964ed48f 100644
--- a/CIAO/ChangeLog
+++ b/CIAO/ChangeLog
@@ -1,3 +1,13 @@
+Wed Nov  4 11:50:31 UTC 2009  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * ccm/ComponentServer/CCM_ComponentServer.mpc:
+          Reduced the number of source files generates, generate
+          export files
+
+        * ccm/ComponentServer/DAnCE_ComponentServer_stub_export.h:
+        * ccm/ComponentServer/DAnCE_ComponentServer_svnt_export.h:
+          Removed, will be generated by TAO_IDL from now
+
 Wed Nov  4 11:30:31 UTC 2009  Johnny Willemsen  <jwillemsen@remedy.nl>
 
         * ciao/ComponentServer/CIAO_ComponentInstallation_Impl.h
diff --git a/CIAO/ccm/ComponentServer/CCM_ComponentServer.mpc b/CIAO/ccm/ComponentServer/CCM_ComponentServer.mpc
index f80f0905a91..22461f0c067 100644
--- a/CIAO/ccm/ComponentServer/CCM_ComponentServer.mpc
+++ b/CIAO/ccm/ComponentServer/CCM_ComponentServer.mpc
@@ -2,18 +2,28 @@
 // $Id$
 
 project(CCM_ComponentServer_IDL) : ciaoidldefaults, anytypecode {
-  idlflags     += -Wb,stub_export_macro=DAnCE_ComponentServer_stub_Export
-  idlflags     += -Wb,stub_export_include=DAnCE_ComponentServer_stub_export.h
-  idlflags     += -Wb,skel_export_macro=DAnCE_ComponentServer_svnt_Export
-  idlflags     += -Wb,skel_export_include=DAnCE_ComponentServer_svnt_export.h
+  idlflags     += -Wb,stub_export_macro=DANCE_COMPONENTSERVER_STUB_Export \
+                  -Wb,stub_export_include=DAnCE_ComponentServer_stub_export.h \
+                  -Wb,skel_export_macro=DANCE_COMPONENTSERVER_SVNT_Export \
+                  -Wb,skel_export_include=DAnCE_ComponentServer_svnt_export.h \
+                  -Gxhst -Gxhsk
 
   custom_only = 1
 
   IDL_Files {
-    CCM_ComponentServer.idl
+    idlflags += -SS -Sci
     CCM_ComponentServer_Base.idl
+  }
+
+  IDL_Files {
+    idlflags += -Ssi
     CCM_ComponentServer_Client.idl
   }
+
+  IDL_Files {
+    idlflags += -Ssi
+    CCM_ComponentServer.idl
+  }
 }
 
 project(CCM_ComponentServer_stub) : ciaolib_with_idl, ciao_output, messaging, ccm_stub, anytypecode, ciao_lib  {
@@ -49,7 +59,6 @@ project(CCM_ComponentServer_svnt) : ciaolib_with_idl, ciao_output, messaging, cc
   Source_Files {
     CCM_ComponentServerS.cpp
     CCM_ComponentServer_ClientS.cpp
-    CCM_ComponentServer_BaseS.cpp
   }
   IDL_Files {
   }
diff --git a/CIAO/ccm/ComponentServer/DAnCE_ComponentServer_stub_export.h b/CIAO/ccm/ComponentServer/DAnCE_ComponentServer_stub_export.h
deleted file mode 100644
index f4e188e2df0..00000000000
--- a/CIAO/ccm/ComponentServer/DAnCE_ComponentServer_stub_export.h
+++ /dev/null
@@ -1,58 +0,0 @@
-
-// -*- C++ -*-
-// $Id$
-// Definition for Win32 Export directives.
-// This file is generated automatically by generate_export_file.pl DAnCE_ComponentServer_stub
-// ------------------------------
-#ifndef DANCE_COMPONENTSERVER_STUB_EXPORT_H
-#define DANCE_COMPONENTSERVER_STUB_EXPORT_H
-
-#include "ace/config-all.h"
-
-#if defined (ACE_AS_STATIC_LIBS) && !defined (DANCE_COMPONENTSERVER_STUB_HAS_DLL)
-#  define DANCE_COMPONENTSERVER_STUB_HAS_DLL 0
-#endif /* ACE_AS_STATIC_LIBS && DANCE_COMPONENTSERVER_STUB_HAS_DLL */
-
-#if !defined (DANCE_COMPONENTSERVER_STUB_HAS_DLL)
-#  define DANCE_COMPONENTSERVER_STUB_HAS_DLL 1
-#endif /* ! DANCE_COMPONENTSERVER_STUB_HAS_DLL */
-
-#if defined (DANCE_COMPONENTSERVER_STUB_HAS_DLL) && (DANCE_COMPONENTSERVER_STUB_HAS_DLL == 1)
-#  if defined (DANCE_COMPONENTSERVER_STUB_BUILD_DLL)
-#    define DAnCE_ComponentServer_stub_Export ACE_Proper_Export_Flag
-#    define DANCE_COMPONENTSERVER_STUB_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
-#    define DANCE_COMPONENTSERVER_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  else /* DANCE_COMPONENTSERVER_STUB_BUILD_DLL */
-#    define DAnCE_ComponentServer_stub_Export ACE_Proper_Import_Flag
-#    define DANCE_COMPONENTSERVER_STUB_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
-#    define DANCE_COMPONENTSERVER_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  endif /* DANCE_COMPONENTSERVER_STUB_BUILD_DLL */
-#else /* DANCE_COMPONENTSERVER_STUB_HAS_DLL == 1 */
-#  define DAnCE_ComponentServer_stub_Export
-#  define DANCE_COMPONENTSERVER_STUB_SINGLETON_DECLARATION(T)
-#  define DANCE_COMPONENTSERVER_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#endif /* DANCE_COMPONENTSERVER_STUB_HAS_DLL == 1 */
-
-// Set DANCE_COMPONENTSERVER_STUB_NTRACE = 0 to turn on library specific tracing even if
-// tracing is turned off for ACE.
-#if !defined (DANCE_COMPONENTSERVER_STUB_NTRACE)
-#  if (ACE_NTRACE == 1)
-#    define DANCE_COMPONENTSERVER_STUB_NTRACE 1
-#  else /* (ACE_NTRACE == 1) */
-#    define DANCE_COMPONENTSERVER_STUB_NTRACE 0
-#  endif /* (ACE_NTRACE == 1) */
-#endif /* !DANCE_COMPONENTSERVER_STUB_NTRACE */
-
-#if (DANCE_COMPONENTSERVER_STUB_NTRACE == 1)
-#  define DANCE_COMPONENTSERVER_STUB_TRACE(X)
-#else /* (DANCE_COMPONENTSERVER_STUB_NTRACE == 1) */
-#  if !defined (ACE_HAS_TRACE)
-#    define ACE_HAS_TRACE
-#  endif /* ACE_HAS_TRACE */
-#  define DANCE_COMPONENTSERVER_STUB_TRACE(X) ACE_TRACE_IMPL(X)
-#  include "ace/Trace.h"
-#endif /* (DANCE_COMPONENTSERVER_STUB_NTRACE == 1) */
-
-#endif /* DANCE_COMPONENTSERVER_STUB_EXPORT_H */
-
-// End of auto generated file.
diff --git a/CIAO/ccm/ComponentServer/DAnCE_ComponentServer_svnt_export.h b/CIAO/ccm/ComponentServer/DAnCE_ComponentServer_svnt_export.h
deleted file mode 100644
index 475047b4e16..00000000000
--- a/CIAO/ccm/ComponentServer/DAnCE_ComponentServer_svnt_export.h
+++ /dev/null
@@ -1,58 +0,0 @@
-
-// -*- C++ -*-
-// $Id$
-// Definition for Win32 Export directives.
-// This file is generated automatically by generate_export_file.pl DAnCE_ComponentServer_svnt
-// ------------------------------
-#ifndef DANCE_COMPONENTSERVER_SVNT_EXPORT_H
-#define DANCE_COMPONENTSERVER_SVNT_EXPORT_H
-
-#include "ace/config-all.h"
-
-#if defined (ACE_AS_STATIC_LIBS) && !defined (DANCE_COMPONENTSERVER_SVNT_HAS_DLL)
-#  define DANCE_COMPONENTSERVER_SVNT_HAS_DLL 0
-#endif /* ACE_AS_STATIC_LIBS && DANCE_COMPONENTSERVER_SVNT_HAS_DLL */
-
-#if !defined (DANCE_COMPONENTSERVER_SVNT_HAS_DLL)
-#  define DANCE_COMPONENTSERVER_SVNT_HAS_DLL 1
-#endif /* ! DANCE_COMPONENTSERVER_SVNT_HAS_DLL */
-
-#if defined (DANCE_COMPONENTSERVER_SVNT_HAS_DLL) && (DANCE_COMPONENTSERVER_SVNT_HAS_DLL == 1)
-#  if defined (DANCE_COMPONENTSERVER_SVNT_BUILD_DLL)
-#    define DAnCE_ComponentServer_svnt_Export ACE_Proper_Export_Flag
-#    define DANCE_COMPONENTSERVER_SVNT_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
-#    define DANCE_COMPONENTSERVER_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  else /* DANCE_COMPONENTSERVER_SVNT_BUILD_DLL */
-#    define DAnCE_ComponentServer_svnt_Export ACE_Proper_Import_Flag
-#    define DANCE_COMPONENTSERVER_SVNT_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
-#    define DANCE_COMPONENTSERVER_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  endif /* DANCE_COMPONENTSERVER_SVNT_BUILD_DLL */
-#else /* DANCE_COMPONENTSERVER_SVNT_HAS_DLL == 1 */
-#  define DAnCE_ComponentServer_svnt_Export
-#  define DANCE_COMPONENTSERVER_SVNT_SINGLETON_DECLARATION(T)
-#  define DANCE_COMPONENTSERVER_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#endif /* DANCE_COMPONENTSERVER_SVNT_HAS_DLL == 1 */
-
-// Set DANCE_COMPONENTSERVER_SVNT_NTRACE = 0 to turn on library specific tracing even if
-// tracing is turned off for ACE.
-#if !defined (DANCE_COMPONENTSERVER_SVNT_NTRACE)
-#  if (ACE_NTRACE == 1)
-#    define DANCE_COMPONENTSERVER_SVNT_NTRACE 1
-#  else /* (ACE_NTRACE == 1) */
-#    define DANCE_COMPONENTSERVER_SVNT_NTRACE 0
-#  endif /* (ACE_NTRACE == 1) */
-#endif /* !DANCE_COMPONENTSERVER_SVNT_NTRACE */
-
-#if (DANCE_COMPONENTSERVER_SVNT_NTRACE == 1)
-#  define DANCE_COMPONENTSERVER_SVNT_TRACE(X)
-#else /* (DANCE_COMPONENTSERVER_SVNT_NTRACE == 1) */
-#  if !defined (ACE_HAS_TRACE)
-#    define ACE_HAS_TRACE
-#  endif /* ACE_HAS_TRACE */
-#  define DANCE_COMPONENTSERVER_SVNT_TRACE(X) ACE_TRACE_IMPL(X)
-#  include "ace/Trace.h"
-#endif /* (DANCE_COMPONENTSERVER_SVNT_NTRACE == 1) */
-
-#endif /* DANCE_COMPONENTSERVER_SVNT_EXPORT_H */
-
-// End of auto generated file.