From 988e6a43ea3bcb74f1f04f5b8dc56a2127c1fbe8 Mon Sep 17 00:00:00 2001
From: kuepper <kuepper>
Date: Mon, 20 Sep 2004 15:50:00 +0000
Subject: [PATCH] *** empty log message ***

---
 eo/app/gpsymreg/Makefile.am | 18 +++++-------------
 eo/app/gpsymreg/main.cpp    |  4 ++++
 eo/src/Makefile.am          |  2 +-
 eo/src/eo                   |  2 +-
 eo/src/gp/eoParseTree.h     |  4 ++++
 5 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/eo/app/gpsymreg/Makefile.am b/eo/app/gpsymreg/Makefile.am
index a3877197..0e9032cd 100644
--- a/eo/app/gpsymreg/Makefile.am
+++ b/eo/app/gpsymreg/Makefile.am
@@ -4,22 +4,14 @@
 #
 ###############################################################################
 
-DEPS = $(top_builddir)/src/libeo.a $(top_builddir)/src/utils/libeoutils.a
+LIBEO		= $(top_builddir)/src/libeo.a
+LIBEOUTILS	= $(top_builddir)/src/utils/libeoutils.a
 
-###############################################################################
-
-INCLUDES = -I$(top_builddir)/src
-LDADDS = $(top_builddir)/src/libeo.a $(top_builddir)/src/utils/libeoutils.a
-
-###############################################################################
 
 bin_PROGRAMS = gpsymreg
 
-###############################################################################
+AM_CXXFLAGS	= -I$(top_builddir)/src
+DEPS 		= $(LIBEOUTILS) $(LIBEO)
+LIBS 		=  $(top_builddir)/src/utils/libeoutils.a
 
 gpsymreg_SOURCES = main.cpp
-gpsymreg_DEPENDENCIES = $(DEPS)
-gpsymreg_LDFLAGS = -lm
-gpsymreg_LDADD = $(LDADDS)
-
-###############################################################################
diff --git a/eo/app/gpsymreg/main.cpp b/eo/app/gpsymreg/main.cpp
index dbe7c9eb..2db9ba37 100644
--- a/eo/app/gpsymreg/main.cpp
+++ b/eo/app/gpsymreg/main.cpp
@@ -21,6 +21,10 @@
 #pragma warning(disable:4786)
 #endif
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include <iostream>
 #include <gp/eoParseTree.h>
 #include <eo>
diff --git a/eo/src/Makefile.am b/eo/src/Makefile.am
index 73f8fd31..f6f9280e 100644
--- a/eo/src/Makefile.am
+++ b/eo/src/Makefile.am
@@ -11,7 +11,7 @@ AM_CXXFLAGS	= -I$(top_srcdir)/src
 lib_LIBRARIES = libeo.a
 
 libeo_a_SOURCES = eoFunctorStore.cpp \
-		eoPersistent.cpp \
+		eoPersistent.cpp
 		eoPrintable.cpp \
 		eoCtrlCContinue.cpp \
 		eoParetoFitness.cpp \
diff --git a/eo/src/eo b/eo/src/eo
index 5071dfa1..9ce3f01c 100644
--- a/eo/src/eo
+++ b/eo/src/eo
@@ -28,10 +28,10 @@
 #ifndef _eo_
 #define _eo_
 
-//-----------------------------------------------------------------------------
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
+
 // general purpose
 #include <utils/eoData.h>
 #include <eoObject.h>
diff --git a/eo/src/gp/eoParseTree.h b/eo/src/gp/eoParseTree.h
index 2f92d593..6bccb7dd 100644
--- a/eo/src/gp/eoParseTree.h
+++ b/eo/src/gp/eoParseTree.h
@@ -27,6 +27,10 @@
 #ifndef eoParseTree_h
 #define eoParseTree_h
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include <iterator>
 
 #include <list>