diff --git a/Makefile b/Makefile
index f1a74ed..56c0a61 100644
--- a/Makefile
+++ b/Makefile
@@ -2,78 +2,14 @@ COMMAND=. ~/salome/SALOME-MECA-2014.1-LGPL/salome_prerequisites.sh;~/salome/SALO
 GC=git checkout
 GM=$(GC) master
 DEFECTS=regular.export d1.export d2.export d3.export d4.export d5.export d6.export
+TARGETS=cc_s0 cc_s1 cc_s2 cs_s3 cs_s4 cs_s5
 
-.PHONY: calcAll gm
-
-all: cc_s0 cc_s1 cc_s2 cs_s3 cs_s4 cs_s5
-
-cc_s0: cc_s0.gt 
-	$(MAKE) calcAll 
-
-cc_s1: cc_s1.gt
-	$(MAKE) calcAll 
-
-cc_s2: cc_s2.gt
-	$(MAKE) calcAll 
-
-cs_s3: cs_s3.gt
-	$(MAKE) calcAll 
-
-cs_s4: cs_s4.gt
-	$(MAKE) calcAll 
-
-cs_s5: cs_s5.gt
-	$(MAKE) calcAll 
-
-calcAll: 
-	for D in $(DEFECTS) ; do \
-		echo $$D ; \
-	done
-	$(MAKE) gm
-
-gm:
-	$(GM)
-
-cc_s0.gt:
-	$(GC) cc_s0
-
-cc_s1.gt:
-	$(GC) cc_s1
-
-cc_s2.gt:
-	$(GC) cc_s2
-
-cs_s3.gt:
-	$(GC) cs_s3
-
-cs_s4.gt:
-	$(GC) cs_s4
-
-cs_s5.gt:
-	$(GC) cs_s5
-
-regular:
-	$(COMMAND) regular.export
-
-d1:
-	$(COMMAND) d1.export
-
-d2: 
-	$(COMMAND) d2.export
-
-d3: 
-	$(COMMAND) d3.export
-
-d4: 
-	$(COMMAND) d4.export
-
-d5: 
-	$(COMMAND) d5.export
-
-d6: 
-	$(COMMAND) d6.export
-
-clean: 
-	rm *~
-
-
+all:
+	for T in $(TARGETS); do \
+		$(GC) $$T
+		for D in $(DEFECTS) ; do \
+# 			$(COMMAND) $$D ; \
+			echo $$D ; \
+		done
+		$(GM)
+	done
\ No newline at end of file