don't use user-variables

2004-09-20 16:05:25 +00:00 · 2004-09-20 16:05:25 +00:00 · 5e416e4a1c
commit 5e416e4a1c
parent 9e508c66a6
4 changed files with 79 additions and 83 deletions
--- a/eo/src/es/Makefile.am
+++ b/eo/src/es/Makefile.am
@ -4,44 +4,46 @@
 ##
 ###############################################################################

-INCLUDES = -I$(top_builddir)/src -I$(top_srcdir)/src
-lib_LIBRARIES = libes.a
-libes_a_SOURCES = make_algo_scalar_es.cpp \
-    make_algo_scalar_real.cpp \
-    make_checkpoint_es.cpp \
-    make_checkpoint_real.cpp \
-    make_continue_es.cpp \
-    make_continue_real.cpp \
-    make_genotype_es.cpp \
-    make_genotype_real.cpp \
-    make_op_es.cpp \
-    make_op_real.cpp \
-    make_pop_es.cpp \
-    make_pop_real.cpp \
-    make_run_es.cpp \
-    make_run_real.cpp
+AM_CXXFLAGS		= -I$(top_srcdir)/src

-CPPFLAGS = -Wall
-CXXFLAGS = 
-libeoincdir = $(includedir)/eo/es
-libeoinc_HEADERS = eoEsChromInit.h \
-    eoEsFull.h \
-    eoEsGlobalXover.h \
-    eoEsMutate.h \
-    eoEsMutationInit.h \
-    eoEsSimple.h \
-    eoEsStandardXover.h \
-    eoEsStdev.h \
-    eoNormalMutation.h \
-    eoRealAtomXover.h \
-    eoReal.h \
-    eoRealInitBounded.h \
-    eoRealOp.h \
-    eoSBXcross.h \
-    make_es.h \
-    make_genotype_real.h \
-    make_op_es.h \
-    make_op.h \
-    make_op_real.h \
-    make_real.h
+
+lib_LIBRARIES 		= libes.a
+
+libes_a_SOURCES 	= make_algo_scalar_es.cpp \
+			make_algo_scalar_real.cpp \
+			make_checkpoint_es.cpp \
+			make_checkpoint_real.cpp \
+			make_continue_es.cpp \
+			make_continue_real.cpp \
+			make_genotype_es.cpp \
+			make_genotype_real.cpp \
+			make_op_es.cpp \
+			make_op_real.cpp \
+			make_pop_es.cpp \
+			make_pop_real.cpp \
+			make_run_es.cpp \
+			make_run_real.cpp
+
+libeoincdir 		= $(includedir)/eo/es
+
+libeoinc_HEADERS 	= eoEsChromInit.h \
+			eoEsFull.h \
+			eoEsGlobalXover.h \
+			eoEsMutate.h \
+			eoEsMutationInit.h \
+			eoEsSimple.h \
+			eoEsStandardXover.h \
+			eoEsStdev.h \
+			eoNormalMutation.h \
+			eoRealAtomXover.h \
+			eoReal.h \
+			eoRealInitBounded.h \
+			eoRealOp.h \
+			eoSBXcross.h \
+			make_es.h \
+			make_genotype_real.h \
+			make_op_es.h \
+			make_op.h \
+			make_op_real.h \
+			make_real.h