Wed Aug 4 16:24:42 UTC 2010 Johnny Willemsen <jwillemsen@remedy.nl>

        * src/Bool_Array.h:
        * src/Gen_Perf.h:
        * src/Key_List.h:
        * src/Options.h:
        * src/gperf.mpc:
          Don't use a seperate library, we can't embed gperf as shared library
          because it has a GPL license

        * src/gperf_export.h:
          Removed this file.

7 files changed, 57 insertions, 118 deletions

diff --git a/ACE/apps/gperf/ChangeLog b/ACE/apps/gperf/ChangeLog
index b762f3b14f2..f02fc22500c 100644
--- a/ACE/apps/gperf/ChangeLog
+++ b/ACE/apps/gperf/ChangeLog
@@ -1,7 +1,20 @@
+Wed Aug  4 16:24:42 UTC 2010  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * src/Bool_Array.h:
+        * src/Gen_Perf.h:
+        * src/Key_List.h:
+        * src/Options.h:
+        * src/gperf.mpc:
+          Don't use a seperate library, we can't embed gperf as shared library
+          because it has a GPL license
+
+        * src/gperf_export.h:
+          Removed this file.
+
 Mon Jul 13 15:32:00 UTC 2008  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-        * src/Bool_Array.h
-        * src/Vectors.h
+        * src/Bool_Array.h:
+        * src/Vectors.h:
           Doxygen changes
 
 Sun Jun 28 03:20:00 UTC 2008  Johnny Willemsen  <jwillemsen@remedy.nl>
@@ -94,12 +107,12 @@ Sat Apr 30 10:56:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
 
 Fri Apr 29 09:08:39 2005  Douglas C. Schmidt  <schmidt@cs.wustl.edu>
 
-	* src/Key_List.cpp (output_binary_search_function): Added a
+        * src/Key_List.cpp (output_binary_search_function): Added a
 
-	  do {/* null */} while (&base == 0);
+          do {/* null */} while (&base == 0);
 
-	  to silence warnings on some compilers.  Thanks to Frank Pilhofer
- 	  <fp@mc.com>.
+          to silence warnings on some compilers.  Thanks to Frank Pilhofer
+          <fp@mc.com>.
 
 Fri Aug  5 15:30:00 UTC 2004  Simon Massey  <simon.massey@prismtechnologies.com>
 
@@ -111,16 +124,16 @@ Fri Aug  5 15:30:00 UTC 2004  Simon Massey  <simon.massey@prismtechnologies.com>
 
 Fri Apr 23 21:18:17 2004  Ossama Othman  <ossama@dre.vanderbilt.edu>
 
-	* src/Options.h (operator !=):
-	* src/Options.cpp (operator !=):
+        * src/Options.h (operator !=):
+        * src/Options.cpp (operator !=):
 
-	  Changed return type to bool, as is the norm in modern C++.
+          Changed return type to bool, as is the norm in modern C++.
 
 Tue Jan 20 17:13:29 2004  Steve Huston  <shuston@riverace.com>
 
-	* version.texi: Something in the autoconf build thought it wise to
-	  update the date in this file. It matches the last modification
-	  date of gperf.texi.
+        * version.texi: Something in the autoconf build thought it wise to
+          update the date in this file. It matches the last modification
+          date of gperf.texi.
 
 Thu Jun 19 14:52:05 UTC 2003  Don Hinton  <dhinton@dresystems.com>
 
@@ -133,49 +146,49 @@ Thu Jun 19 14:52:05 UTC 2003  Don Hinton  <dhinton@dresystems.com>
 
 Tue Jun 17 11:38:36 2003  Douglas C. Schmidt  <schmidt@macarena.cs.wustl.edu>
 
-	* src/Key_List.cpp (output_lookup_array):
-	* src/Gen_Perf.cpp (run):
-	* src/Key_List.cpp (already_determined):
-	* src/List_Node.cpp (List_Node): Added casts to prevent GCC 3.3
-	  from complaining about stupid stuff...  Thanks to Bala for
- 	  reporting this.
+        * src/Key_List.cpp (output_lookup_array):
+        * src/Gen_Perf.cpp (run):
+        * src/Key_List.cpp (already_determined):
+        * src/List_Node.cpp (List_Node): Added casts to prevent GCC 3.3
+          from complaining about stupid stuff...  Thanks to Bala for
+          reporting this.
 
 Sun Jul 28 17:04:54 2002  Douglas C. Schmidt  <schmidt@ace.cs.wustl.edu>
 
-	* src/gperf.cpp (main): Only generate the timestamps if the
-	  DEBUGGING option ('-d') is enabled.  Thanks to Kier Schmitt
- 	  <SchmittKC@kpt.nuwc.navy.mil> for this suggestion.
+        * src/gperf.cpp (main): Only generate the timestamps if the
+          DEBUGGING option ('-d') is enabled.  Thanks to Kier Schmitt
+          <SchmittKC@kpt.nuwc.navy.mil> for this suggestion.
 
 Tue Feb 26 23:15:47 2002  Ossama Othman  <ossama@uci.edu>
 
-	* gperf.texi:
+        * gperf.texi:
 
-	  Added missing "@dircategory" entry.  It is required for proper
-	  installation when using `install-info'.
+          Added missing "@dircategory" entry.  It is required for proper
+          installation when using `install-info'.
 
-	  Use "@direntry" instead of "{START,END}-INFO-DIR-ENTRY"
-	  directly.
+          Use "@direntry" instead of "{START,END}-INFO-DIR-ENTRY"
+          directly.
 
-	* gperf.info:
+        * gperf.info:
 
-	  Regenerated this file.
+          Regenerated this file.
 
 Mon Jan 14 14:43:53 2002  Carlos O'Ryan  <coryan@uci.edu>
 
-	* tests/Makefile:
-	  Re-generate dependencies.
+        * tests/Makefile:
+          Re-generate dependencies.
 
 Mon Dec 24 12:47:27 2001  Carlos O'Ryan  <coryan@uci.edu>
 
-	* src/Options.cpp:
-	  Add temporary fix until something better shows up, at least it
-	  compiles this way!
+        * src/Options.cpp:
+          Add temporary fix until something better shows up, at least it
+          compiles this way!
 
 Sat Sep 22 09:06:10 2001  Douglas C. Schmidt  <schmidt@macarena.cs.wustl.edu>
 
-	* src/Makefile: Removed the rules.lib.GNU file since it didn't
-	  seem to be needed and was causing problems for MinGW.  Thanks to
- 	  Jeff McNiel <JMcNiel@datacrit.com> for reporting this.
+        * src/Makefile: Removed the rules.lib.GNU file since it didn't
+          seem to be needed and was causing problems for MinGW.  Thanks to
+          Jeff McNiel <JMcNiel@datacrit.com> for reporting this.
 
 Wed Sep 19 02:29:37 2001  Carlos O'Ryan  <coryan@uci.edu>
 
@@ -2150,7 +2163,7 @@ Thu Jan  5 22:46:34 1989  Doug Schmidt  (schmidt at siam.ics.uci.edu)
         * Added a check in Key_List::Output for the special case where
           the keys used are 1,$.  It is possible to generate more
           efficient C code in this case.
-	
+
 Local Variables:
 mode: change-log
 add-log-time-format: (lambda () (progn (setq tz (getenv "TZ")) (set-time-zone-rule "UTC") (setq time (format-time-string "%a %b %e %H:%M:%S %Z %Y" (current-time))) (set-time-zone-rule tz) time))
diff --git a/ACE/apps/gperf/src/Bool_Array.h b/ACE/apps/gperf/src/Bool_Array.h
index 0089295f748..b8274d84ba9 100644
--- a/ACE/apps/gperf/src/Bool_Array.h
+++ b/ACE/apps/gperf/src/Bool_Array.h
@@ -36,10 +36,6 @@
 
 #if defined (ACE_HAS_GPERF)
 
-#if defined (__BORLANDC__) && (__BORLANDC__ < 0x630)
-#include "gperf_export.h"
-#endif
-
 /**
  * Efficient lookup table abstraction implemented as a "Generation
  * Number" Array.
@@ -47,11 +43,7 @@
  * Uses a "Generation Numbering" implementation to minimize
  * initialization time.
  */
-#if defined (__BORLANDC__) && (__BORLANDC__ < 0x630)
-class ACE_GPERF_Export Bool_Array
-#else
 class Bool_Array
-#endif
 {
 public:
   /// Constructor
diff --git a/ACE/apps/gperf/src/Gen_Perf.h b/ACE/apps/gperf/src/Gen_Perf.h
index ee6813953a1..39bcdc5e7c6 100644
--- a/ACE/apps/gperf/src/Gen_Perf.h
+++ b/ACE/apps/gperf/src/Gen_Perf.h
@@ -29,7 +29,6 @@
 #include "Options.h"
 #include "Key_List.h"
 #include "Bool_Array.h"
-#include "gperf_export.h"
 #include "ace/Copy_Disabled.h"
 
 #if defined (ACE_HAS_GPERF)
@@ -38,7 +37,7 @@
  * Provides high-level routines to manipulate the keyword list
  * structures the code generation output.
  */
-class ACE_GPERF_Export Gen_Perf : private ACE_Copy_Disabled
+class Gen_Perf : private ACE_Copy_Disabled
 {
 public:
   /// Constructor.
diff --git a/ACE/apps/gperf/src/Key_List.h b/ACE/apps/gperf/src/Key_List.h
index 7d39532c17c..8be31b80b9f 100644
--- a/ACE/apps/gperf/src/Key_List.h
+++ b/ACE/apps/gperf/src/Key_List.h
@@ -34,10 +34,6 @@
 #include "Vectors.h"
 #include "ace/Copy_Disabled.h"
 
-#if defined (__BORLANDC__) && (__BORLANDC__ < 0x630)
-#include "gperf_export.h"
-#endif
-
 /**
  * Describes a duplicate entry.
  *
@@ -64,11 +60,7 @@ public:
  * the Gen_Perf.hash function.  A Key_List is a singly-linked list
  * of List_Nodes.
  */
-#if defined (__BORLANDC__) && (__BORLANDC__ < 0x630)
-class ACE_GPERF_Export Key_List : private ACE_Copy_Disabled
-#else
 class Key_List : private ACE_Copy_Disabled
-#endif
 {
 public:
   Key_List (void);
diff --git a/ACE/apps/gperf/src/Options.h b/ACE/apps/gperf/src/Options.h
index 94e94efbf99..c76a7037661 100644
--- a/ACE/apps/gperf/src/Options.h
+++ b/ACE/apps/gperf/src/Options.h
@@ -29,7 +29,6 @@
 #include "ace/Log_Msg.h"
 #include "ace/SString.h"
 #include "ace/Copy_Disabled.h"
-#include "gperf_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -102,7 +101,7 @@ enum
  *
  * @todo The Options class should be changed to use the Singleton pattern.
  */
-class ACE_GPERF_Export Options : private ACE_Copy_Disabled
+class Options : private ACE_Copy_Disabled
 {
 public:
   Options (void);
@@ -189,7 +188,7 @@ private:
 };
 
 /// Global option coordinator for the entire program.
-extern ACE_GPERF_Export Options option;
+extern Options option;
 
 #endif /* ACE_HAS_GPERF */
 #endif /* OPTIONS_H */
diff --git a/ACE/apps/gperf/src/gperf.mpc b/ACE/apps/gperf/src/gperf.mpc
index 984a6c6110d..e11079daf00 100644
--- a/ACE/apps/gperf/src/gperf.mpc
+++ b/ACE/apps/gperf/src/gperf.mpc
@@ -1,10 +1,11 @@
 // -*- MPC -*-
 // $Id$
 
-project(ACE_gperf) : acelib, install_lib, crosscompile, ace_output {
-  sharedname   = ACE_gperf_lib
-  dynamicflags += ACE_GPERF_BUILD_DLL
+project(gperf) : aceexe, install, crosscompile {
+  install = $(ACE_ROOT)/bin
+  exename = ace_gperf
   Source_Files {
+    gperf.cpp
     Options.cpp
     Iterator.cpp
     Gen_Perf.cpp
@@ -15,16 +16,6 @@ project(ACE_gperf) : acelib, install_lib, crosscompile, ace_output {
     Vectors.cpp
     Version.cpp
   }
-}
-
-project(gperf) : aceexe, install, crosscompile {
-  install = $(ACE_ROOT)/bin
-  after += ACE_gperf
-  libs += ACE_gperf_lib
-  exename = ace_gperf
-  Source_Files {
-    gperf.cpp
-  }
 
   verbatim(gnuace, postinstall) {
 "	@$(MKDIR) $(INSTALL_PREFIX)/share/ace/bin"
diff --git a/ACE/apps/gperf/src/gperf_export.h b/ACE/apps/gperf/src/gperf_export.h
deleted file mode 100644
index 4e1943b4ff3..00000000000
--- a/ACE/apps/gperf/src/gperf_export.h
+++ /dev/null
@@ -1,47 +0,0 @@
-// -*- C++ -*-
-// $Id$
-// Definition for Win32 Export directives.
-// This file is generated automatically by
-// generate_export_file.pl
-// ------------------------------
-
-#ifndef ACE_GPERF_EXPORT_H
-#define ACE_GPERF_EXPORT_H
-
-#include "ace/config-lite.h"
-
-#if defined (ACE_AS_STATIC_LIBS)
-# if !defined (ACE_GPERF_HAS_DLL)
-#   define ACE_GPERF_HAS_DLL 0
-# endif /* ! ACE_GPERF_HAS_DLL */
-#else
-# if !defined (ACE_GPERF_HAS_DLL)
-#   define ACE_GPERF_HAS_DLL 1
-# endif /* ! ACE_GPERF_HAS_DLL */
-#endif /* ACE_AS_STATIC_LIB */
-
-#if defined (ACE_GPERF_HAS_DLL)
-#  if (ACE_GPERF_HAS_DLL == 1)
-#    if defined (ACE_GPERF_BUILD_DLL)
-#      define ACE_GPERF_Export ACE_Proper_Export_Flag
-#      define ACE_GPERF_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
-#      define ACE_GPERF_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#    else
-#      define ACE_GPERF_Export ACE_Proper_Import_Flag
-#      define ACE_GPERF_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
-#      define ACE_GPERF_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#    endif /* ACE_GPERF_BUILD_DLL */
-#  else
-#    define ACE_GPERF_Export
-#    define ACE_GPERF_SINGLETON_DECLARATION(T)
-#    define ACE_GPERF_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  endif   /* ! ACE_GPERF_HAS_DLL == 1 */
-#else
-#  define ACE_GPERF_Export
-#  define ACE_GPERF_SINGLETON_DECLARATION(T)
-#  define ACE_GPERF_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#endif     /* ACE_GPERF_HAS_DLL */
-
-#endif     /* ACE_GPERF_EXPORT_H */
-
-// End of auto generated file.