diff --git a/eo/tutorial/Lesson1/Makefile b/eo/tutorial/Lesson1/Makefile
index 396873de..e6b995e8 100644
--- a/eo/tutorial/Lesson1/Makefile
+++ b/eo/tutorial/Lesson1/Makefile
@@ -1,12 +1,14 @@
-.cpp: ; g++  -DPACKAGE=\"eo\" -DVERSION=\"0.9.1\" -I. -I../../src -Wall -g  -o $@  $*.cpp ../../src/libeo.a ../../src/utils/libeoutils.a
+.cpp: ; c++  -DPACKAGE=\"eo\" -DVERSION=\"0.9.1\" -I. -I../../src -Wall -g  -o $@  $*.cpp ../../src/libeo.a ../../src/utils/libeoutils.a
 
-.cpp.o: ; g++ -DPACKAGE=\"eo\" -DVERSION=\"0.9.1\" -I. -I../../src -Wall -g -c $*.cpp
+.cpp.o: ; c++ -DPACKAGE=\"eo\" -DVERSION=\"0.9.1\" -I. -I../../src -Wall -g -c $*.cpp
 
 firstGA = FirstRealGA FirstBitGA
 
-ALL = $(firstGA) exercise3
+ALL = $(firstGA) exercise1.3
 
 lesson1 : $(firstGA)
 
+all : $(ALL)
+
 clean : 
 	@/bin/rm $(ALL) *.o *~
diff --git a/eo/tutorial/Lesson2/Makefile b/eo/tutorial/Lesson2/Makefile
index 75b3a2ec..f25456af 100644
--- a/eo/tutorial/Lesson2/Makefile
+++ b/eo/tutorial/Lesson2/Makefile
@@ -1,12 +1,14 @@
-.cpp: ; g++  -DPACKAGE=\"eo\" -DVERSION=\"0.9.1\" -I. -I../../src -Wall -g  -o $@  $*.cpp ../../src/libeo.a ../../src/utils/libeoutils.a
+.cpp: ; c++  -DPACKAGE=\"eo\" -DVERSION=\"0.9.1\" -I. -I../../src -Wall -g  -o $@  $*.cpp ../../src/libeo.a ../../src/utils/libeoutils.a
 
-.cpp.o: ; g++ -DPACKAGE=\"eo\" -DVERSION=\"0.9.1\" -I. -I../../src -Wall -g -c $*.cpp
+.cpp.o: ; c++ -DPACKAGE=\"eo\" -DVERSION=\"0.9.1\" -I. -I../../src -Wall -g -c $*.cpp
 
 firstEA = FirstRealEA FirstBitEA
 
-ALL = $(firstEA) exercise1 exercise2 exercise3 
+ALL = $(firstEA) exercise2.3
 
 lesson2 : $(firstEA)
 
+all : $(ALL)
+
 clean : 
 	@/bin/rm $(ALL) *.o *~
diff --git a/eo/tutorial/Lesson3/Makefile b/eo/tutorial/Lesson3/Makefile
index c4d3ec8e..16201978 100644
--- a/eo/tutorial/Lesson3/Makefile
+++ b/eo/tutorial/Lesson3/Makefile
@@ -1,12 +1,14 @@
-.cpp: ; g++  -DPACKAGE=\"eo\" -DVERSION=\"0.9.1\" -I. -I../../src -Wall -g  -o $@  $*.cpp ../../src/libeo.a ../../src/utils/libeoutils.a
+.cpp: ; c++  -DPACKAGE=\"eo\" -DVERSION=\"0.9.1\" -I. -I../../src -Wall -g  -o $@  $*.cpp ../../src/libeo.a ../../src/utils/libeoutils.a
 
-.cpp.o: ; g++ -DPACKAGE=\"eo\" -DVERSION=\"0.9.1\" -I. -I../../src -Wall -g -c $*.cpp
+.cpp.o: ; c++ -DPACKAGE=\"eo\" -DVERSION=\"0.9.1\" -I. -I../../src -Wall -g -c $*.cpp
 
 secondEA = SecondBitEA
 
-ALL = $(secondEA) exercise1 exercise2 exercise3 
+ALL = $(secondEA) exercise3.1
 
 lesson3 : $(secondEA)
 
+all : $(ALL)
+
 clean : 
 	@/bin/rm $(ALL) *.o *.sav *.xg *.status *~