fix installation, dist-preparation
This commit is contained in:
parent
495057c341
commit
51471804cd
18 changed files with 110 additions and 80 deletions
|
|
@ -1,7 +1,3 @@
|
|||
###############################################################################
|
||||
##
|
||||
## Makefile.am for app dir in eo
|
||||
##
|
||||
###############################################################################
|
||||
|
||||
SUBDIRS = mastermind gpsymreg
|
||||
SUBDIRS = mastermind gprop gpsymreg
|
||||
|
|
|
|||
|
|
@ -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)
|
||||
|
|
|
|||
|
|
@ -5,10 +5,21 @@
|
|||
#ifndef mlp_h
|
||||
#define mlp_h
|
||||
|
||||
//-----------------------------------------------------------------------------
|
||||
#ifdef HAVE_CONFIG_H
|
||||
#include <config.h>
|
||||
#endif
|
||||
|
||||
using namespace std;
|
||||
#include <values.h> // MAXFLOAT MINFLOAT
|
||||
#ifdef HAVE_NUMERIC_LIMITS
|
||||
#include <numeric>
|
||||
#define MLP_MAXFLOAT std::numeric_limits<double>::max()
|
||||
#define MLP_MINFLOAT std::numeric_limits<double>::min()
|
||||
#elif defined HAVE_VALUES_H
|
||||
#include <values.h>
|
||||
#define MLP_MAXFLOAT MAXFLOAT
|
||||
#define MLP_MINFLOAT MINFLOAT
|
||||
#else
|
||||
#error numerical limits not available
|
||||
#endif
|
||||
#include <math.h> // exp
|
||||
#include <stdexcept> // invalid_argument
|
||||
#include <iostream> // istream ostream
|
||||
|
|
@ -20,7 +31,9 @@ using namespace std;
|
|||
#include <utility>
|
||||
#include <iterator>
|
||||
|
||||
//-----------------------------------------------------------------------------
|
||||
|
||||
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
|
||||
|
||||
|
|
|
|||
|
|
@ -1,10 +1,6 @@
|
|||
###############################################################################
|
||||
#
|
||||
# Makefile.am for app/gpsymreg
|
||||
#
|
||||
###############################################################################
|
||||
|
||||
bin_PROGRAMS = gpsymreg
|
||||
noinst_PROGRAMS = gpsymreg
|
||||
|
||||
gpsymreg_SOURCES = main.cpp
|
||||
|
||||
|
|
|
|||
|
|
@ -1,10 +1,6 @@
|
|||
###############################################################################
|
||||
#
|
||||
# Makefile.am for app/mastermind
|
||||
#
|
||||
###############################################################################
|
||||
|
||||
bin_PROGRAMS = mastermind
|
||||
noinst_PROGRAMS = mastermind
|
||||
|
||||
mastermind_SOURCES = mastermind.cpp
|
||||
|
||||
|
|
|
|||
Reference in a new issue