ChangeLogTag: Mon Nov 13 16:54:47 UTC 2006 Jeff Parsons <j.parsons@vanderbilt.edu>

5 files changed, 83 insertions, 71 deletions

diff --git a/CIAO/examples/Null_Component/Null_Component.mpc b/CIAO/examples/Null_Component/Null_Component.mpc
index 087c7275063..079a2dcf144 100644
--- a/CIAO/examples/Null_Component/Null_Component.mpc
+++ b/CIAO/examples/Null_Component/Null_Component.mpc
@@ -5,7 +5,10 @@ project(Null_Interface_Null_Component_stub): ciao_client_dnc {
   after += Null_Interface_stub
   sharedname = Null_Component_stub
   libs += Null_Interface_stub
-  idlflags += -Wb,stub_export_macro=NULL_COMPONENT_STUB_Export -Wb,stub_export_include=Null_Component_stub_export.h -Wb,skel_export_macro=NULL_COMPONENT_SVNT_Export -Wb,skel_export_include=Null_Component_svnt_export.h
+  idlflags += -Wb,stub_export_macro=NULL_COMPONENT_STUB_Export \
+              -Wb,stub_export_include=Null_Component_stub_export.h \
+              -Wb,skel_export_macro=NULL_COMPONENT_SVNT_Export \
+              -Wb,skel_export_include=Null_Component_svnt_export.h
   dynamicflags   = NULL_COMPONENT_STUB_BUILD_DLL
 
   IDL_Files {
@@ -18,11 +21,12 @@ project(Null_Interface_Null_Component_stub): ciao_client_dnc {
 }
 
 project(Null_Interface_Null_Component_svnt) : ciao_servant_dnc {
-  after += Null_Interface_svnt Null_Interface_Null_Component_stub
+  after += Null_Interface_skel Null_Interface_Null_Component_stub
   sharedname  = Null_Component_svnt
   libs    += Null_Component_stub Null_Interface_stub Null_Interface_svnt
 
-  idlflags  +=  -Wb,export_macro=NULL_COMPONENT_SVNT_Export -Wb,export_include=Null_Component_svnt_export.h
+  idlflags += -Wb,export_macro=NULL_COMPONENT_SVNT_Export \
+              -Wb,export_include=Null_Component_svnt_export.h
   dynamicflags = NULL_COMPONENT_SVNT_BUILD_DLL
 
   CIDL_Files {
diff --git a/CIAO/examples/Null_Component/Null_Interface.mpc b/CIAO/examples/Null_Component/Null_Interface.mpc
index e5eb5b31a1f..9e66ae6ea65 100644
--- a/CIAO/examples/Null_Component/Null_Interface.mpc
+++ b/CIAO/examples/Null_Component/Null_Interface.mpc
@@ -1,10 +1,14 @@
 // $Id$
 // This file is generated with "generate_component_mpc.pl -n Null_Interface"
 
-project(Null_Interface_stub): ciao_client_dnc {
-  
+project(Null_Interface_stub): taolib_with_idl {
+
   sharedname = Null_Interface_stub
-  idlflags += -Wb,stub_export_macro=NULL_INTERFACE_STUB_Export -Wb,stub_export_include=Null_Interface_stub_export.h -Wb,skel_export_macro=NULL_INTERFACE_SVNT_Export -Wb,skel_export_include=Null_Interface_svnt_export.h
+  idlflags += -St \
+              -Wb,stub_export_macro=NULL_INTERFACE_STUB_Export \
+              -Wb,stub_export_include=Null_Interface_stub_export.h \
+              -Wb,skel_export_macro=NULL_INTERFACE_SKEL_Export \
+              -Wb,skel_export_include=Null_Interface_skel_export.h
   dynamicflags   = NULL_INTERFACE_STUB_BUILD_DLL
 
   IDL_Files {
@@ -16,13 +20,17 @@ project(Null_Interface_stub): ciao_client_dnc {
   }
 }
 
-project(Null_Interface_svnt) : ciao_servant_dnc {
+project(Null_Interface_skel) : portableserver {
   after +=  Null_Interface_stub
-  sharedname  = Null_Interface_svnt
-  libs    += Null_Interface_stub 
-  
-  idlflags  +=  -Wb,export_macro=NULL_INTERFACE_SVNT_Export -Wb,export_include=Null_Interface_svnt_export.h
-  dynamicflags = NULL_INTERFACE_SVNT_BUILD_DLL
+  sharedname  = Null_Interface_skel
+  libs    += Null_Interface_stub
+
+  idlflags += -St \
+              -Wb,stub_export_macro=NULL_INTERFACE_STUB_Export \
+              -Wb,stub_export_include=Null_Interface_stub_export.h \
+              -Wb,skel_export_macro=NULL_INTERFACE_SKEL_Export \
+              -Wb,skel_export_include=Null_Interface_skel_export.h
+  dynamicflags = NULL_INTERFACE_SKEL_BUILD_DLL
 
   IDL_Files {
     Null_Interface.idl
diff --git a/CIAO/examples/Null_Component/Null_Interface_skel_export.h b/CIAO/examples/Null_Component/Null_Interface_skel_export.h
new file mode 100644
index 00000000000..239c5cf3f6a
--- /dev/null
+++ b/CIAO/examples/Null_Component/Null_Interface_skel_export.h
@@ -0,0 +1,58 @@
+
+// -*- C++ -*-
+// $Id$
+// Definition for Win32 Export directives.
+// This file is generated automatically by generate_export_file.pl NULL_INTERFACE_SVNT
+// ------------------------------
+#ifndef NULL_INTERFACE_SKEL_EXPORT_H
+#define NULL_INTERFACE_SKEL_EXPORT_H
+
+#include "ace/config-all.h"
+
+#if defined (ACE_AS_STATIC_LIBS) && !defined (NULL_INTERFACE_SKEL_HAS_DLL)
+#  define NULL_INTERFACE_SKEL_HAS_DLL 0
+#endif /* ACE_AS_STATIC_LIBS && NULL_INTERFACE_SKEL_HAS_DLL */
+
+#if !defined (NULL_INTERFACE_SKEL_HAS_DLL)
+#  define NULL_INTERFACE_SKEL_HAS_DLL 1
+#endif /* ! NULL_INTERFACE_SKEL_HAS_DLL */
+
+#if defined (NULL_INTERFACE_SKEL_HAS_DLL) && (NULL_INTERFACE_SKEL_HAS_DLL == 1)
+#  if defined (NULL_INTERFACE_SKEL_BUILD_DLL)
+#    define NULL_INTERFACE_SKEL_Export ACE_Proper_Export_Flag
+#    define NULL_INTERFACE_SKEL_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
+#    define NULL_INTERFACE_SKEL_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#  else /* NULL_INTERFACE_SKEL_BUILD_DLL */
+#    define NULL_INTERFACE_SKEL_Export ACE_Proper_Import_Flag
+#    define NULL_INTERFACE_SKEL_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
+#    define NULL_INTERFACE_SKEL_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#  endif /* NULL_INTERFACE_SKEL_BUILD_DLL */
+#else /* NULL_INTERFACE_SKEL_HAS_DLL == 1 */
+#  define NULL_INTERFACE_SKEL_Export
+#  define NULL_INTERFACE_SKEL_SINGLETON_DECLARATION(T)
+#  define NULL_INTERFACE_SKEL_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#endif /* NULL_INTERFACE_SKEL_HAS_DLL == 1 */
+
+// Set NULL_INTERFACE_SKEL_NTRACE = 0 to turn on library specific tracing even if
+// tracing is turned off for ACE.
+#if !defined (NULL_INTERFACE_SKEL_NTRACE)
+#  if (ACE_NTRACE == 1)
+#    define NULL_INTERFACE_SKEL_NTRACE 1
+#  else /* (ACE_NTRACE == 1) */
+#    define NULL_INTERFACE_SKEL_NTRACE 0
+#  endif /* (ACE_NTRACE == 1) */
+#endif /* !NULL_INTERFACE_SKEL_NTRACE */
+
+#if (NULL_INTERFACE_SKEL_NTRACE == 1)
+#  define NULL_INTERFACE_SKEL_TRACE(X)
+#else /* (NULL_INTERFACE_SKEL_NTRACE == 1) */
+#  if !defined (ACE_HAS_TRACE)
+#    define ACE_HAS_TRACE
+#  endif /* ACE_HAS_TRACE */
+#  define NULL_INTERFACE_SKEL_TRACE(X) ACE_TRACE_IMPL(X)
+#  include "ace/Trace.h"
+#endif /* (NULL_INTERFACE_SKEL_NTRACE == 1) */
+
+#endif /* NULL_INTERFACE_SKEL_EXPORT_H */
+
+// End of auto generated file.
diff --git a/CIAO/examples/Null_Component/Null_Interface_svnt_export.h b/CIAO/examples/Null_Component/Null_Interface_svnt_export.h
deleted file mode 100644
index 9d4455adcec..00000000000
--- a/CIAO/examples/Null_Component/Null_Interface_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 NULL_INTERFACE_SVNT
-// ------------------------------
-#ifndef NULL_INTERFACE_SVNT_EXPORT_H
-#define NULL_INTERFACE_SVNT_EXPORT_H
-
-#include "ace/config-all.h"
-
-#if defined (ACE_AS_STATIC_LIBS) && !defined (NULL_INTERFACE_SVNT_HAS_DLL)
-#  define NULL_INTERFACE_SVNT_HAS_DLL 0
-#endif /* ACE_AS_STATIC_LIBS && NULL_INTERFACE_SVNT_HAS_DLL */
-
-#if !defined (NULL_INTERFACE_SVNT_HAS_DLL)
-#  define NULL_INTERFACE_SVNT_HAS_DLL 1
-#endif /* ! NULL_INTERFACE_SVNT_HAS_DLL */
-
-#if defined (NULL_INTERFACE_SVNT_HAS_DLL) && (NULL_INTERFACE_SVNT_HAS_DLL == 1)
-#  if defined (NULL_INTERFACE_SVNT_BUILD_DLL)
-#    define NULL_INTERFACE_SVNT_Export ACE_Proper_Export_Flag
-#    define NULL_INTERFACE_SVNT_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
-#    define NULL_INTERFACE_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  else /* NULL_INTERFACE_SVNT_BUILD_DLL */
-#    define NULL_INTERFACE_SVNT_Export ACE_Proper_Import_Flag
-#    define NULL_INTERFACE_SVNT_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
-#    define NULL_INTERFACE_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  endif /* NULL_INTERFACE_SVNT_BUILD_DLL */
-#else /* NULL_INTERFACE_SVNT_HAS_DLL == 1 */
-#  define NULL_INTERFACE_SVNT_Export
-#  define NULL_INTERFACE_SVNT_SINGLETON_DECLARATION(T)
-#  define NULL_INTERFACE_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#endif /* NULL_INTERFACE_SVNT_HAS_DLL == 1 */
-
-// Set NULL_INTERFACE_SVNT_NTRACE = 0 to turn on library specific tracing even if
-// tracing is turned off for ACE.
-#if !defined (NULL_INTERFACE_SVNT_NTRACE)
-#  if (ACE_NTRACE == 1)
-#    define NULL_INTERFACE_SVNT_NTRACE 1
-#  else /* (ACE_NTRACE == 1) */
-#    define NULL_INTERFACE_SVNT_NTRACE 0
-#  endif /* (ACE_NTRACE == 1) */
-#endif /* !NULL_INTERFACE_SVNT_NTRACE */
-
-#if (NULL_INTERFACE_SVNT_NTRACE == 1)
-#  define NULL_INTERFACE_SVNT_TRACE(X)
-#else /* (NULL_INTERFACE_SVNT_NTRACE == 1) */
-#  if !defined (ACE_HAS_TRACE)
-#    define ACE_HAS_TRACE
-#  endif /* ACE_HAS_TRACE */
-#  define NULL_INTERFACE_SVNT_TRACE(X) ACE_TRACE_IMPL(X)
-#  include "ace/Trace.h"
-#endif /* (NULL_INTERFACE_SVNT_NTRACE == 1) */
-
-#endif /* NULL_INTERFACE_SVNT_EXPORT_H */
-
-// End of auto generated file.
diff --git a/CIAO/examples/Null_Component/StaticDAnCEApp.mpc b/CIAO/examples/Null_Component/StaticDAnCEApp.mpc
index be737fa37de..90d141854e4 100644
--- a/CIAO/examples/Null_Component/StaticDAnCEApp.mpc
+++ b/CIAO/examples/Null_Component/StaticDAnCEApp.mpc
@@ -6,7 +6,7 @@ project(StaticDAnCEApp *): ciao_static_dnc_app, iortable {
   exename   = StaticDAnCEApp
 
   libs     += Null_Interface_stub
-  libs     += Null_Interface_svnt
+  libs     += Null_Interface_skel
   libs     += Null_Component_stub
   libs     += Null_Component_svnt
   libs     += Null_Component_exec