From 51471804cde758412dcfad8fdae1cbfdee5ae285 Mon Sep 17 00:00:00 2001 From: kuepper Date: Wed, 22 Sep 2004 18:18:31 +0000 Subject: [PATCH] fix installation, dist-preparation --- eo/acinclude.m4 | 24 ++++++++++++++++++++++++ eo/app/Makefile.am | 6 +----- eo/app/gprop/Makefile.am | 32 +++++++++++++++----------------- eo/app/gprop/mlp.h | 31 ++++++++++++++++++++++++------- eo/app/gpsymreg/Makefile.am | 6 +----- eo/app/mastermind/Makefile.am | 6 +----- eo/configure.in | 4 ++++ eo/src/Makefile.am | 12 ------------ eo/src/do/Makefile.am | 14 ++++++++++++++ eo/src/es/Makefile.am | 4 +++- eo/src/ga/Makefile.am | 4 ++-- eo/src/gp/Makefile.am | 21 +++++++++------------ eo/src/other/Makefile.am | 16 +++++++--------- eo/tutorial/Lesson1/Makefile.am | 2 +- eo/tutorial/Lesson2/Makefile.am | 2 +- eo/tutorial/Lesson3/Makefile.am | 2 +- eo/tutorial/Lesson4/Makefile.am | 2 +- eo/tutorial/Lesson5/Makefile.am | 2 +- 18 files changed, 110 insertions(+), 80 deletions(-) diff --git a/eo/acinclude.m4 b/eo/acinclude.m4 index 4fc7561f..f7af6238 100644 --- a/eo/acinclude.m4 +++ b/eo/acinclude.m4 @@ -94,6 +94,7 @@ fi ]) + dnl Available from the GNU Autoconf Macro Archive at: dnl http://www.gnu.org/software/ac-archive/htmldoc/ac_cxx_namespaces.html dnl @@ -111,3 +112,26 @@ if test "$ac_cv_cxx_namespaces" = yes; then AC_DEFINE(HAVE_NAMESPACES,,[define if the compiler implements namespaces]) fi ]) + + + +dnl Available from the GNU Autoconf Macro Archive at: +dnl http://www.gnu.org/software/ac-archive/htmldoc/ac_cxx_have_numeric_limits.html +dnl +AC_DEFUN([AC_CXX_HAVE_NUMERIC_LIMITS], +[AC_CACHE_CHECK(whether the compiler has numeric_limits, +ac_cv_cxx_have_numeric_limits, +[AC_REQUIRE([AC_CXX_NAMESPACES]) + AC_LANG_SAVE + AC_LANG_CPLUSPLUS + AC_TRY_COMPILE([#include +#ifdef HAVE_NAMESPACES +using namespace std; +#endif],[double e = numeric_limits::epsilon(); return 0;], + ac_cv_cxx_have_numeric_limits=yes, ac_cv_cxx_have_numeric_limits=no) + AC_LANG_RESTORE +]) +if test "$ac_cv_cxx_have_numeric_limits" = yes; then + AC_DEFINE(HAVE_NUMERIC_LIMITS,,[define if the compiler has numeric_limits]) +fi +]) diff --git a/eo/app/Makefile.am b/eo/app/Makefile.am index 578f94dc..66224802 100644 --- a/eo/app/Makefile.am +++ b/eo/app/Makefile.am @@ -1,7 +1,3 @@ -############################################################################### -## ## Makefile.am for app dir in eo -## -############################################################################### -SUBDIRS = mastermind gpsymreg +SUBDIRS = mastermind gprop gpsymreg diff --git a/eo/app/gprop/Makefile.am b/eo/app/gprop/Makefile.am index 1a251c80..b1515ce5 100644 --- a/eo/app/gprop/Makefile.am +++ b/eo/app/gprop/Makefile.am @@ -1,24 +1,22 @@ -############################################################################### -# # Makefile.am for app/gprop -# -############################################################################### -DEPS = $(top_builddir)/src/libeo.a $(top_builddir)/src/utils/libeoutils.a +noinst_PROGRAMS = gprop -############################################################################### -INCLUDES = -I$(top_builddir)/src -LDADDS = $(top_builddir)/src/libeo.a $(top_builddir)/src/utils/libeoutils.a -CXXFLAGS = -g -############################################################################### +gprop_SOURCES = gprop.cpp -bin_PROGRAMS = gprop -############################################################################### +noinst_HEADERS = gprop.h \ + l2.h \ + mlp.h \ + mse.h \ + qp.h \ + vecop.h -gprop_SOURCES = gprop.cpp -gprop_DEPENDENCIES = $(DEPS) -gprop_LDFLAGS = -lm -gprop_LDADD = $(LDADDS) -############################################################################### +AM_CXXFLAGS = -I$(top_srcdir)/src + +LIBEO = $(top_builddir)/src/libeo.a +LIBEOUTILS = $(top_builddir)/src/utils/libeoutils.a + +DEPS = $(LIBEO) $(LIBEOUTILS) +LIBS = $(LIBEO) $(LIBEOUTILS) diff --git a/eo/app/gprop/mlp.h b/eo/app/gprop/mlp.h index a3d841bd..b0e7a232 100644 --- a/eo/app/gprop/mlp.h +++ b/eo/app/gprop/mlp.h @@ -5,10 +5,21 @@ #ifndef mlp_h #define mlp_h -//----------------------------------------------------------------------------- +#ifdef HAVE_CONFIG_H +#include +#endif -using namespace std; -#include // MAXFLOAT MINFLOAT +#ifdef HAVE_NUMERIC_LIMITS +#include +#define MLP_MAXFLOAT std::numeric_limits::max() +#define MLP_MINFLOAT std::numeric_limits::min() +#elif defined HAVE_VALUES_H +#include +#define MLP_MAXFLOAT MAXFLOAT +#define MLP_MINFLOAT MINFLOAT +#else +#error numerical limits not available +#endif #include // exp #include // invalid_argument #include // istream ostream @@ -20,7 +31,9 @@ using namespace std; #include #include -//----------------------------------------------------------------------------- + +using namespace std; + namespace mlp { @@ -52,8 +65,8 @@ namespace mlp //--------------------------------------------------------------------------- - const real max_real = MAXFLOAT; - const real min_real = MINFLOAT; + const real max_real = MLP_MAXFLOAT; + const real min_real = MLP_MINFLOAT; //--------------------------------------------------------------------------- @@ -441,7 +454,11 @@ namespace mlp { } // namespace mlp -//----------------------------------------------------------------------------- + + +#undef MLP_MAXFLOAT +#undef MLP_MINFLOAT + #endif // mlp_h diff --git a/eo/app/gpsymreg/Makefile.am b/eo/app/gpsymreg/Makefile.am index ad9744c5..d9140fa8 100644 --- a/eo/app/gpsymreg/Makefile.am +++ b/eo/app/gpsymreg/Makefile.am @@ -1,10 +1,6 @@ -############################################################################### -# # Makefile.am for app/gpsymreg -# -############################################################################### -bin_PROGRAMS = gpsymreg +noinst_PROGRAMS = gpsymreg gpsymreg_SOURCES = main.cpp diff --git a/eo/app/mastermind/Makefile.am b/eo/app/mastermind/Makefile.am index fc1f4251..c0629867 100644 --- a/eo/app/mastermind/Makefile.am +++ b/eo/app/mastermind/Makefile.am @@ -1,10 +1,6 @@ -############################################################################### -# # Makefile.am for app/mastermind -# -############################################################################### -bin_PROGRAMS = mastermind +noinst_PROGRAMS = mastermind mastermind_SOURCES = mastermind.cpp diff --git a/eo/configure.in b/eo/configure.in index 6a770c30..5234233d 100644 --- a/eo/configure.in +++ b/eo/configure.in @@ -32,7 +32,10 @@ AC_CHECK_PROG(DOXYGEN, doxygen, doxygen, true) dnl Checks for header files. AC_HEADER_STDC AC_CHECK_HEADERS(limits.h) +AC_CHECK_HEADERS(values.h) +AC_CXX_HAVE_NUMERIC_LIMITS AC_CXX_HAVE_SSTREAM +AC_CXX_NAMESPACES dnl Checks for typedefs, structures, and compiler characteristics. AC_C_CONST @@ -50,6 +53,7 @@ dnl create makefiles AC_OUTPUT(Makefile \ app/Makefile \ app/mastermind/Makefile \ + app/gprop/Makefile \ app/gpsymreg/Makefile \ contrib/Makefile \ doc/Makefile \ diff --git a/eo/src/Makefile.am b/eo/src/Makefile.am index 04e71ee2..b28bb440 100644 --- a/eo/src/Makefile.am +++ b/eo/src/Makefile.am @@ -119,16 +119,4 @@ pkginclude_HEADERS = eo \ eoVector.h \ es.h \ ga.h \ - do/make_algo_easea.h \ - do/make_algo_pareto.h \ - do/make_algo_scalar.h \ - do/make_checkpoint.h \ - do/make_checkpoint_FDC.h \ - do/make_checkpoint_assembled.h \ - do/make_checkpoint_pareto.h \ - do/make_continue.h \ - do/make_continue_pareto.h \ - do/make_general_replacement.h \ - do/make_pop.h \ - do/make_run.h \ $(PARADISEO_H) diff --git a/eo/src/do/Makefile.am b/eo/src/do/Makefile.am index ca6877ec..3ec74729 100644 --- a/eo/src/do/Makefile.am +++ b/eo/src/do/Makefile.am @@ -1 +1,15 @@ +pkginclude_HEADERS = make_algo_easea.h \ + make_algo_pareto.h \ + make_algo_scalar.h \ + make_checkpoint.h \ + make_checkpoint_FDC.h \ + make_checkpoint_assembled.h \ + make_checkpoint_pareto.h \ + make_continue.h \ + make_continue_pareto.h \ + make_general_replacement.h \ + make_pop.h \ + make_run.h + + EXTRA_DIST = Readme diff --git a/eo/src/es/Makefile.am b/eo/src/es/Makefile.am index c9faaaa7..2fc5ecb0 100644 --- a/eo/src/es/Makefile.am +++ b/eo/src/es/Makefile.am @@ -17,7 +17,9 @@ libes_a_SOURCES = make_algo_scalar_es.cpp \ make_run_es.cpp \ make_run_real.cpp -pkginclude_HEADERS = eoEsChromInit.h \ +esincludedir = $(pkgincludedir)/es + +esinclude_HEADERS = eoEsChromInit.h \ eoEsFull.h \ eoEsGlobalXover.h \ eoEsMutate.h \ diff --git a/eo/src/ga/Makefile.am b/eo/src/ga/Makefile.am index 1c6959c0..6429011e 100644 --- a/eo/src/ga/Makefile.am +++ b/eo/src/ga/Makefile.am @@ -16,9 +16,9 @@ libga_a_SOURCES = make_algo_scalar_ga.cpp \ make_pop_ga.cpp \ make_run_ga.cpp -libeoincdir = $(includedir)/eo/ga +gaincludedir = $(pkgincludedir)/ga -libeoinc_HEADERS = eoBit.h \ +gainclude_HEADERS = eoBit.h \ eoBitOpFactory.h \ eoBitOp.h \ eoBoolFlip.h \ diff --git a/eo/src/gp/Makefile.am b/eo/src/gp/Makefile.am index 2de158c3..9ebcdd23 100644 --- a/eo/src/gp/Makefile.am +++ b/eo/src/gp/Makefile.am @@ -1,14 +1,11 @@ -############################################################################### -## ## Makefile.am for eo/src/gp -## -############################################################################### -libeoincdir = $(includedir)/eo/gp -libeoinc_HEADERS = eoParseTreeDepthInit.h \ - eoParseTree.h \ - eoParseTreeOp.h \ - eoStParseTreeDepthInit.h \ - eoStParseTreeOp.h \ - node_pool.h \ - parse_tree.h +gpincludedir = $(pkgincludedir)/gp + +gpinclude_HEADERS = eoParseTreeDepthInit.h \ + eoParseTree.h \ + eoParseTreeOp.h \ + eoStParseTreeDepthInit.h \ + eoStParseTreeOp.h \ + node_pool.h \ + parse_tree.h diff --git a/eo/src/other/Makefile.am b/eo/src/other/Makefile.am index 674f52d9..074966a3 100644 --- a/eo/src/other/Makefile.am +++ b/eo/src/other/Makefile.am @@ -1,13 +1,11 @@ -############################################################################### -## ## Makefile.am for eo/src/other -## -############################################################################### -INCLUDES = -I$(top_builddir)/src -#lib_LIBRARIES = libeoother.a -#libeoother_a_SOURCES = +AM_CXXFLAGS = -I$(top_builddir)/src -libeootherincdir = $(includedir)/eo/other -libeootherinc_HEADERS = eoExternalEO.h eoString.h external_eo eoExternalOpFunctions.h +otherincludedir = $(pkgincludedir)/other + +otherinclude_HEADERS = eoExternalEO.h \ + eoString.h \ + external_eo \ + eoExternalOpFunctions.h diff --git a/eo/tutorial/Lesson1/Makefile.am b/eo/tutorial/Lesson1/Makefile.am index fca2f182..d74f0733 100644 --- a/eo/tutorial/Lesson1/Makefile.am +++ b/eo/tutorial/Lesson1/Makefile.am @@ -1,5 +1,5 @@ -bin_PROGRAMS = FirstBitGA FirstRealGA exercise1.3 +noinst_PROGRAMS = FirstBitGA FirstRealGA exercise1.3 FirstBitGA_SOURCES = FirstBitGA.cpp diff --git a/eo/tutorial/Lesson2/Makefile.am b/eo/tutorial/Lesson2/Makefile.am index 91294fc7..8deb738c 100644 --- a/eo/tutorial/Lesson2/Makefile.am +++ b/eo/tutorial/Lesson2/Makefile.am @@ -1,5 +1,5 @@ -bin_PROGRAMS = FirstBitEA FirstRealEA exercise2.3 +noinst_PROGRAMS = FirstBitEA FirstRealEA exercise2.3 FirstBitEA_SOURCES = FirstBitEA.cpp diff --git a/eo/tutorial/Lesson3/Makefile.am b/eo/tutorial/Lesson3/Makefile.am index 5e942ca5..2d6a0ea1 100644 --- a/eo/tutorial/Lesson3/Makefile.am +++ b/eo/tutorial/Lesson3/Makefile.am @@ -1,5 +1,5 @@ -bin_PROGRAMS = SecondBitEA SecondRealEA exercise3.1 +noinst_PROGRAMS = SecondBitEA SecondRealEA exercise3.1 SecondBitEA_SOURCES = SecondBitEA.cpp diff --git a/eo/tutorial/Lesson4/Makefile.am b/eo/tutorial/Lesson4/Makefile.am index 6c55fcfe..97a2b80c 100644 --- a/eo/tutorial/Lesson4/Makefile.am +++ b/eo/tutorial/Lesson4/Makefile.am @@ -1,5 +1,5 @@ -bin_PROGRAMS = BitEA RealEA ESEA +noinst_PROGRAMS = BitEA RealEA ESEA BitEA_SOURCES = BitEA.cpp diff --git a/eo/tutorial/Lesson5/Makefile.am b/eo/tutorial/Lesson5/Makefile.am index 6fd9f2fa..65027f15 100644 --- a/eo/tutorial/Lesson5/Makefile.am +++ b/eo/tutorial/Lesson5/Makefile.am @@ -1,5 +1,5 @@ -bin_PROGRAMS = OneMaxEA OneMaxLibEA +noinst_PROGRAMS = OneMaxEA OneMaxLibEA OneMaxEA_SOURCES = OneMaxEA.cpp