diff --git a/acat2/makefile b/acat2/makefile
index 4195cb069316ab5d70d1f0963972c6a7874bc607..d6e4d02f16e3116c8da713be9a56032cb6407c44 100644
--- a/acat2/makefile
+++ b/acat2/makefile
@@ -20,7 +20,7 @@ bin/$(EXECUTABLE): obj/ $(OBJECTS)
 
 obj/makefile: makefile
 	mkdir -p $(dir $@)
-	echo "SHELL:=/bin/bash" >> $@
+	echo "SHELL:=/bin/bash" > $@
 	echo "SRCDIR:=" >> $@
 	echo "DEPTH:=" >> $@
 	echo "" >> $@
@@ -39,7 +39,7 @@ obj/makefile: makefile
 	echo "all: \$$(OBJECTS_DIRS) \$$(OBJECTS)" >> $@
 	echo "" >> $@
 	echo "%.d:" >> $@
-	echo "	@echo \"\$$(shell sha1sum <<< \"\$$@\" | sed \"s/  -//g\") = \\$$\$$(shell (\\$$\$$(CXX) -MM \\$$\$$(CXXFLAGS) \$$(patsubst ../\$$(DEPTH)obj/\$$(SRCDIR)%.d,../\$$(DEPTH)src/\$$(SRCDIR)%.cpp, \$$@) 2>/dev/null || echo \\\"\$$(patsubst ../\$$(DEPTH)obj/\$$(SRCDIR)%.d,../\$$(DEPTH)src/\$$(SRCDIR)%.cpp, \$$@) FORCE\\\") | sed \\\"s/.*://g;s/\\\\\\\\\\\\\\\\//g\\\")\" >> \$$@" >> $@
+	echo "	@echo \"\$$(shell sha1sum <<< \"\$$@\" | sed \"s/  -//g\") = \\$$\$$(shell (\\$$\$$(CXX) -MM \\$$\$$(CXXFLAGS) \$$(patsubst ../\$$(DEPTH)obj/\$$(SRCDIR)%.d,../\$$(DEPTH)src/\$$(SRCDIR)%.cpp, \$$@) 2>/dev/null || echo \\\"\$$(patsubst ../\$$(DEPTH)obj/\$$(SRCDIR)%.d,../\$$(DEPTH)src/\$$(SRCDIR)%.cpp, \$$@) FORCE\\\") | sed \\\"s/.*://g;s/\\\\\\\\\\\\\\\\//g\\\")\" > \$$@" >> $@
 	echo "	@echo \"\$$(patsubst %.d,%.o, \$$@): \\$$\$$(\$$(shell sha1sum <<< \"\$$@\" | sed \"s/  -//g\"))\" >> \$$@" >> $@
 	echo "	@echo \"	\\$$\$$(CXX) \\$$\$$(CXXFLAGS) \\$$\$$< -o \$$(patsubst %.d,%.o, \$$@)\" >> \$$@" >> $@
 	echo "" >> $@
@@ -75,7 +75,7 @@ test-bin/$(TESTBIN): test-obj/ bin/$(EXECUTABLE) $(TEST_OBJECTS)
 
 test-obj/makefile:
 	mkdir -p $(dir $@)
-	echo "SHELL:=/bin/bash" >> $@
+	echo "SHELL:=/bin/bash" > $@
 	echo "SRCDIR:=" >> $@
 	echo "DEPTH:=" >> $@
 	echo "" >> $@
@@ -94,7 +94,7 @@ test-obj/makefile:
 	echo "all: \$$(OBJECTS_DIRS) \$$(OBJECTS)" >> $@
 	echo "" >> $@
 	echo "%.d:" >> $@
-	echo "	@echo \"\$$(shell sha1sum <<< \"\$$@\" | sed \"s/  -//g\") = \\$$\$$(shell (\\$$\$$(CXX) -MM \\$$\$$(CXXFLAGS) \$$(patsubst ../\$$(DEPTH)test-obj/\$$(SRCDIR)%.d,../\$$(DEPTH)test-src/\$$(SRCDIR)%.cpp, \$$@) 2>/dev/null || echo \\\"\$$(patsubst ../\$$(DEPTH)test-obj/\$$(SRCDIR)%.d,../\$$(DEPTH)test-src/\$$(SRCDIR)%.cpp, \$$@) FORCE\\\") | sed \\\"s/.*://g;s/\\\\\\\\\\\\\\\\//g\\\")\" >> \$$@" >> $@
+	echo "	@echo \"\$$(shell sha1sum <<< \"\$$@\" | sed \"s/  -//g\") = \\$$\$$(shell (\\$$\$$(CXX) -MM \\$$\$$(CXXFLAGS) \$$(patsubst ../\$$(DEPTH)test-obj/\$$(SRCDIR)%.d,../\$$(DEPTH)test-src/\$$(SRCDIR)%.cpp, \$$@) 2>/dev/null || echo \\\"\$$(patsubst ../\$$(DEPTH)test-obj/\$$(SRCDIR)%.d,../\$$(DEPTH)test-src/\$$(SRCDIR)%.cpp, \$$@) FORCE\\\") | sed \\\"s/.*://g;s/\\\\\\\\\\\\\\\\//g\\\")\" > \$$@" >> $@
 	echo "	@echo \"\$$(patsubst %.d,%.o, \$$@): \\$$\$$(\$$(shell sha1sum <<< \"\$$@\" | sed \"s/  -//g\"))\" >> \$$@" >> $@
 	echo "	@echo \"	\\$$\$$(CXX) \\$$\$$(CXXFLAGS) \\$$\$$< -o \$$(patsubst %.d,%.o, \$$@)\" >> \$$@" >> $@
 	echo "" >> $@
diff --git a/aconvert2/makefile b/aconvert2/makefile
index e531a97aea8f078a8a3a82ea9db4d4f87936d912..6a5314fdd0df214f75ca5fe735aa0ebacd462aa0 100644
--- a/aconvert2/makefile
+++ b/aconvert2/makefile
@@ -17,7 +17,7 @@ bin/$(EXECUTABLE): obj/ $(OBJECTS)
 
 obj/makefile: makefile
 	mkdir -p $(dir $@)
-	echo "SHELL:=/bin/bash" >> $@
+	echo "SHELL:=/bin/bash" > $@
 	echo "SRCDIR:=" >> $@
 	echo "DEPTH:=" >> $@
 	echo "" >> $@
@@ -36,7 +36,7 @@ obj/makefile: makefile
 	echo "all: \$$(OBJECTS_DIRS) \$$(OBJECTS)" >> $@
 	echo "" >> $@
 	echo "%.d:" >> $@
-	echo "	@echo \"\$$(shell sha1sum <<< \"\$$@\" | sed \"s/  -//g\") = \\$$\$$(shell (\\$$\$$(CXX) -MM \\$$\$$(CXXFLAGS) \$$(patsubst ../\$$(DEPTH)obj/\$$(SRCDIR)%.d,../\$$(DEPTH)src/\$$(SRCDIR)%.cpp, \$$@) 2>/dev/null || echo \\\"\$$(patsubst ../\$$(DEPTH)obj/\$$(SRCDIR)%.d,../\$$(DEPTH)src/\$$(SRCDIR)%.cpp, \$$@) FORCE\\\") | sed \\\"s/.*://g;s/\\\\\\\\\\\\\\\\//g\\\")\" >> \$$@" >> $@
+	echo "	@echo \"\$$(shell sha1sum <<< \"\$$@\" | sed \"s/  -//g\") = \\$$\$$(shell (\\$$\$$(CXX) -MM \\$$\$$(CXXFLAGS) \$$(patsubst ../\$$(DEPTH)obj/\$$(SRCDIR)%.d,../\$$(DEPTH)src/\$$(SRCDIR)%.cpp, \$$@) 2>/dev/null || echo \\\"\$$(patsubst ../\$$(DEPTH)obj/\$$(SRCDIR)%.d,../\$$(DEPTH)src/\$$(SRCDIR)%.cpp, \$$@) FORCE\\\") | sed \\\"s/.*://g;s/\\\\\\\\\\\\\\\\//g\\\")\" > \$$@" >> $@
 	echo "	@echo \"\$$(patsubst %.d,%.o, \$$@): \\$$\$$(\$$(shell sha1sum <<< \"\$$@\" | sed \"s/  -//g\"))\" >> \$$@" >> $@
 	echo "	@echo \"	\\$$\$$(CXX) \\$$\$$(CXXFLAGS) \\$$\$$< -o \$$(patsubst %.d,%.o, \$$@)\" >> \$$@" >> $@
 	echo "" >> $@
diff --git a/adeterminize2/makefile b/adeterminize2/makefile
index e972c74ff45d6e37c1544346a18e2bad2b5c82a1..3938bd1f31b0481830be246cdd2396386d844010 100644
--- a/adeterminize2/makefile
+++ b/adeterminize2/makefile
@@ -17,7 +17,7 @@ bin/$(EXECUTABLE): obj/ $(OBJECTS)
 
 obj/makefile: makefile
 	mkdir -p $(dir $@)
-	echo "SHELL:=/bin/bash" >> $@
+	echo "SHELL:=/bin/bash" > $@
 	echo "SRCDIR:=" >> $@
 	echo "DEPTH:=" >> $@
 	echo "" >> $@
@@ -36,7 +36,7 @@ obj/makefile: makefile
 	echo "all: \$$(OBJECTS_DIRS) \$$(OBJECTS)" >> $@
 	echo "" >> $@
 	echo "%.d:" >> $@
-	echo "	@echo \"\$$(shell sha1sum <<< \"\$$@\" | sed \"s/  -//g\") = \\$$\$$(shell (\\$$\$$(CXX) -MM \\$$\$$(CXXFLAGS) \$$(patsubst ../\$$(DEPTH)obj/\$$(SRCDIR)%.d,../\$$(DEPTH)src/\$$(SRCDIR)%.cpp, \$$@) 2>/dev/null || echo \\\"\$$(patsubst ../\$$(DEPTH)obj/\$$(SRCDIR)%.d,../\$$(DEPTH)src/\$$(SRCDIR)%.cpp, \$$@) FORCE\\\") | sed \\\"s/.*://g;s/\\\\\\\\\\\\\\\\//g\\\")\" >> \$$@" >> $@
+	echo "	@echo \"\$$(shell sha1sum <<< \"\$$@\" | sed \"s/  -//g\") = \\$$\$$(shell (\\$$\$$(CXX) -MM \\$$\$$(CXXFLAGS) \$$(patsubst ../\$$(DEPTH)obj/\$$(SRCDIR)%.d,../\$$(DEPTH)src/\$$(SRCDIR)%.cpp, \$$@) 2>/dev/null || echo \\\"\$$(patsubst ../\$$(DEPTH)obj/\$$(SRCDIR)%.d,../\$$(DEPTH)src/\$$(SRCDIR)%.cpp, \$$@) FORCE\\\") | sed \\\"s/.*://g;s/\\\\\\\\\\\\\\\\//g\\\")\" > \$$@" >> $@
 	echo "	@echo \"\$$(patsubst %.d,%.o, \$$@): \\$$\$$(\$$(shell sha1sum <<< \"\$$@\" | sed \"s/  -//g\"))\" >> \$$@" >> $@
 	echo "	@echo \"	\\$$\$$(CXX) \\$$\$$(CXXFLAGS) \\$$\$$< -o \$$(patsubst %.d,%.o, \$$@)\" >> \$$@" >> $@
 	echo "" >> $@
diff --git a/adiff2/makefile b/adiff2/makefile
index 350382614e94714d5af8e4e4a80465c27d0bf709..642ce408159feebda3a2f13693a7f77613ef422b 100644
--- a/adiff2/makefile
+++ b/adiff2/makefile
@@ -17,7 +17,7 @@ bin/$(EXECUTABLE): obj/ $(OBJECTS)
 
 obj/makefile: makefile
 	mkdir -p $(dir $@)
-	echo "SHELL:=/bin/bash" >> $@
+	echo "SHELL:=/bin/bash" > $@
 	echo "SRCDIR:=" >> $@
 	echo "DEPTH:=" >> $@
 	echo "" >> $@
@@ -36,7 +36,7 @@ obj/makefile: makefile
 	echo "all: \$$(OBJECTS_DIRS) \$$(OBJECTS)" >> $@
 	echo "" >> $@
 	echo "%.d:" >> $@
-	echo "	@echo \"\$$(shell sha1sum <<< \"\$$@\" | sed \"s/  -//g\") = \\$$\$$(shell (\\$$\$$(CXX) -MM \\$$\$$(CXXFLAGS) \$$(patsubst ../\$$(DEPTH)obj/\$$(SRCDIR)%.d,../\$$(DEPTH)src/\$$(SRCDIR)%.cpp, \$$@) 2>/dev/null || echo \\\"\$$(patsubst ../\$$(DEPTH)obj/\$$(SRCDIR)%.d,../\$$(DEPTH)src/\$$(SRCDIR)%.cpp, \$$@) FORCE\\\") | sed \\\"s/.*://g;s/\\\\\\\\\\\\\\\\//g\\\")\" >> \$$@" >> $@
+	echo "	@echo \"\$$(shell sha1sum <<< \"\$$@\" | sed \"s/  -//g\") = \\$$\$$(shell (\\$$\$$(CXX) -MM \\$$\$$(CXXFLAGS) \$$(patsubst ../\$$(DEPTH)obj/\$$(SRCDIR)%.d,../\$$(DEPTH)src/\$$(SRCDIR)%.cpp, \$$@) 2>/dev/null || echo \\\"\$$(patsubst ../\$$(DEPTH)obj/\$$(SRCDIR)%.d,../\$$(DEPTH)src/\$$(SRCDIR)%.cpp, \$$@) FORCE\\\") | sed \\\"s/.*://g;s/\\\\\\\\\\\\\\\\//g\\\")\" > \$$@" >> $@
 	echo "	@echo \"\$$(patsubst %.d,%.o, \$$@): \\$$\$$(\$$(shell sha1sum <<< \"\$$@\" | sed \"s/  -//g\"))\" >> \$$@" >> $@
 	echo "	@echo \"	\\$$\$$(CXX) \\$$\$$(CXXFLAGS) \\$$\$$< -o \$$(patsubst %.d,%.o, \$$@)\" >> \$$@" >> $@
 	echo "" >> $@
diff --git a/aepsilon2/makefile b/aepsilon2/makefile
index 0ae3f4208e5e282b847681f8a2376567e36c4f77..a27207f150a8cff36b6b1543aef5baabed02c4c1 100644
--- a/aepsilon2/makefile
+++ b/aepsilon2/makefile
@@ -17,7 +17,7 @@ bin/$(EXECUTABLE): obj/ $(OBJECTS)
 
 obj/makefile: makefile
 	mkdir -p $(dir $@)
-	echo "SHELL:=/bin/bash" >> $@
+	echo "SHELL:=/bin/bash" > $@
 	echo "SRCDIR:=" >> $@
 	echo "DEPTH:=" >> $@
 	echo "" >> $@
@@ -36,7 +36,7 @@ obj/makefile: makefile
 	echo "all: \$$(OBJECTS_DIRS) \$$(OBJECTS)" >> $@
 	echo "" >> $@
 	echo "%.d:" >> $@
-	echo "	@echo \"\$$(shell sha1sum <<< \"\$$@\" | sed \"s/  -//g\") = \\$$\$$(shell (\\$$\$$(CXX) -MM \\$$\$$(CXXFLAGS) \$$(patsubst ../\$$(DEPTH)obj/\$$(SRCDIR)%.d,../\$$(DEPTH)src/\$$(SRCDIR)%.cpp, \$$@) 2>/dev/null || echo \\\"\$$(patsubst ../\$$(DEPTH)obj/\$$(SRCDIR)%.d,../\$$(DEPTH)src/\$$(SRCDIR)%.cpp, \$$@) FORCE\\\") | sed \\\"s/.*://g;s/\\\\\\\\\\\\\\\\//g\\\")\" >> \$$@" >> $@
+	echo "	@echo \"\$$(shell sha1sum <<< \"\$$@\" | sed \"s/  -//g\") = \\$$\$$(shell (\\$$\$$(CXX) -MM \\$$\$$(CXXFLAGS) \$$(patsubst ../\$$(DEPTH)obj/\$$(SRCDIR)%.d,../\$$(DEPTH)src/\$$(SRCDIR)%.cpp, \$$@) 2>/dev/null || echo \\\"\$$(patsubst ../\$$(DEPTH)obj/\$$(SRCDIR)%.d,../\$$(DEPTH)src/\$$(SRCDIR)%.cpp, \$$@) FORCE\\\") | sed \\\"s/.*://g;s/\\\\\\\\\\\\\\\\//g\\\")\" > \$$@" >> $@
 	echo "	@echo \"\$$(patsubst %.d,%.o, \$$@): \\$$\$$(\$$(shell sha1sum <<< \"\$$@\" | sed \"s/  -//g\"))\" >> \$$@" >> $@
 	echo "	@echo \"	\\$$\$$(CXX) \\$$\$$(CXXFLAGS) \\$$\$$< -o \$$(patsubst %.d,%.o, \$$@)\" >> \$$@" >> $@
 	echo "" >> $@
diff --git a/aminimize2/makefile b/aminimize2/makefile
index 076ce8784b2c4d54ad68735d4250273fbf87186d..e0b982c6f806223f72833072dd4e76ecea7bfe9e 100644
--- a/aminimize2/makefile
+++ b/aminimize2/makefile
@@ -17,7 +17,7 @@ bin/$(EXECUTABLE): obj/ $(OBJECTS)
 
 obj/makefile: makefile
 	mkdir -p $(dir $@)
-	echo "SHELL:=/bin/bash" >> $@
+	echo "SHELL:=/bin/bash" > $@
 	echo "SRCDIR:=" >> $@
 	echo "DEPTH:=" >> $@
 	echo "" >> $@
@@ -36,7 +36,7 @@ obj/makefile: makefile
 	echo "all: \$$(OBJECTS_DIRS) \$$(OBJECTS)" >> $@
 	echo "" >> $@
 	echo "%.d:" >> $@
-	echo "	@echo \"\$$(shell sha1sum <<< \"\$$@\" | sed \"s/  -//g\") = \\$$\$$(shell (\\$$\$$(CXX) -MM \\$$\$$(CXXFLAGS) \$$(patsubst ../\$$(DEPTH)obj/\$$(SRCDIR)%.d,../\$$(DEPTH)src/\$$(SRCDIR)%.cpp, \$$@) 2>/dev/null || echo \\\"\$$(patsubst ../\$$(DEPTH)obj/\$$(SRCDIR)%.d,../\$$(DEPTH)src/\$$(SRCDIR)%.cpp, \$$@) FORCE\\\") | sed \\\"s/.*://g;s/\\\\\\\\\\\\\\\\//g\\\")\" >> \$$@" >> $@
+	echo "	@echo \"\$$(shell sha1sum <<< \"\$$@\" | sed \"s/  -//g\") = \\$$\$$(shell (\\$$\$$(CXX) -MM \\$$\$$(CXXFLAGS) \$$(patsubst ../\$$(DEPTH)obj/\$$(SRCDIR)%.d,../\$$(DEPTH)src/\$$(SRCDIR)%.cpp, \$$@) 2>/dev/null || echo \\\"\$$(patsubst ../\$$(DEPTH)obj/\$$(SRCDIR)%.d,../\$$(DEPTH)src/\$$(SRCDIR)%.cpp, \$$@) FORCE\\\") | sed \\\"s/.*://g;s/\\\\\\\\\\\\\\\\//g\\\")\" > \$$@" >> $@
 	echo "	@echo \"\$$(patsubst %.d,%.o, \$$@): \\$$\$$(\$$(shell sha1sum <<< \"\$$@\" | sed \"s/  -//g\"))\" >> \$$@" >> $@
 	echo "	@echo \"	\\$$\$$(CXX) \\$$\$$(CXXFLAGS) \\$$\$$< -o \$$(patsubst %.d,%.o, \$$@)\" >> \$$@" >> $@
 	echo "" >> $@
diff --git a/anormalize2/makefile b/anormalize2/makefile
index 1171e3d55d81e7a2b2e7e9bbfb08180e66798891..6c93eb7afec39ca6e574eee0e982c0a996894e99 100644
--- a/anormalize2/makefile
+++ b/anormalize2/makefile
@@ -17,7 +17,7 @@ bin/$(EXECUTABLE): obj/ $(OBJECTS)
 
 obj/makefile: makefile
 	mkdir -p $(dir $@)
-	echo "SHELL:=/bin/bash" >> $@
+	echo "SHELL:=/bin/bash" > $@
 	echo "SRCDIR:=" >> $@
 	echo "DEPTH:=" >> $@
 	echo "" >> $@
@@ -36,7 +36,7 @@ obj/makefile: makefile
 	echo "all: \$$(OBJECTS_DIRS) \$$(OBJECTS)" >> $@
 	echo "" >> $@
 	echo "%.d:" >> $@
-	echo "	@echo \"\$$(shell sha1sum <<< \"\$$@\" | sed \"s/  -//g\") = \\$$\$$(shell (\\$$\$$(CXX) -MM \\$$\$$(CXXFLAGS) \$$(patsubst ../\$$(DEPTH)obj/\$$(SRCDIR)%.d,../\$$(DEPTH)src/\$$(SRCDIR)%.cpp, \$$@) 2>/dev/null || echo \\\"\$$(patsubst ../\$$(DEPTH)obj/\$$(SRCDIR)%.d,../\$$(DEPTH)src/\$$(SRCDIR)%.cpp, \$$@) FORCE\\\") | sed \\\"s/.*://g;s/\\\\\\\\\\\\\\\\//g\\\")\" >> \$$@" >> $@
+	echo "	@echo \"\$$(shell sha1sum <<< \"\$$@\" | sed \"s/  -//g\") = \\$$\$$(shell (\\$$\$$(CXX) -MM \\$$\$$(CXXFLAGS) \$$(patsubst ../\$$(DEPTH)obj/\$$(SRCDIR)%.d,../\$$(DEPTH)src/\$$(SRCDIR)%.cpp, \$$@) 2>/dev/null || echo \\\"\$$(patsubst ../\$$(DEPTH)obj/\$$(SRCDIR)%.d,../\$$(DEPTH)src/\$$(SRCDIR)%.cpp, \$$@) FORCE\\\") | sed \\\"s/.*://g;s/\\\\\\\\\\\\\\\\//g\\\")\" > \$$@" >> $@
 	echo "	@echo \"\$$(patsubst %.d,%.o, \$$@): \\$$\$$(\$$(shell sha1sum <<< \"\$$@\" | sed \"s/  -//g\"))\" >> \$$@" >> $@
 	echo "	@echo \"	\\$$\$$(CXX) \\$$\$$(CXXFLAGS) \\$$\$$< -o \$$(patsubst %.d,%.o, \$$@)\" >> \$$@" >> $@
 	echo "" >> $@
diff --git a/arand2/makefile b/arand2/makefile
index 96efdd11722e55a135f773df9c6d2c165b25ad63..41eec9290c1499ec3c8ea2926deb1de99677acdb 100644
--- a/arand2/makefile
+++ b/arand2/makefile
@@ -17,7 +17,7 @@ bin/$(EXECUTABLE): obj/ $(OBJECTS)
 
 obj/makefile: makefile
 	mkdir -p $(dir $@)
-	echo "SHELL:=/bin/bash" >> $@
+	echo "SHELL:=/bin/bash" > $@
 	echo "SRCDIR:=" >> $@
 	echo "DEPTH:=" >> $@
 	echo "" >> $@
@@ -36,7 +36,7 @@ obj/makefile: makefile
 	echo "all: \$$(OBJECTS_DIRS) \$$(OBJECTS)" >> $@
 	echo "" >> $@
 	echo "%.d:" >> $@
-	echo "	@echo \"\$$(shell sha1sum <<< \"\$$@\" | sed \"s/  -//g\") = \\$$\$$(shell (\\$$\$$(CXX) -MM \\$$\$$(CXXFLAGS) \$$(patsubst ../\$$(DEPTH)obj/\$$(SRCDIR)%.d,../\$$(DEPTH)src/\$$(SRCDIR)%.cpp, \$$@) 2>/dev/null || echo \\\"\$$(patsubst ../\$$(DEPTH)obj/\$$(SRCDIR)%.d,../\$$(DEPTH)src/\$$(SRCDIR)%.cpp, \$$@) FORCE\\\") | sed \\\"s/.*://g;s/\\\\\\\\\\\\\\\\//g\\\")\" >> \$$@" >> $@
+	echo "	@echo \"\$$(shell sha1sum <<< \"\$$@\" | sed \"s/  -//g\") = \\$$\$$(shell (\\$$\$$(CXX) -MM \\$$\$$(CXXFLAGS) \$$(patsubst ../\$$(DEPTH)obj/\$$(SRCDIR)%.d,../\$$(DEPTH)src/\$$(SRCDIR)%.cpp, \$$@) 2>/dev/null || echo \\\"\$$(patsubst ../\$$(DEPTH)obj/\$$(SRCDIR)%.d,../\$$(DEPTH)src/\$$(SRCDIR)%.cpp, \$$@) FORCE\\\") | sed \\\"s/.*://g;s/\\\\\\\\\\\\\\\\//g\\\")\" > \$$@" >> $@
 	echo "	@echo \"\$$(patsubst %.d,%.o, \$$@): \\$$\$$(\$$(shell sha1sum <<< \"\$$@\" | sed \"s/  -//g\"))\" >> \$$@" >> $@
 	echo "	@echo \"	\\$$\$$(CXX) \\$$\$$(CXXFLAGS) \\$$\$$< -o \$$(patsubst %.d,%.o, \$$@)\" >> \$$@" >> $@
 	echo "" >> $@
diff --git a/atrim2/makefile b/atrim2/makefile
index f6d429ad3b97e4e293f692a1c19262a0074b44ac..54ff5a10e87943829808c7b2c3a66f3a021fc587 100644
--- a/atrim2/makefile
+++ b/atrim2/makefile
@@ -17,7 +17,7 @@ bin/$(EXECUTABLE): obj/ $(OBJECTS)
 
 obj/makefile: makefile
 	mkdir -p $(dir $@)
-	echo "SHELL:=/bin/bash" >> $@
+	echo "SHELL:=/bin/bash" > $@
 	echo "SRCDIR:=" >> $@
 	echo "DEPTH:=" >> $@
 	echo "" >> $@
@@ -36,7 +36,7 @@ obj/makefile: makefile
 	echo "all: \$$(OBJECTS_DIRS) \$$(OBJECTS)" >> $@
 	echo "" >> $@
 	echo "%.d:" >> $@
-	echo "	@echo \"\$$(shell sha1sum <<< \"\$$@\" | sed \"s/  -//g\") = \\$$\$$(shell (\\$$\$$(CXX) -MM \\$$\$$(CXXFLAGS) \$$(patsubst ../\$$(DEPTH)obj/\$$(SRCDIR)%.d,../\$$(DEPTH)src/\$$(SRCDIR)%.cpp, \$$@) 2>/dev/null || echo \\\"\$$(patsubst ../\$$(DEPTH)obj/\$$(SRCDIR)%.d,../\$$(DEPTH)src/\$$(SRCDIR)%.cpp, \$$@) FORCE\\\") | sed \\\"s/.*://g;s/\\\\\\\\\\\\\\\\//g\\\")\" >> \$$@" >> $@
+	echo "	@echo \"\$$(shell sha1sum <<< \"\$$@\" | sed \"s/  -//g\") = \\$$\$$(shell (\\$$\$$(CXX) -MM \\$$\$$(CXXFLAGS) \$$(patsubst ../\$$(DEPTH)obj/\$$(SRCDIR)%.d,../\$$(DEPTH)src/\$$(SRCDIR)%.cpp, \$$@) 2>/dev/null || echo \\\"\$$(patsubst ../\$$(DEPTH)obj/\$$(SRCDIR)%.d,../\$$(DEPTH)src/\$$(SRCDIR)%.cpp, \$$@) FORCE\\\") | sed \\\"s/.*://g;s/\\\\\\\\\\\\\\\\//g\\\")\" > \$$@" >> $@
 	echo "	@echo \"\$$(patsubst %.d,%.o, \$$@): \\$$\$$(\$$(shell sha1sum <<< \"\$$@\" | sed \"s/  -//g\"))\" >> \$$@" >> $@
 	echo "	@echo \"	\\$$\$$(CXX) \\$$\$$(CXXFLAGS) \\$$\$$< -o \$$(patsubst %.d,%.o, \$$@)\" >> \$$@" >> $@
 	echo "" >> $@
diff --git a/makefile b/makefile
index 5ac98ba644ffdbf791472c55ba53347539793257..0a0236cb26b923d5b8f6a86bd7526b6043f55bd0 100644
--- a/makefile
+++ b/makefile
@@ -2,20 +2,18 @@ APPPATH = /usr/bin
 LIBPATH = /usr/lib
 BINFOLDER = bin
 
-CORE_LIB = alib
-SUBDIRS_LIBS = libaregexptree
-SUBDIRS_BINS = acat \
-               aconvert aconvert.dot aconvert.gastex aconvert.regexp aconvert.automaton aconvert.grammar \
-               aminimize \
-               adeterminize \
-               adiff adiff.automaton adiff.grammar \
-               aepsilon \
-               atrim \
-               anormalize \
-               aconversions \
-               aderivation aintegral \
-               aoptimize.regexp \
-               arand
+CORE_LIB = alib2data
+SUBDIRS_LIBS = alib2algo
+SUBDIRS_BINS = acat2 \
+               aconvert2 \
+               adeterminize2 \
+               adiff2 \
+               aepsilon2 \
+               aminimize2 \
+               anormalize2 \
+               arand2 \
+               atrim2 \
+
 SUBDIRS_WITH_MAKE = $(dir $(wildcard */makefile))
 
 .PHONY: $(CORE_LIB) $(SUBDIRS_LIBS) $(SUBDIRS_BINS)