fix error in preprocesing in dependency generation

alib2/makefile

@@ -15,7 +15,7 @@ all: build test
 lib/$(LIBRARY): obj/ $(OBJECTS)
-	mkdir -p lib;
+	mkdir -p lib
 	$(CXX) $(OBJECTS) -o $@ $(LDFLAGS)
 obj/makefile:
@@ -39,7 +39,7 @@ obj/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, \$$@) | 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 "" >> $@
@@ -48,9 +48,9 @@ obj/makefile:
 	echo "	cp makefile \$$@" >> $@
 	echo "" >> $@
 	echo "%/: FORCE | %/makefile" >> $@
-	echo "	@accesstime=\`stat -c %Y \$$@\`; \\" >> $@
-	echo "	\$$(MAKE) -C \$$@ SRCDIR=\$$(SRCDIR)\$$(notdir \$$(patsubst %/, %, \$$@))/ DEPTH=\$$(DEPTH)../; \\" >> $@
-	echo "	accesstime2=\`stat -c %Y \$$@\`; \\" >> $@
+	echo "	@accesstime=\`stat -c %Y \$$@\` && \\" >> $@
+	echo "	\$$(MAKE) -C \$$@ SRCDIR=\$$(SRCDIR)\$$(notdir \$$(patsubst %/, %, \$$@))/ DEPTH=\$$(DEPTH)../ && \\" >> $@
+	echo "	accesstime2=\`stat -c %Y \$$@\` && \\" >> $@
 	echo "	if [ "\$$\$$accesstime" -ne "\$$\$$accesstime2" ]; then \\" >> $@
 	echo "		touch .; \\" >> $@
 	echo "	fi" >> $@
@@ -70,7 +70,7 @@ build: lib/$(LIBRARY)
 test-bin/$(TESTBIN): test-obj/ lib/$(LIBRARY) $(TEST_OBJECTS)
-	mkdir -p test-bin;
+	mkdir -p test-bin
 	$(CXX) $(TEST_OBJECTS) -o $@ $(TEST_LDFLAGS)
 test-obj/makefile:
@@ -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, \$$@) | 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 "" >> $@
@@ -103,9 +103,9 @@ test-obj/makefile:
 	echo "	cp makefile \$$@" >> $@
 	echo "" >> $@
 	echo "%/: FORCE | %/makefile" >> $@
-	echo "	@accesstime=\`stat -c %Y \$$@\`; \\" >> $@
-	echo "	\$$(MAKE) -C \$$@ SRCDIR=\$$(SRCDIR)\$$(notdir \$$(patsubst %/, %, \$$@))/ DEPTH=\$$(DEPTH)../; \\" >> $@
-	echo "	accesstime2=\`stat -c %Y \$$@\`; \\" >> $@
+	echo "	@accesstime=\`stat -c %Y \$$@\` && \\" >> $@
+	echo "	\$$(MAKE) -C \$$@ SRCDIR=\$$(SRCDIR)\$$(notdir \$$(patsubst %/, %, \$$@))/ DEPTH=\$$(DEPTH)../ && \\" >> $@
+	echo "	accesstime2=\`stat -c %Y \$$@\` && \\" >> $@
 	echo "	if [ "\$$\$$accesstime" -ne "\$$\$$accesstime2" ]; then \\" >> $@
 	echo "		touch .; \\" >> $@
 	echo "	fi" >> $@