From eb6e630a276cfbfb3e53263054edfcbaadcd5fdf Mon Sep 17 00:00:00 2001
From: evomarc <evomarc>
Date: Wed, 19 Jun 2002 03:42:54 +0000
Subject: [PATCH] Replaced ../../src with the DIR_EO macro!

---
 eo/tutorial/Templates/Makefile.tmpl | 23 +++++++++++------------
 1 file changed, 11 insertions(+), 12 deletions(-)

diff --git a/eo/tutorial/Templates/Makefile.tmpl b/eo/tutorial/Templates/Makefile.tmpl
index 053c3a99b..3f1a90a26 100644
--- a/eo/tutorial/Templates/Makefile.tmpl
+++ b/eo/tutorial/Templates/Makefile.tmpl
@@ -1,8 +1,13 @@
 # sample makefile for building an EA evolving a new genotype
 
-.cpp: ; c++  -DPACKAGE=\"eo\" -DVERSION=\"0.9.3\" -I. -I../../src -Wall -g  -o $@  $*.cpp ../../src/libeo.a ../../src/utils/libeoutils.a
+# START eventually modify the name of EO dir
+DIR_EO = ../../src
+# END eventually modify the name of EO dir
+LIB_EO = $(DIR_EO)/utils/libeoutils.a $(DIR_EO)/libeo.a
 
-.cpp.o: ; c++ -DPACKAGE=\"eo\" -DVERSION=\"0.9.3\" -I. -I../../src -I./util -Wall -g -c $*.cpp
+.cpp: ; c++  -DPACKAGE=\"eo\" -DVERSION=\"0.9.3\" -I. -I$(DIR_EO) -Wall -g  -o $@  $*.cpp $(LIB_EO)
+
+.cpp.o: ; c++ -DPACKAGE=\"eo\" -DVERSION=\"0.9.3\" -I. -I$(DIR_EO) -Wall -g -c $*.cpp
 
 # local sources
 COMMON_SOURCES =    eoMyStruct.h \
@@ -20,19 +25,13 @@ LIB_SOURCES = MyStructLibEA.cpp make_MyStruct.cpp
 
 SOURCES = $(COMMON_SOURCES) MyStructEA.cpp MyStructLibEA.cpp make_MyStruct.cpp
 
-# START eventually modify the name of EO dir
-DIR_EO = ../../src
-# END eventually modify the name of EO dir
-
-LIB_EO = $(DIR_EO)/utils/libeoutils.a $(DIR_EO)/libeo.a
-
 ALL = MyStructEA MyStructLibEA
 
-MyStructEA : MyStructEA.o
-	c++ -g -o $@ MyStructEA.o ../../src/utils/libeoutils.a ../../src/libeo.a -lm 
+MyStructEA : MyStructEA.cpp
+	c++ -I. -I$(DIR_EO) -g -o $@ MyStructEA.cpp $(LIB_EO) -lm 
 
 MyStructLibEA : MyStructLibEA.o make_MyStruct.o
-	c++ -g -o $@ MyStructLibEA.o make_MyStruct.o ../../src/utils/libeoutils.a ../../src/libeo.a -lm
+	c++ -g -o $@ MyStructLibEA.o make_MyStruct.o $(LIB_EO) -lm
 
 tar : ; tar czvf MyStruct.tgz *.h *.cpp Makefile
 
@@ -41,6 +40,6 @@ all : $(ALL)
 clean : ; /bin/rm  *.o $(ALL)
 
 ########## local dependencies
-MyStructEA.o : $(COMMON_SOURCES) MyStructEA.cpp
+MyStructEA.cpp : $(COMMON_SOURCES) 
 MyStructLibEA.o : $(COMMON_SOURCES) MyStructLibEA.cpp
 make_MyStruct.o : make_MyStruct.cpp eoMyStruct.h