diff --git a/eo/configure.in b/eo/configure.in index 6569c2b8..33fcb747 100644 --- a/eo/configure.in +++ b/eo/configure.in @@ -17,7 +17,6 @@ AM_CONFIG_HEADER(config.h) dnl user-switches AC_APPLICATIONS -AC_PARADISEO AC_TUTORIAL dnl Checks for programs. @@ -63,14 +62,6 @@ AC_OUTPUT(Makefile \ src/gp/Makefile \ src/ga/Makefile \ src/other/Makefile \ - src/paradisEO/Makefile \ - src/paradisEO/comm/Makefile \ - src/paradisEO/comm/messages/Makefile \ - src/paradisEO/comm/messages/from/Makefile \ - src/paradisEO/comm/messages/to/Makefile \ - src/paradisEO/eval/Makefile \ - src/paradisEO/island/Makefile \ - src/paradisEO/island/topologies/Makefile \ src/utils/Makefile \ test/Makefile \ tutorial/Makefile \ @@ -79,8 +70,4 @@ AC_OUTPUT(Makefile \ tutorial/Lesson3/Makefile \ tutorial/Lesson4/Makefile \ tutorial/Lesson5/Makefile \ - tutorial/ParadisEO/Makefile \ - tutorial/ParadisEO/Lesson1/Makefile \ - tutorial/ParadisEO/Lesson2/Makefile \ - tutorial/ParadisEO/Lesson3/Makefile \ win/Makefile) diff --git a/eo/src/Makefile.am b/eo/src/Makefile.am index b28bb440..7daecb48 100644 --- a/eo/src/Makefile.am +++ b/eo/src/Makefile.am @@ -1,12 +1,6 @@ # Makefile.am for eo/src -if USE_PARADISEO -SUBDIRS = es ga gp do utils other paradisEO -PARADISEO_H = paradiseo.h -else SUBDIRS = es ga gp do utils other -PARADISEO_H = -endif lib_LIBRARIES = libeo.a @@ -118,5 +112,5 @@ pkginclude_HEADERS = eo \ eoVariableLengthMutation.h \ eoVector.h \ es.h \ - ga.h \ - $(PARADISEO_H) + ga.h + diff --git a/eo/tutorial/Makefile.am b/eo/tutorial/Makefile.am index 61d590dd..66ed8252 100644 --- a/eo/tutorial/Makefile.am +++ b/eo/tutorial/Makefile.am @@ -1,5 +1,2 @@ -if USE_PARADISEO -SUBDIRS = Lesson1 Lesson2 Lesson3 Lesson4 Lesson5 ParadisEO -else SUBDIRS = Lesson1 Lesson2 Lesson3 Lesson4 Lesson5 -endif +