Tue Aug 21 14:43:24 UTC 2007 Abdullah Sowayan <abdullah.sowayan@lmco.com>

13 files changed, 86 insertions, 34 deletions

diff --git a/CIAO/tests/IDL3/Components/ComplexComponent/Attributes/Attributes_stub_export.h b/CIAO/tests/IDL3/Components/ComplexComponent/Attributes/Attributes_stub_export.h
index 9d4d2c15a8d..dfa59c5b267 100644
--- a/CIAO/tests/IDL3/Components/ComplexComponent/Attributes/Attributes_stub_export.h
+++ b/CIAO/tests/IDL3/Components/ComplexComponent/Attributes/Attributes_stub_export.h
@@ -9,6 +9,10 @@
 
 #include "ace/config-all.h"
 
+#if defined (ACE_AS_STATIC_LIBS) && !defined (ATTRIBUTES_STUB_HAS_DLL)
+#  define ATTRIBUTES_STUB_HAS_DLL 0
+#endif /* ACE_AS_STATIC_LIBS && ATTRIBUTES_STUB_HAS_DLL */
+
 #if !defined (ATTRIBUTES_STUB_HAS_DLL)
 #  define ATTRIBUTES_STUB_HAS_DLL 1
 #endif /* ! ATTRIBUTES_STUB_HAS_DLL */
diff --git a/CIAO/tests/IDL3/Components/ComplexComponent/Attributes/Attributes_svnt_export.h b/CIAO/tests/IDL3/Components/ComplexComponent/Attributes/Attributes_svnt_export.h
index d0502647130..e641264d206 100644
--- a/CIAO/tests/IDL3/Components/ComplexComponent/Attributes/Attributes_svnt_export.h
+++ b/CIAO/tests/IDL3/Components/ComplexComponent/Attributes/Attributes_svnt_export.h
@@ -2,53 +2,57 @@
 // -*- C++ -*-
 // $Id$
 // Definition for Win32 Export directives.
-// This file is generated automatically by generate_export_file.pl generate_export_file.pl ATTRIBUTES_SVNT
+// This file is generated automatically by generate_export_file.pl ATTRIBUTES_SVNT
 // ------------------------------
-#ifndef GENERATE_EXPORT_FILE.PL_EXPORT_H
-#define GENERATE_EXPORT_FILE.PL_EXPORT_H
+#ifndef ATTRIBUTES_SVNT_EXPORT_H
+#define ATTRIBUTES_SVNT_EXPORT_H
 
 #include "ace/config-all.h"
 
-#if !defined (GENERATE_EXPORT_FILE.PL_HAS_DLL)
-#  define GENERATE_EXPORT_FILE.PL_HAS_DLL 1
-#endif /* ! GENERATE_EXPORT_FILE.PL_HAS_DLL */
-
-#if defined (GENERATE_EXPORT_FILE.PL_HAS_DLL) && (GENERATE_EXPORT_FILE.PL_HAS_DLL == 1)
-#  if defined (GENERATE_EXPORT_FILE.PL_BUILD_DLL)
-#    define generate_export_file.pl_Export ACE_Proper_Export_Flag
-#    define GENERATE_EXPORT_FILE.PL_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
-#    define GENERATE_EXPORT_FILE.PL_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  else /* GENERATE_EXPORT_FILE.PL_BUILD_DLL */
-#    define generate_export_file.pl_Export ACE_Proper_Import_Flag
-#    define GENERATE_EXPORT_FILE.PL_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
-#    define GENERATE_EXPORT_FILE.PL_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  endif /* GENERATE_EXPORT_FILE.PL_BUILD_DLL */
-#else /* GENERATE_EXPORT_FILE.PL_HAS_DLL == 1 */
-#  define generate_export_file.pl_Export
-#  define GENERATE_EXPORT_FILE.PL_SINGLETON_DECLARATION(T)
-#  define GENERATE_EXPORT_FILE.PL_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#endif /* GENERATE_EXPORT_FILE.PL_HAS_DLL == 1 */
-
-// Set GENERATE_EXPORT_FILE.PL_NTRACE = 0 to turn on library specific tracing even if
+#if defined (ACE_AS_STATIC_LIBS) && !defined (ATTRIBUTES_SVNT_HAS_DLL)
+#  define ATTRIBUTES_SVNT_HAS_DLL 0
+#endif /* ACE_AS_STATIC_LIBS && ATTRIBUTES_SVNT_HAS_DLL */
+
+#if !defined (ATTRIBUTES_SVNT_HAS_DLL)
+#  define ATTRIBUTES_SVNT_HAS_DLL 1
+#endif /* ! ATTRIBUTES_SVNT_HAS_DLL */
+
+#if defined (ATTRIBUTES_SVNT_HAS_DLL) && (ATTRIBUTES_SVNT_HAS_DLL == 1)
+#  if defined (ATTRIBUTES_SVNT_BUILD_DLL)
+#    define ATTRIBUTES_SVNT_Export ACE_Proper_Export_Flag
+#    define ATTRIBUTES_SVNT_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
+#    define ATTRIBUTES_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#  else /* ATTRIBUTES_SVNT_BUILD_DLL */
+#    define ATTRIBUTES_SVNT_Export ACE_Proper_Import_Flag
+#    define ATTRIBUTES_SVNT_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
+#    define ATTRIBUTES_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#  endif /* ATTRIBUTES_SVNT_BUILD_DLL */
+#else /* ATTRIBUTES_SVNT_HAS_DLL == 1 */
+#  define ATTRIBUTES_SVNT_Export
+#  define ATTRIBUTES_SVNT_SINGLETON_DECLARATION(T)
+#  define ATTRIBUTES_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#endif /* ATTRIBUTES_SVNT_HAS_DLL == 1 */
+
+// Set ATTRIBUTES_SVNT_NTRACE = 0 to turn on library specific tracing even if
 // tracing is turned off for ACE.
-#if !defined (GENERATE_EXPORT_FILE.PL_NTRACE)
+#if !defined (ATTRIBUTES_SVNT_NTRACE)
 #  if (ACE_NTRACE == 1)
-#    define GENERATE_EXPORT_FILE.PL_NTRACE 1
+#    define ATTRIBUTES_SVNT_NTRACE 1
 #  else /* (ACE_NTRACE == 1) */
-#    define GENERATE_EXPORT_FILE.PL_NTRACE 0
+#    define ATTRIBUTES_SVNT_NTRACE 0
 #  endif /* (ACE_NTRACE == 1) */
-#endif /* !GENERATE_EXPORT_FILE.PL_NTRACE */
+#endif /* !ATTRIBUTES_SVNT_NTRACE */
 
-#if (GENERATE_EXPORT_FILE.PL_NTRACE == 1)
-#  define GENERATE_EXPORT_FILE.PL_TRACE(X)
-#else /* (GENERATE_EXPORT_FILE.PL_NTRACE == 1) */
+#if (ATTRIBUTES_SVNT_NTRACE == 1)
+#  define ATTRIBUTES_SVNT_TRACE(X)
+#else /* (ATTRIBUTES_SVNT_NTRACE == 1) */
 #  if !defined (ACE_HAS_TRACE)
 #    define ACE_HAS_TRACE
 #  endif /* ACE_HAS_TRACE */
-#  define GENERATE_EXPORT_FILE.PL_TRACE(X) ACE_TRACE_IMPL(X)
+#  define ATTRIBUTES_SVNT_TRACE(X) ACE_TRACE_IMPL(X)
 #  include "ace/Trace.h"
-#endif /* (GENERATE_EXPORT_FILE.PL_NTRACE == 1) */
+#endif /* (ATTRIBUTES_SVNT_NTRACE == 1) */
 
-#endif /* GENERATE_EXPORT_FILE.PL_EXPORT_H */
+#endif /* ATTRIBUTES_SVNT_EXPORT_H */
 
 // End of auto generated file.
diff --git a/CIAO/tests/IDL3/Components/ComplexComponent/EventSink/EventSink_stub_export.h b/CIAO/tests/IDL3/Components/ComplexComponent/EventSink/EventSink_stub_export.h
index 5e6963b7f4f..e2a7f876165 100644
--- a/CIAO/tests/IDL3/Components/ComplexComponent/EventSink/EventSink_stub_export.h
+++ b/CIAO/tests/IDL3/Components/ComplexComponent/EventSink/EventSink_stub_export.h
@@ -9,6 +9,10 @@
 
 #include "ace/config-all.h"
 
+#if defined (ACE_AS_STATIC_LIBS) && !defined (EVENTSINK_STUB_HAS_DLL)
+#  define EVENTSINK_STUB_HAS_DLL 0
+#endif /* ACE_AS_STATIC_LIBS && EVENTSINK_STUB_HAS_DLL */
+
 #if !defined (EVENTSINK_STUB_HAS_DLL)
 #  define EVENTSINK_STUB_HAS_DLL 1
 #endif /* ! EVENTSINK_STUB_HAS_DLL */
diff --git a/CIAO/tests/IDL3/Components/ComplexComponent/EventSink/EventSink_svnt_export.h b/CIAO/tests/IDL3/Components/ComplexComponent/EventSink/EventSink_svnt_export.h
index e1dbe769461..b30cb9768c2 100644
--- a/CIAO/tests/IDL3/Components/ComplexComponent/EventSink/EventSink_svnt_export.h
+++ b/CIAO/tests/IDL3/Components/ComplexComponent/EventSink/EventSink_svnt_export.h
@@ -9,6 +9,10 @@
 
 #include "ace/config-all.h"
 
+#if defined (ACE_AS_STATIC_LIBS) && !defined (EVENTSINK_SVNT_HAS_DLL)
+#  define EVENTSINK_SVNT_HAS_DLL 0
+#endif /* ACE_AS_STATIC_LIBS && EVENTSINK_SVNT_HAS_DLL */
+
 #if !defined (EVENTSINK_SVNT_HAS_DLL)
 #  define EVENTSINK_SVNT_HAS_DLL 1
 #endif /* ! EVENTSINK_SVNT_HAS_DLL */
diff --git a/CIAO/tests/IDL3/Components/ComplexComponent/EventSource/EventSource_stub_export.h b/CIAO/tests/IDL3/Components/ComplexComponent/EventSource/EventSource_stub_export.h
index 8c80a91e464..a0cf71bbe6d 100644
--- a/CIAO/tests/IDL3/Components/ComplexComponent/EventSource/EventSource_stub_export.h
+++ b/CIAO/tests/IDL3/Components/ComplexComponent/EventSource/EventSource_stub_export.h
@@ -9,6 +9,10 @@
 
 #include "ace/config-all.h"
 
+#if defined (ACE_AS_STATIC_LIBS) && !defined (EVENTSOURCE_STUB_HAS_DLL)
+#  define EVENTSOURCE_STUB_HAS_DLL 0
+#endif /* ACE_AS_STATIC_LIBS && EVENTSOURCE_STUB_HAS_DLL */
+
 #if !defined (EVENTSOURCE_STUB_HAS_DLL)
 #  define EVENTSOURCE_STUB_HAS_DLL 1
 #endif /* ! EVENTSOURCE_STUB_HAS_DLL */
diff --git a/CIAO/tests/IDL3/Components/ComplexComponent/EventSource/EventSource_svnt_export.h b/CIAO/tests/IDL3/Components/ComplexComponent/EventSource/EventSource_svnt_export.h
index 78c609aa7ef..dd5eeacd906 100644
--- a/CIAO/tests/IDL3/Components/ComplexComponent/EventSource/EventSource_svnt_export.h
+++ b/CIAO/tests/IDL3/Components/ComplexComponent/EventSource/EventSource_svnt_export.h
@@ -9,6 +9,10 @@
 
 #include "ace/config-all.h"
 
+#if defined (ACE_AS_STATIC_LIBS) && !defined (EVENTSOURCE_SVNT_HAS_DLL)
+#  define EVENTSOURCE_SVNT_HAS_DLL 0
+#endif /* ACE_AS_STATIC_LIBS && EVENTSOURCE_SVNT_HAS_DLL */
+
 #if !defined (EVENTSOURCE_SVNT_HAS_DLL)
 #  define EVENTSOURCE_SVNT_HAS_DLL 1
 #endif /* ! EVENTSOURCE_SVNT_HAS_DLL */
diff --git a/CIAO/tests/IDL3/Components/ComplexComponent/Facets/Facets_stub_export.h b/CIAO/tests/IDL3/Components/ComplexComponent/Facets/Facets_stub_export.h
index c672c9f7afe..025fc8215f2 100644
--- a/CIAO/tests/IDL3/Components/ComplexComponent/Facets/Facets_stub_export.h
+++ b/CIAO/tests/IDL3/Components/ComplexComponent/Facets/Facets_stub_export.h
@@ -9,6 +9,10 @@
 
 #include "ace/config-all.h"
 
+#if defined (ACE_AS_STATIC_LIBS) && !defined (FACETS_STUB_HAS_DLL)
+#  define FACETS_STUB_HAS_DLL 0
+#endif /* ACE_AS_STATIC_LIBS && FACETS_STUB_HAS_DLL */
+
 #if !defined (FACETS_STUB_HAS_DLL)
 #  define FACETS_STUB_HAS_DLL 1
 #endif /* ! FACETS_STUB_HAS_DLL */
diff --git a/CIAO/tests/IDL3/Components/ComplexComponent/Facets/Facets_svnt_export.h b/CIAO/tests/IDL3/Components/ComplexComponent/Facets/Facets_svnt_export.h
index 83f80320592..e4750de9b91 100644
--- a/CIAO/tests/IDL3/Components/ComplexComponent/Facets/Facets_svnt_export.h
+++ b/CIAO/tests/IDL3/Components/ComplexComponent/Facets/Facets_svnt_export.h
@@ -9,6 +9,10 @@
 
 #include "ace/config-all.h"
 
+#if defined (ACE_AS_STATIC_LIBS) && !defined (FACETS_SVNT_HAS_DLL)
+#  define FACETS_SVNT_HAS_DLL 0
+#endif /* ACE_AS_STATIC_LIBS && FACETS_SVNT_HAS_DLL */
+
 #if !defined (FACETS_SVNT_HAS_DLL)
 #  define FACETS_SVNT_HAS_DLL 1
 #endif /* ! FACETS_SVNT_HAS_DLL */
diff --git a/CIAO/tests/IDL3/Components/ComplexComponent/Receptacles/Receptacles_stub_export.h b/CIAO/tests/IDL3/Components/ComplexComponent/Receptacles/Receptacles_stub_export.h
index 39c2bbeb0ca..15dedbc8a73 100644
--- a/CIAO/tests/IDL3/Components/ComplexComponent/Receptacles/Receptacles_stub_export.h
+++ b/CIAO/tests/IDL3/Components/ComplexComponent/Receptacles/Receptacles_stub_export.h
@@ -9,6 +9,10 @@
 
 #include "ace/config-all.h"
 
+#if defined (ACE_AS_STATIC_LIBS) && !defined (RECEPTACLES_STUB_HAS_DLL)
+#  define RECEPTACLES_STUB_HAS_DLL 0
+#endif /* ACE_AS_STATIC_LIBS && RECEPTACLES_STUB_HAS_DLL */
+
 #if !defined (RECEPTACLES_STUB_HAS_DLL)
 #  define RECEPTACLES_STUB_HAS_DLL 1
 #endif /* ! RECEPTACLES_STUB_HAS_DLL */
diff --git a/CIAO/tests/IDL3/Components/ComplexComponent/Receptacles/Receptacles_svnt_export.h b/CIAO/tests/IDL3/Components/ComplexComponent/Receptacles/Receptacles_svnt_export.h
index d0dcd4e3b67..4a4a4f52dcd 100644
--- a/CIAO/tests/IDL3/Components/ComplexComponent/Receptacles/Receptacles_svnt_export.h
+++ b/CIAO/tests/IDL3/Components/ComplexComponent/Receptacles/Receptacles_svnt_export.h
@@ -9,6 +9,10 @@
 
 #include "ace/config-all.h"
 
+#if defined (ACE_AS_STATIC_LIBS) && !defined (RECEPTACLES_SVNT_HAS_DLL)
+#  define RECEPTACLES_SVNT_HAS_DLL 0
+#endif /* ACE_AS_STATIC_LIBS && RECEPTACLES_SVNT_HAS_DLL */
+
 #if !defined (RECEPTACLES_SVNT_HAS_DLL)
 #  define RECEPTACLES_SVNT_HAS_DLL 1
 #endif /* ! RECEPTACLES_SVNT_HAS_DLL */
diff --git a/CIAO/tests/IDL3/Components/SimpleComponent/SimpleComponent_exec_export.h b/CIAO/tests/IDL3/Components/SimpleComponent/SimpleComponent_exec_export.h
index 2faae1ed285..add746da8f5 100644
--- a/CIAO/tests/IDL3/Components/SimpleComponent/SimpleComponent_exec_export.h
+++ b/CIAO/tests/IDL3/Components/SimpleComponent/SimpleComponent_exec_export.h
@@ -9,6 +9,10 @@
 
 #include "ace/config-all.h"
 
+#if defined (ACE_AS_STATIC_LIBS) && !defined (SIMPLECOMPONENT_EXEC_HAS_DLL)
+#  define SIMPLECOMPONENT_EXEC_HAS_DLL 0
+#endif /* ACE_AS_STATIC_LIBS && SIMPLECOMPONENT_EXEC_HAS_DLL */
+
 #if !defined (SIMPLECOMPONENT_EXEC_HAS_DLL)
 #  define SIMPLECOMPONENT_EXEC_HAS_DLL 1
 #endif /* ! SIMPLECOMPONENT_EXEC_HAS_DLL */
diff --git a/CIAO/tests/IDL3/Components/SimpleComponent/SimpleComponent_stub_export.h b/CIAO/tests/IDL3/Components/SimpleComponent/SimpleComponent_stub_export.h
index 45beb98405b..eb8cb7a6c97 100644
--- a/CIAO/tests/IDL3/Components/SimpleComponent/SimpleComponent_stub_export.h
+++ b/CIAO/tests/IDL3/Components/SimpleComponent/SimpleComponent_stub_export.h
@@ -9,6 +9,10 @@
 
 #include "ace/config-all.h"
 
+#if defined (ACE_AS_STATIC_LIBS) && !defined (SIMPLECOMPONENT_STUB_HAS_DLL)
+#  define SIMPLECOMPONENT_STUB_HAS_DLL 0
+#endif /* ACE_AS_STATIC_LIBS && SIMPLECOMPONENT_STUB_HAS_DLL */
+
 #if !defined (SIMPLECOMPONENT_STUB_HAS_DLL)
 #  define SIMPLECOMPONENT_STUB_HAS_DLL 1
 #endif /* ! SIMPLECOMPONENT_STUB_HAS_DLL */
diff --git a/CIAO/tests/IDL3/Components/SimpleComponent/SimpleComponent_svnt_export.h b/CIAO/tests/IDL3/Components/SimpleComponent/SimpleComponent_svnt_export.h
index 07f08b8eaa0..694af85e994 100644
--- a/CIAO/tests/IDL3/Components/SimpleComponent/SimpleComponent_svnt_export.h
+++ b/CIAO/tests/IDL3/Components/SimpleComponent/SimpleComponent_svnt_export.h
@@ -9,6 +9,10 @@
 
 #include "ace/config-all.h"
 
+#if defined (ACE_AS_STATIC_LIBS) && !defined (SIMPLECOMPONENT_SVNT_HAS_DLL)
+#  define SIMPLECOMPONENT_SVNT_HAS_DLL 0
+#endif /* ACE_AS_STATIC_LIBS && SIMPLECOMPONENT_SVNT_HAS_DLL */
+
 #if !defined (SIMPLECOMPONENT_SVNT_HAS_DLL)
 #  define SIMPLECOMPONENT_SVNT_HAS_DLL 1
 #endif /* ! SIMPLECOMPONENT_SVNT_HAS_DLL */