ChangeLogTag: Wed Nov 15 19:56:46 UTC 2006 Jeff Parsons <j.parsons@vanderbilt.edu>

6 files changed, 163 insertions, 96 deletions

diff --git a/CIAO/examples/Display/Display_Base/Display_Base.mpc b/CIAO/examples/Display/Display_Base/Display_Base.mpc
index f706edb968d..4bc2a9680e0 100644
--- a/CIAO/examples/Display/Display_Base/Display_Base.mpc
+++ b/CIAO/examples/Display/Display_Base/Display_Base.mpc
@@ -4,11 +4,12 @@
 project(Display_Base_stub): ciao_client_dnc {
 
   sharedname = Display_Base_stub
+  idlflags -= -GT
   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
+              -Wb,skel_export_macro=DISPLAY_BASE_SKEL_Export \
+              -Wb,skel_export_include=Display_Base_skel_export.h
+  dynamicflags = DISPLAY_BASE_STUB_BUILD_DLL
 
   IDL_Files {
     Display_Base.idl
@@ -17,16 +18,23 @@ project(Display_Base_stub): ciao_client_dnc {
   Source_Files {
     Display_BaseC.cpp
   }
+
+  Header_Files {
+    Display_Base_stub_export.h
+  }
 }
 
-project(Display_Base_svnt) : ciao_servant_dnc {
+project(Display_Base_skel) : ciao_servant_dnc {
   after +=  Display_Base_stub
-  sharedname  = Display_Base_svnt
+  sharedname  = Display_Base_skel
   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
+  idlflags -= -GT
+  idlflags += -Wb,stub_export_macro=DISPLAY_BASE_STUB_Export \
+              -Wb,stub_export_include=Display_Base_stub_export.h \
+              -Wb,skel_export_macro=DISPLAY_BASE_SKEL_Export \
+              -Wb,skel_export_include=Display_Base_skel_export.h
+  dynamicflags = DISPLAY_BASE_SKEL_BUILD_DLL
 
   IDL_Files {
     Display_Base.idl
@@ -35,6 +43,10 @@ project(Display_Base_svnt) : ciao_servant_dnc {
   Source_Files {
     Display_BaseS.cpp
   }
+
+  Header_Files {
+    Display_Base_skel_export.h
+  }
 }
 
 
diff --git a/CIAO/examples/Display/Display_Base/Display_Base_skel_export.h b/CIAO/examples/Display/Display_Base/Display_Base_skel_export.h
new file mode 100644
index 00000000000..2dc444fe8e0
--- /dev/null
+++ b/CIAO/examples/Display/Display_Base/Display_Base_skel_export.h
@@ -0,0 +1,58 @@
+
+// -*- C++ -*-
+// $Id$
+// Definition for Win32 Export directives.
+// This file is generated automatically by generate_export_file.pl DISPLAY_BASE_SVNT
+// ------------------------------
+#ifndef DISPLAY_BASE_SKEL_EXPORT_H
+#define DISPLAY_BASE_SKEL_EXPORT_H
+
+#include "ace/config-all.h"
+
+#if defined (ACE_AS_STATIC_LIBS) && !defined (DISPLAY_BASE_SKEL_HAS_DLL)
+#  define DISPLAY_BASE_SKEL_HAS_DLL 0
+#endif /* ACE_AS_STATIC_LIBS && DISPLAY_BASE_SKEL_HAS_DLL */
+
+#if !defined (DISPLAY_BASE_SKEL_HAS_DLL)
+#  define DISPLAY_BASE_SKEL_HAS_DLL 1
+#endif /* ! DISPLAY_BASE_SKEL_HAS_DLL */
+
+#if defined (DISPLAY_BASE_SKEL_HAS_DLL) && (DISPLAY_BASE_SKEL_HAS_DLL == 1)
+#  if defined (DISPLAY_BASE_SKEL_BUILD_DLL)
+#    define DISPLAY_BASE_SKEL_Export ACE_Proper_Export_Flag
+#    define DISPLAY_BASE_SKEL_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
+#    define DISPLAY_BASE_SKEL_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#  else /* DISPLAY_BASE_SKEL_BUILD_DLL */
+#    define DISPLAY_BASE_SKEL_Export ACE_Proper_Import_Flag
+#    define DISPLAY_BASE_SKEL_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
+#    define DISPLAY_BASE_SKEL_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#  endif /* DISPLAY_BASE_SKEL_BUILD_DLL */
+#else /* DISPLAY_BASE_SKEL_HAS_DLL == 1 */
+#  define DISPLAY_BASE_SKEL_Export
+#  define DISPLAY_BASE_SKEL_SINGLETON_DECLARATION(T)
+#  define DISPLAY_BASE_SKEL_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#endif /* DISPLAY_BASE_SKEL_HAS_DLL == 1 */
+
+// Set DISPLAY_BASE_SKEL_NTRACE = 0 to turn on library specific tracing even if
+// tracing is turned off for ACE.
+#if !defined (DISPLAY_BASE_SKEL_NTRACE)
+#  if (ACE_NTRACE == 1)
+#    define DISPLAY_BASE_SKEL_NTRACE 1
+#  else /* (ACE_NTRACE == 1) */
+#    define DISPLAY_BASE_SKEL_NTRACE 0
+#  endif /* (ACE_NTRACE == 1) */
+#endif /* !DISPLAY_BASE_SKEL_NTRACE */
+
+#if (DISPLAY_BASE_SKEL_NTRACE == 1)
+#  define DISPLAY_BASE_SKEL_TRACE(X)
+#else /* (DISPLAY_BASE_SKEL_NTRACE == 1) */
+#  if !defined (ACE_HAS_TRACE)
+#    define ACE_HAS_TRACE
+#  endif /* ACE_HAS_TRACE */
+#  define DISPLAY_BASE_SKEL_TRACE(X) ACE_TRACE_IMPL(X)
+#  include "ace/Trace.h"
+#endif /* (DISPLAY_BASE_SKEL_NTRACE == 1) */
+
+#endif /* DISPLAY_BASE_SKEL_EXPORT_H */
+
+// End of auto generated file.
diff --git a/CIAO/examples/Display/Display_Base/Display_Base_svnt_export.h b/CIAO/examples/Display/Display_Base/Display_Base_svnt_export.h
deleted file mode 100644
index 7e0460322a5..00000000000
--- a/CIAO/examples/Display/Display_Base/Display_Base_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 DISPLAY_BASE_SVNT
-// ------------------------------
-#ifndef DISPLAY_BASE_SVNT_EXPORT_H
-#define DISPLAY_BASE_SVNT_EXPORT_H
-
-#include "ace/config-all.h"
-
-#if defined (ACE_AS_STATIC_LIBS) && !defined (DISPLAY_BASE_SVNT_HAS_DLL)
-#  define DISPLAY_BASE_SVNT_HAS_DLL 0
-#endif /* ACE_AS_STATIC_LIBS && DISPLAY_BASE_SVNT_HAS_DLL */
-
-#if !defined (DISPLAY_BASE_SVNT_HAS_DLL)
-#  define DISPLAY_BASE_SVNT_HAS_DLL 1
-#endif /* ! DISPLAY_BASE_SVNT_HAS_DLL */
-
-#if defined (DISPLAY_BASE_SVNT_HAS_DLL) && (DISPLAY_BASE_SVNT_HAS_DLL == 1)
-#  if defined (DISPLAY_BASE_SVNT_BUILD_DLL)
-#    define DISPLAY_BASE_SVNT_Export ACE_Proper_Export_Flag
-#    define DISPLAY_BASE_SVNT_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
-#    define DISPLAY_BASE_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  else /* DISPLAY_BASE_SVNT_BUILD_DLL */
-#    define DISPLAY_BASE_SVNT_Export ACE_Proper_Import_Flag
-#    define DISPLAY_BASE_SVNT_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
-#    define DISPLAY_BASE_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  endif /* DISPLAY_BASE_SVNT_BUILD_DLL */
-#else /* DISPLAY_BASE_SVNT_HAS_DLL == 1 */
-#  define DISPLAY_BASE_SVNT_Export
-#  define DISPLAY_BASE_SVNT_SINGLETON_DECLARATION(T)
-#  define DISPLAY_BASE_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#endif /* DISPLAY_BASE_SVNT_HAS_DLL == 1 */
-
-// Set DISPLAY_BASE_SVNT_NTRACE = 0 to turn on library specific tracing even if
-// tracing is turned off for ACE.
-#if !defined (DISPLAY_BASE_SVNT_NTRACE)
-#  if (ACE_NTRACE == 1)
-#    define DISPLAY_BASE_SVNT_NTRACE 1
-#  else /* (ACE_NTRACE == 1) */
-#    define DISPLAY_BASE_SVNT_NTRACE 0
-#  endif /* (ACE_NTRACE == 1) */
-#endif /* !DISPLAY_BASE_SVNT_NTRACE */
-
-#if (DISPLAY_BASE_SVNT_NTRACE == 1)
-#  define DISPLAY_BASE_SVNT_TRACE(X)
-#else /* (DISPLAY_BASE_SVNT_NTRACE == 1) */
-#  if !defined (ACE_HAS_TRACE)
-#    define ACE_HAS_TRACE
-#  endif /* ACE_HAS_TRACE */
-#  define DISPLAY_BASE_SVNT_TRACE(X) ACE_TRACE_IMPL(X)
-#  include "ace/Trace.h"
-#endif /* (DISPLAY_BASE_SVNT_NTRACE == 1) */
-
-#endif /* DISPLAY_BASE_SVNT_EXPORT_H */
-
-// End of auto generated file.
diff --git a/CIAO/examples/Display/GPS/GPS.mpc b/CIAO/examples/Display/GPS/GPS.mpc
index 8ac7f0d6fba..f7e0fabbe99 100644
--- a/CIAO/examples/Display/GPS/GPS.mpc
+++ b/CIAO/examples/Display/GPS/GPS.mpc
@@ -4,7 +4,12 @@
 project(Display_Base_GPS_stub): ciao_client_dnc {
   after += Display_Base_stub
   sharedname = GPS_stub
-  idlflags += -Wb,stub_export_macro=GPS_STUB_Export -Wb,stub_export_include=GPS_stub_export.h -Wb,skel_export_macro=GPS_SVNT_Export -Wb,skel_export_include=GPS_svnt_export.h
+  idlflags -= -GT
+  idlflags += -St \
+              -Wb,stub_export_macro=GPS_STUB_Export \
+              -Wb,stub_export_include=GPS_stub_export.h \
+              -Wb,skel_export_macro=GPS_SVNT_Export \
+              -Wb,skel_export_include=GPS_svnt_export.h
   dynamicflags   = GPS_STUB_BUILD_DLL
   libs += Display_Base_stub
 
@@ -15,14 +20,21 @@ project(Display_Base_GPS_stub): ciao_client_dnc {
   Source_Files {
     GPSC.cpp
   }
+
+  Header_Files {
+    GPS_stub_export.h
+  }
 }
 
 project(Display_Base_GPS_svnt) : ciao_servant_dnc {
-  after += Display_Base_svnt Display_Base_GPS_stub
+  after += Display_Base_skel Display_Base_GPS_stub
   sharedname  = GPS_svnt
-  libs    += GPS_stub Display_Base_stub Display_Base_svnt
-  
-  idlflags  +=  -Wb,export_macro=GPS_SVNT_Export -Wb,export_include=GPS_svnt_export.h
+  libs    += GPS_stub Display_Base_stub Display_Base_skel
+
+  idlflags -= -GT
+  idlflags  +=  -SS -St \
+                -Wb,export_macro=GPS_SVNT_Export \
+                -Wb,export_include=GPS_svnt_export.h
   dynamicflags = GPS_SVNT_BUILD_DLL
 
   CIDL_Files {
@@ -38,25 +50,36 @@ project(Display_Base_GPS_svnt) : ciao_servant_dnc {
     GPSS.cpp
     GPS_svnt.cpp
   }
+
+  Header_Files {
+    GPS_svnt_export.h
+  }
 }
 
 
 project(Display_Base_GPS_exec) : ciao_component_dnc {
   after   += Display_Base_GPS_svnt
   sharedname = GPS_exec
-  libs      += GPS_stub GPS_svnt Display_Base_stub Display_Base_svnt
-  
-  idlflags  +=  -Wb,export_macro=GPS_EXEC_Export -Wb,export_include=GPS_exec_export.h
+  libs      += GPS_stub GPS_svnt Display_Base_stub Display_Base_skel
+
+  idlflags -= -GT
+  idlflags  +=  -SS -St \
+                -Wb,export_macro=GPS_EXEC_Export \
+                -Wb,export_include=GPS_exec_export.h
   dynamicflags   = GPS_EXEC_BUILD_DLL
 
   IDL_Files {
-    GPSEI.idl    
+    GPSEI.idl
   }
 
   Source_Files {
     GPSEIC.cpp
     GPS_exec.cpp
   }
+
+  Header_Files {
+    GPS_exec_export.h
+  }
 }
 
 
diff --git a/CIAO/examples/Display/NavDisplay/NavDisplay.mpc b/CIAO/examples/Display/NavDisplay/NavDisplay.mpc
index 3a32fa49d3f..990004fa48c 100644
--- a/CIAO/examples/Display/NavDisplay/NavDisplay.mpc
+++ b/CIAO/examples/Display/NavDisplay/NavDisplay.mpc
@@ -5,7 +5,9 @@ project(Display_Base_NavDisplay_stub): ciao_client_dnc {
   after += Display_Base_stub
   sharedname = NavDisplay_stub
   libs += Display_Base_stub
-  idlflags += -Wb,stub_export_macro=NAVDISPLAY_STUB_Export \
+  idlflags -= -GT
+  idlflags += -St \
+              -Wb,stub_export_macro=NAVDISPLAY_STUB_Export \
               -Wb,stub_export_include=NavDisplay_stub_export.h \
               -Wb,skel_export_macro=NAVDISPLAY_SVNT_Export \
               -Wb,skel_export_include=NavDisplay_svnt_export.h
@@ -18,16 +20,22 @@ project(Display_Base_NavDisplay_stub): ciao_client_dnc {
   Source_Files {
     NavDisplayC.cpp
   }
+
+  Header_Files {
+    NavDisplay_stub_export.h
+  }
 }
 
 project(Display_Base_NavDisplay_svnt) : ciao_servant_dnc {
-  after += Display_Base_svnt Display_Base_NavDisplay_stub
+  after += Display_Base_skel Display_Base_NavDisplay_stub
   sharedname  = NavDisplay_svnt
   libs    += NavDisplay_stub \
              Display_Base_stub \
-             Display_Base_svnt
+             Display_Base_skel
 
-  idlflags  +=  -Wb,export_macro=NAVDISPLAY_SVNT_Export \
+  idlflags -= -GT
+  idlflags  +=  -SS -St \
+                -Wb,export_macro=NAVDISPLAY_SVNT_Export \
                 -Wb,export_include=NavDisplay_svnt_export.h
   dynamicflags = NAVDISPLAY_SVNT_BUILD_DLL
 
@@ -44,6 +52,10 @@ project(Display_Base_NavDisplay_svnt) : ciao_servant_dnc {
     NavDisplayS.cpp
     NavDisplay_svnt.cpp
   }
+
+  Header_Files {
+    NavDisplay_svnt_export.h
+  }
 }
 
 
@@ -53,20 +65,20 @@ project(Display_Base_NavDisplay_exec) : ciao_component_dnc {
   libs      += NavDisplay_stub \
                NavDisplay_svnt \
                Display_Base_stub \
-               Display_Base_svnt
+               Display_Base_skel
 
-  idlflags  +=  -Wb,export_macro=NAVDISPLAY_EXEC_Export \
-                -Wb,export_include=NavDisplay_exec_export.h
-  dynamicflags   = NAVDISPLAY_EXEC_BUILD_DLL
+  dynamicflags = NAVDISPLAY_EXEC_BUILD_DLL
 
   IDL_Files {
-
   }
 
   Source_Files {
-
     NavDisplay_exec.cpp
   }
+
+  Header_Files {
+    NavDisplay_exec_export.h
+  }
 }
 
 
diff --git a/CIAO/examples/Display/RateGen/RateGen.mpc b/CIAO/examples/Display/RateGen/RateGen.mpc
index 2727c557efe..99b06b2ac3e 100644
--- a/CIAO/examples/Display/RateGen/RateGen.mpc
+++ b/CIAO/examples/Display/RateGen/RateGen.mpc
@@ -4,7 +4,12 @@
 project(Display_Base_RateGen_stub): ciao_client_dnc {
   after += Display_Base_stub
   sharedname = RateGen_stub
-  idlflags += -Wb,stub_export_macro=RATEGEN_STUB_Export -Wb,stub_export_include=RateGen_stub_export.h -Wb,skel_export_macro=RATEGEN_SVNT_Export -Wb,skel_export_include=RateGen_svnt_export.h
+  idlflags -= -GT
+  idlflags += -St \
+              -Wb,stub_export_macro=RATEGEN_STUB_Export \
+              -Wb,stub_export_include=RateGen_stub_export.h \
+              -Wb,skel_export_macro=RATEGEN_SVNT_Export \
+              -Wb,skel_export_include=RateGen_svnt_export.h
   dynamicflags   = RATEGEN_STUB_BUILD_DLL
   libs += Display_Base_stub
 
@@ -15,14 +20,21 @@ project(Display_Base_RateGen_stub): ciao_client_dnc {
   Source_Files {
     RateGenC.cpp
   }
+
+  Header_Files {
+    RateGen_stub_export.h
+  }
 }
 
 project(Display_Base_RateGen_svnt) : ciao_servant_dnc {
-  after += Display_Base_svnt Display_Base_RateGen_stub
+  after += Display_Base_skel Display_Base_RateGen_stub
   sharedname  = RateGen_svnt
-  libs    += RateGen_stub Display_Base_stub Display_Base_svnt
-  
-  idlflags  +=  -Wb,export_macro=RATEGEN_SVNT_Export -Wb,export_include=RateGen_svnt_export.h
+  libs    += RateGen_stub Display_Base_stub Display_Base_skel
+
+  idlflags -= -GT
+  idlflags  +=  -SS -St \
+                -Wb,export_macro=RATEGEN_SVNT_Export \
+                -Wb,export_include=RateGen_svnt_export.h
   dynamicflags = RATEGEN_SVNT_BUILD_DLL
 
   CIDL_Files {
@@ -38,25 +50,33 @@ project(Display_Base_RateGen_svnt) : ciao_servant_dnc {
     RateGenS.cpp
     RateGen_svnt.cpp
   }
+
+  Header_Files {
+    RateGen_svnt_export.h
+  }
 }
 
 
 project(Display_Base_RateGen_exec) : ciao_component_dnc {
   after   += Display_Base_RateGen_svnt
   sharedname = RateGen_exec
-  libs      += RateGen_stub RateGen_svnt Display_Base_stub Display_Base_svnt
-  
-  idlflags  +=  -Wb,export_macro=RATEGEN_EXEC_Export -Wb,export_include=RateGen_exec_export.h
-  dynamicflags   = RATEGEN_EXEC_BUILD_DLL
+  libs      += RateGen_stub \
+               RateGen_svnt \
+               Display_Base_stub \
+               Display_Base_skel
+
+  dynamicflags = RATEGEN_EXEC_BUILD_DLL
 
   IDL_Files {
-    
   }
 
   Source_Files {
-    
     RateGen_exec.cpp
   }
+
+  Header_Files {
+    RateGen_exec_export.h
+  }
 }