diff --git a/demos/c-ares/Makefile b/demos/c-ares/Makefile
index 343c5c4e..c14b8fa7 100644
--- a/demos/c-ares/Makefile
+++ b/demos/c-ares/Makefile
@@ -16,10 +16,10 @@ DEPS_LDD = $(PWD)/$(LIB_NAME)/lib/
 
 #------------------------------------------------------------------------
 lib: # build for harness generation. Dynamic linking, asan, and afl instrumentation
-	export AFL_USE_ASAN=1
-	export AFL_USE_UBSAN=1
-	rm -rf $(LIB_NAME)
-	git clone $(LIB_REPO) $(LIB_NAME)
+	export AFL_USE_ASAN=1 && \
+	export AFL_USE_UBSAN=1 && \
+	rm -rf $(LIB_NAME) && \
+	git clone $(LIB_REPO) $(LIB_NAME) && \
 	cd $(LIB_NAME) && \
 	git checkout a8c091750d4db206ead3555b9a18e238525d7ca8 && \
 	cmake . \
diff --git a/demos/cgltf/Makefile b/demos/cgltf/Makefile
index e089a1a1..8ab52a35 100644
--- a/demos/cgltf/Makefile
+++ b/demos/cgltf/Makefile
@@ -16,10 +16,10 @@ DEPS_LDD = $(PWD)/$(LIB_NAME)/
 
 #------------------------------------------------------------------------
 lib: # build for harness generation. Dynamic linking, asan, and afl instrumentation
-	export AFL_USE_ASAN=1
-	export AFL_USE_UBSAN=1
-	rm -rf $(LIB_NAME)
-	git clone $(LIB_REPO) $(LIB_NAME)
+	export AFL_USE_ASAN=1 && \
+	export AFL_USE_UBSAN=1 && \
+	rm -rf $(LIB_NAME) && \
+	git clone $(LIB_REPO) $(LIB_NAME) && \
 	cd $(LIB_NAME) && \
 	make CC=$(CC_FUZZ)
 
diff --git a/demos/cjson/Makefile b/demos/cjson/Makefile
index 912593b3..e500af38 100644
--- a/demos/cjson/Makefile
+++ b/demos/cjson/Makefile
@@ -16,10 +16,10 @@ DEPS_STC = -l:libcjson.a
 
 #------------------------------------------------------------------------
 lib: # build for harness generation. Dynamic linking, asan, and afl instrumentation
-	export AFL_USE_ASAN=1
-	export AFL_USE_UBSAN=1
-	rm -rf $(LIB_NAME)
-	git clone $(LIB_REPO) $(LIB_NAME) 
+	export AFL_USE_ASAN=1 && \
+	export AFL_USE_UBSAN=1 && \
+	rm -rf $(LIB_NAME) && \
+	git clone $(LIB_REPO) $(LIB_NAME) && \
 	cd $(LIB_NAME) && \
 	git checkout 12c4bf1986c288950a3d06da757109a6aa1ece38 && \
 	cmake . \
diff --git a/demos/faup/Makefile b/demos/faup/Makefile
index be91a99f..8b0be0f8 100644
--- a/demos/faup/Makefile
+++ b/demos/faup/Makefile
@@ -17,10 +17,10 @@ DEPS_LDD = $(PWD)/$(LIB_NAME)/build/src/lib
 
 #------------------------------------------------------------------------
 lib: # build for harness generation. Dynamic linking, asan, and afl instrumentation
-	export AFL_USE_ASAN=1
-	export AFL_USE_UBSAN=1
-	rm -rf $(LIB_NAME)
-	git clone $(LIB_REPO) $(LIB_NAME)
+	export AFL_USE_ASAN=1 && \
+	export AFL_USE_UBSAN=1 && \
+	rm -rf $(LIB_NAME) && \
+	git clone $(LIB_REPO) $(LIB_NAME) && \
 	cd $(LIB_NAME) && cd build && \
 	git checkout 3a26d0a0d643f5035e1d846e6df9472569a6ef0e &&\
 	cmake .. \
diff --git a/demos/fyaml/Makefile b/demos/fyaml/Makefile
index d47bdfad..9f6cd464 100644
--- a/demos/fyaml/Makefile
+++ b/demos/fyaml/Makefile
@@ -16,10 +16,10 @@ DEPS_LDD = $(PWD)/$(LIB_NAME)/
 
 #------------------------------------------------------------------------
 lib: # build for harness generation. Dynamic linking, asan, and afl instrumentation
-	export AFL_USE_ASAN=1
-	export AFL_USE_UBSAN=1
-	rm -rf $(LIB_NAME)
-	git clone $(LIB_REPO) $(LIB_NAME)
+	export AFL_USE_ASAN=1 && \
+	export AFL_USE_UBSAN=1 && \
+	rm -rf $(LIB_NAME) && \
+	git clone $(LIB_REPO) $(LIB_NAME) && \
 	cd $(LIB_NAME) && \
 	git checkout 1f520e6717113136763cd4485bebfb51fde6a41e && \
 	cmake . \
diff --git a/demos/geos/Makefile b/demos/geos/Makefile
index e9c5ce51..8d5030f4 100644
--- a/demos/geos/Makefile
+++ b/demos/geos/Makefile
@@ -19,10 +19,10 @@ DEPS_LDD = $(PWD)/$(LIB_NAME)/lib/
 
 #------------------------------------------------------------------------
 lib: # build for harness generation. Dynamic linking, asan, and afl instrumentation
-	export AFL_USE_ASAN=1
-	export AFL_USE_UBSAN=1
-	rm -rf $(LIB_NAME)
-	git clone $(LIB_REPO) $(LIB_NAME)
+	export AFL_USE_ASAN=1 && \
+	export AFL_USE_UBSAN=1 && \
+	rm -rf $(LIB_NAME) && \
+	git clone $(LIB_REPO) $(LIB_NAME) && \
 	cd $(LIB_NAME) && \
 	git checkout c8b889be9e8fa22de8a34bea50fec3bb073f6898 && \
 	cmake . \
diff --git a/demos/gpac/Makefile b/demos/gpac/Makefile
index 3956edb0..8dfedf03 100644
--- a/demos/gpac/Makefile
+++ b/demos/gpac/Makefile
@@ -18,10 +18,10 @@ DEPS_LDD = $(PWD)/$(LIB_NAME)/bin/gcc
 
 #------------------------------------------------------------------------
 lib: # build for harness generation. Dynamic linking, asan, and afl instrumentation -- cp statement at bottom since config file isn't happy
-	export AFL_USE_ASAN=1
-	export AFL_USE_UBSAN=1
-	rm -rf $(LIB_NAME)
-	git clone $(LIB_REPO) $(LIB_NAME)
+	export AFL_USE_ASAN=1 && \
+	export AFL_USE_UBSAN=1 && \
+	rm -rf $(LIB_NAME) && \
+	git clone $(LIB_REPO) $(LIB_NAME) && \
 	cd $(LIB_NAME) && \
 	git checkout 5d70253ac94e5840be7b86054131dd753af63cc7 && \
 	patch -u include/gpac/internal/isomedia_dev.h \
diff --git a/demos/hdf5/Makefile b/demos/hdf5/Makefile
index 2f795c3f..6ad5ee85 100644
--- a/demos/hdf5/Makefile
+++ b/demos/hdf5/Makefile
@@ -16,10 +16,10 @@ DEPS_STC = -l:libhdf5.a -lsz -lz -lm -lsz -laec
 
 #------------------------------------------------------------------------
 lib: # build for harness generation. Dynamic linking, asan, and afl instrumentation
-	export AFL_USE_ASAN=1
-	export AFL_USE_UBSAN=1
-	rm -rf $(LIB_NAME)
-	git clone $(LIB_REPO) $(LIB_NAME)
+	export AFL_USE_ASAN=1 && \
+	export AFL_USE_UBSAN=1 && \
+	rm -rf $(LIB_NAME) && \
+	git clone $(LIB_REPO) $(LIB_NAME) && \
 	cd $(LIB_NAME) && \
 	git checkout 0394b03f66dc45fe96e2c772b7bce293e4316ad2 && \
 	./autogen.sh && ./configure \
diff --git a/demos/ical/Makefile b/demos/ical/Makefile
index e14cb2a7..351e14af 100644
--- a/demos/ical/Makefile
+++ b/demos/ical/Makefile
@@ -23,10 +23,10 @@ DEPS_LDD = $(PWD)/$(LIB_NAME)/lib/
 
 #------------------------------------------------------------------------
 lib: # build for harness generation. Dynamic linking, asan, and afl instrumentation
-	export AFL_USE_ASAN=1
-	export AFL_USE_UBSAN=1
-	rm -rf $(LIB_NAME)
-	git clone $(LIB_REPO) $(LIB_NAME)
+	export AFL_USE_ASAN=1 && \
+	export AFL_USE_UBSAN=1 && \
+	rm -rf $(LIB_NAME) && \
+	git clone $(LIB_REPO) $(LIB_NAME) && \
 	cd $(LIB_NAME) && \
 	git checkout 460b8d71e70ceb1b88bca6ce8d3aefb2ace05900 && \
 	cmake . \
diff --git a/demos/lcms/Makefile b/demos/lcms/Makefile
index 0b56e3f5..52a15475 100644
--- a/demos/lcms/Makefile
+++ b/demos/lcms/Makefile
@@ -15,10 +15,10 @@ DEPS_LDD = $(PWD)/$(LIB_NAME)/src/.libs
 
 #------------------------------------------------------------------------
 lib: # build for harness generation. Dynamic linking, asan, and afl instrumentation
-	export AFL_USE_ASAN=1
-	export AFL_USE_UBSAN=1
-	rm -rf $(LIB_NAME)
-	git clone $(LIB_REPO) $(LIB_NAME)
+	export AFL_USE_ASAN=1 && \
+	export AFL_USE_UBSAN=1 && \
+	rm -rf $(LIB_NAME) && \
+	git clone $(LIB_REPO) $(LIB_NAME) && \
 	cd $(LIB_NAME) && \
 	git checkout 676e803e4c34aa223da0b811c8a3ef11ed801afb && \
 	./autogen.sh && ./configure \
diff --git a/demos/lexbor/Makefile b/demos/lexbor/Makefile
index ff0242fc..ef5a883e 100644
--- a/demos/lexbor/Makefile
+++ b/demos/lexbor/Makefile
@@ -16,10 +16,10 @@ DEPS_LDD = $(PWD)/$(LIB_NAME)/
 
 #------------------------------------------------------------------------
 lib: # build for harness generation. Dynamic linking, asan, and afl instrumentation
-	export AFL_USE_ASAN=1
-	export AFL_USE_UBSAN=1
-	rm -rf $(LIB_NAME)
-	git clone $(LIB_REPO) $(LIB_NAME)
+	export AFL_USE_ASAN=1 && \
+	export AFL_USE_UBSAN=1 && \
+	rm -rf $(LIB_NAME) && \
+	git clone $(LIB_REPO) $(LIB_NAME) && \
 	cd $(LIB_NAME) && \
 	git checkout 6c219fe4ec9866067e9a635c5ad1b74cb617e154 && \
 	cmake . \
diff --git a/demos/magic/Makefile b/demos/magic/Makefile
index f7376394..05366468 100644
--- a/demos/magic/Makefile
+++ b/demos/magic/Makefile
@@ -15,10 +15,10 @@ DEPS_LDD = $(PWD)/$(LIB_NAME)/src/.libs/
 
 #------------------------------------------------------------------------
 lib: # build for harness generation. Dynamic linking, asan, and afl instrumentation
-	export AFL_USE_ASAN=1
-	export AFL_USE_UBSAN=1
-	rm -rf $(LIB_NAME)
-	git clone $(LIB_REPO) $(LIB_NAME)
+	export AFL_USE_ASAN=1 && \
+	export AFL_USE_UBSAN=1 && \
+	rm -rf $(LIB_NAME) && \
+	git clone $(LIB_REPO) $(LIB_NAME) && \
 	cd $(LIB_NAME) && \
 	git checkout 0fa2c8c3e64c372d038d46969bafaaa09a13a87b && \
 	autoreconf -i && ./configure \
diff --git a/demos/openexr/Makefile b/demos/openexr/Makefile
index 57e6396d..99db0a12 100644
--- a/demos/openexr/Makefile
+++ b/demos/openexr/Makefile
@@ -22,10 +22,10 @@ DEPS_LDD = $(PWD)/$(LIB_NAME)/src/lib/OpenEXR:$(PWD)/$(LIB_NAME)/src/lib/OpenEXR
 
 #------------------------------------------------------------------------
 lib: # build for harness generation. Dynamic linking, asan, and afl instrumentation
-	export AFL_USE_ASAN=1
-	export AFL_USE_UBSAN=1
-	rm -rf $(LIB_NAME)
-	git clone $(LIB_REPO) $(LIB_NAME)
+	export AFL_USE_ASAN=1 && \
+	export AFL_USE_UBSAN=1 && \
+	rm -rf $(LIB_NAME) && \
+	git clone $(LIB_REPO) $(LIB_NAME) && \
 	cd $(LIB_NAME) && \
 	git checkout d669510fda59ac26dc183e8bc271208c0eb737ad && \
 	cmake . \
diff --git a/demos/pcap/Makefile b/demos/pcap/Makefile
index b2baaf9a..b2a8321d 100644
--- a/demos/pcap/Makefile
+++ b/demos/pcap/Makefile
@@ -16,10 +16,10 @@ DEPS_LDD = $(PWD)/$(LIB_NAME)/
 
 #------------------------------------------------------------------------
 lib: # build for harness generation. Dynamic linking, asan, and afl instrumentation
-	export AFL_USE_ASAN=1
-	export AFL_USE_UBSAN=1
-	rm -rf $(LIB_NAME)
-	git clone $(LIB_REPO) $(LIB_NAME)
+	export AFL_USE_ASAN=1 && \
+	export AFL_USE_UBSAN=1 && \
+	rm -rf $(LIB_NAME) && \
+	git clone $(LIB_REPO) $(LIB_NAME) && \
 	cd $(LIB_NAME) && \
 	git checkout e17fe06d6a54abc85fb17998d0cb1742d490382a && \
 	./autogen.sh && ./configure \
diff --git a/demos/pcre2/Makefile b/demos/pcre2/Makefile
index 2d42e112..3f1664ea 100644
--- a/demos/pcre2/Makefile
+++ b/demos/pcre2/Makefile
@@ -16,10 +16,10 @@ DEPS_LDD = $(PWD)/$(LIB_NAME)/
 
 #------------------------------------------------------------------------
 lib: # build for harness generation. Dynamic linking, asan, and afl instrumentation
-	export AFL_USE_ASAN=1
-	export AFL_USE_UBSAN=1
-	rm -rf $(LIB_NAME)
-	git clone $(LIB_REPO) $(LIB_NAME)
+	export AFL_USE_ASAN=1 && \
+	export AFL_USE_UBSAN=1 && \
+	rm -rf $(LIB_NAME) && \
+	git clone $(LIB_REPO) $(LIB_NAME) && \
 	cd $(LIB_NAME) && \
 	git checkout a67878318cd08eb92e7f3afa2a15b55d46d285e2 && \
 	cmake . \
diff --git a/demos/raylib/Makefile b/demos/raylib/Makefile
index d43ad6fd..7f374efb 100644
--- a/demos/raylib/Makefile
+++ b/demos/raylib/Makefile
@@ -18,10 +18,10 @@ DEPS_LDD = $(PWD)/$(LIB_NAME)/raylib/
 
 #------------------------------------------------------------------------
 lib: # build for harness generation. Dynamic linking, asan, and afl instrumentation
-	export AFL_USE_ASAN=1
-	export AFL_USE_UBSAN=1
-	rm -rf $(LIB_NAME)
-	git clone $(LIB_REPO) $(LIB_NAME)
+	export AFL_USE_ASAN=1 && \
+	export AFL_USE_UBSAN=1 && \
+	rm -rf $(LIB_NAME) && \
+	git clone $(LIB_REPO) $(LIB_NAME) && \
 	cd $(LIB_NAME) && \
 	git checkout a17a81f05b62d92af1bff103721d17a180aa84e5 && \
 	cmake . \
diff --git a/demos/sqlite/Makefile b/demos/sqlite/Makefile
index 5760d5bc..281e4076 100644
--- a/demos/sqlite/Makefile
+++ b/demos/sqlite/Makefile
@@ -26,10 +26,10 @@ DEPS_LDD = $(PWD)/$(LIB_NAME)/
 
 #------------------------------------------------------------------------
 lib: # build for harness generation. Dynamic linking, asan, and afl instrumentation
-	export AFL_USE_ASAN=1
-	export AFL_USE_UBSAN=1
-	rm -rf $(LIB_NAME)
-	git clone $(LIB_REPO) $(LIB_NAME)
+	export AFL_USE_ASAN=1 && \
+	export AFL_USE_UBSAN=1 && \
+	rm -rf $(LIB_NAME) && \
+	git clone $(LIB_REPO) $(LIB_NAME) && \
 	cd $(LIB_NAME) && \
 	git checkout 0df847cc776131919935658230fe2e629906dabb && \
 	./configure \
diff --git a/demos/stormlib/Makefile b/demos/stormlib/Makefile
index 0ae7ece2..d7e07414 100644
--- a/demos/stormlib/Makefile
+++ b/demos/stormlib/Makefile
@@ -17,10 +17,10 @@ DEPS_LDD = $(PWD)/$(LIB_NAME)/
 
 #------------------------------------------------------------------------
 lib: # build for harness generation. Dynamic linking, asan, and afl instrumentation
-	export AFL_USE_ASAN=1
-	export AFL_USE_UBSAN=1
-	rm -rf $(LIB_NAME)
-	git clone $(LIB_REPO) $(LIB_NAME)
+	export AFL_USE_ASAN=1 && \
+	export AFL_USE_UBSAN=1 && \
+	rm -rf $(LIB_NAME) && \
+	git clone $(LIB_REPO) $(LIB_NAME) && \
 	cd $(LIB_NAME) && \
 	git checkout 605222393594f5885b877bfc0086dae756674965 && \
 	cmake . \
diff --git a/demos/ucl/Makefile b/demos/ucl/Makefile
index 864f36de..789a5830 100644
--- a/demos/ucl/Makefile
+++ b/demos/ucl/Makefile
@@ -21,11 +21,11 @@ DEPS_LDD = $(PWD)/$(LIB_NAME)/
 
 #------------------------------------------------------------------------
 lib: # build for harness generation. Dynamic linking, asan, and afl instrumentation
-	export AFL_USE_ASAN=1
-	export AFL_USE_UBSAN=1
-	rm -rf $(LIB_NAME)
-	git clone $(LIB_REPO) $(LIB_NAME)
-	cd $(LIB_NAME)&& \
+	export AFL_USE_ASAN=1 && \
+	export AFL_USE_UBSAN=1 && \
+	rm -rf $(LIB_NAME) && \
+	git clone $(LIB_REPO) $(LIB_NAME) && \
+	cd $(LIB_NAME) && \
 	git checkout 51c5e2f0526c41efc5e919e0b834a87b1976f33c && \
 	cmake . \
 		-DCMAKE_C_COMPILER=$(CC_FUZZ) -DCMAKE_CXX_COMPILER=$(CXX_FUZZ) -DBUILD_SHARED_LIBS=OFF -DCMAKE_EXPORT_COMPILE_COMMANDS=ON && \
diff --git a/demos/zlib/Makefile b/demos/zlib/Makefile
index 0a985c96..30ace3ed 100644
--- a/demos/zlib/Makefile
+++ b/demos/zlib/Makefile
@@ -16,10 +16,10 @@ DEPS_LDD = $(PWD)/$(LIB_NAME)/
 
 #------------------------------------------------------------------------
 lib: # build for harness generation. Dynamic linking, asan, and afl instrumentation
-	export AFL_USE_ASAN=1
-	export AFL_USE_UBSAN=1
-	rm -rf $(LIB_NAME)
-	git clone $(LIB_REPO) $(LIB_NAME) 
+	export AFL_USE_ASAN=1 && \
+	export AFL_USE_UBSAN=1 && \
+	rm -rf $(LIB_NAME) && \
+	git clone $(LIB_REPO) $(LIB_NAME) && \
 	cd $(LIB_NAME) && \
 	git checkout ef24c4c7502169f016dcd2a26923dbaf3216748c && \
 	cmake . \