Updated build-prcess to be completely under automake control.
For the tutorial the old Makefiles are saved as Makefile.simple in all the respective directories. Use generated config.h instead of command-line passing of preprocessor flags. Updated support files from current automake.
This commit is contained in:
parent
32cf83cfee
commit
c8494642d5
37 changed files with 675 additions and 279 deletions
|
|
@ -4,13 +4,13 @@
|
|||
##
|
||||
###############################################################################
|
||||
|
||||
INCLUDES = -I$(top_builddir)/src
|
||||
INCLUDES = -I$(top_builddir)/src -I$(top_srcdir)/src
|
||||
CPPFLAGS = -O2 -Wall
|
||||
lib_LIBRARIES = libeoutils.a
|
||||
libeoutils_a_SOURCES = eoParser.cpp eoRNG.cpp eoState.cpp eoUpdater.cpp eoFileMonitor.cpp eoStdoutMonitor.cpp eoRealBounds.cpp make_help.cpp
|
||||
|
||||
libeoincdir = $(includedir)/eo/utils
|
||||
libeoinc_HEADERS = checkpointing *.h
|
||||
libeoinc_HEADERS = checkpointing $(srcdir)/*.h
|
||||
#compatibility.h eoCheckPoint.h eoData.h eoDistance.h eoFDCStat.h eoFileMonitor.h eoGnuplot1DMonitor.h eoGnuplot1DSnapshot.h eoHowMany.h eoMonitor.h eoParam.h eoParser.h eoRNG.h eoStat.h eoScalarFitnessStat.h eoState.h eoStdoutMonitor.h eoUpdatable.h eoUpdater.h rnd_generators.h eoRndGenerators.h selectors.h
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -27,6 +27,8 @@
|
|||
#ifndef _eoFileSnapshot_h
|
||||
#define _eoFileSnapshot_h
|
||||
|
||||
#include <config.h>
|
||||
|
||||
#include <string>
|
||||
#include <fstream>
|
||||
#include <utils/eoParam.h>
|
||||
|
|
|
|||
|
|
@ -26,6 +26,8 @@
|
|||
#ifndef _eoGnuplot_H
|
||||
#define _eoGnuplot_H
|
||||
|
||||
#include <config.h>
|
||||
|
||||
#include <string>
|
||||
|
||||
/**
|
||||
|
|
@ -150,7 +152,7 @@ inline void eoGnuplot::initGnuPlot(std::string _title, std::string _extra)
|
|||
* Created......: Mon Mar 13 13:50:11 1995
|
||||
* Description..: Communication par pipe bidirectionnel avec un autre process
|
||||
*
|
||||
* Ident........: $Id: eoGnuplot.h,v 1.9 2004-01-21 19:57:19 maartenkeijzer Exp $
|
||||
* Ident........: $Id: eoGnuplot.h,v 1.10 2004-09-17 16:53:15 kuepper Exp $
|
||||
* ----------------------------------------------------------------------
|
||||
*/
|
||||
|
||||
|
|
|
|||
|
|
@ -28,6 +28,8 @@
|
|||
#ifndef _eoGnuplot1DMonitor_H
|
||||
#define _eoGnuplot1DMonitor_H
|
||||
|
||||
#include <config.h>
|
||||
|
||||
#include <string>
|
||||
|
||||
#include <utils/eoMonitor.h>
|
||||
|
|
|
|||
|
|
@ -28,8 +28,12 @@
|
|||
#ifndef _eoGnuplot1DSnapshot_H
|
||||
#define _eoGnuplot1DSnapshot_H
|
||||
|
||||
#include <config.h>
|
||||
|
||||
#include <string>
|
||||
// #include <sstream>
|
||||
#ifdef HAVE_SSTREAM
|
||||
#include <sstream>
|
||||
#endif
|
||||
|
||||
#include <utils/eoFileSnapshot.h>
|
||||
#include <utils/eoGnuplot.h>
|
||||
|
|
|
|||
|
|
@ -63,6 +63,9 @@
|
|||
*
|
||||
* It is an eoPersistent because we need to be able to use eoParamValue<eoHowMany>
|
||||
*/
|
||||
|
||||
#include <config.h>
|
||||
|
||||
#ifdef HAVE_SSTREAM
|
||||
#include <sstream>
|
||||
#else
|
||||
|
|
|
|||
|
|
@ -27,6 +27,8 @@
|
|||
#ifndef eoParam_h
|
||||
#define eoParam_h
|
||||
|
||||
#include <config.h>
|
||||
|
||||
//-----------------------------------------------------------------------------
|
||||
#include <math.h> // for floor
|
||||
#include <string>
|
||||
|
|
|
|||
|
|
@ -35,6 +35,8 @@ that can be used to dump to the screen
|
|||
#ifndef _eoPopStat_h
|
||||
#define _eoPopStat_h
|
||||
|
||||
#include <config.h>
|
||||
|
||||
#include <utils/eoStat.h>
|
||||
|
||||
|
||||
|
|
|
|||
Reference in a new issue