diff --git a/aarbology2/makefile b/aarbology2/makefile
index f19c977454b02b96a4b7f81bfdb2e4dcaab19f6e..7d3c3454db062836e8a6a630c98712bd6b81622e 100644
--- a/aarbology2/makefile
+++ b/aarbology2/makefile
@@ -113,10 +113,10 @@ bin-release/$(EXECUTABLE): obj-release/ $(OBJECTS_RELEASE)
 
 
 obj-debug/: FORCE | obj-debug/makefile 
-	$(MAKE) -C $@ OBJECTS_BASE_DIR=$(realpath obj-debug) SOURCES_BASE_DIR=$(realpath src) CXX_OTHER_FLAGS="-g -O0"
+	$(MAKE) -C $@ OBJECTS_BASE_DIR=$(realpath obj-debug) SOURCES_BASE_DIR=$(realpath src) CXX_OTHER_FLAGS="-g -O0 -DDEBUG"
 
 obj-release/: FORCE | obj-release/makefile
-	$(MAKE) -C $@ OBJECTS_BASE_DIR=$(realpath obj-release) SOURCES_BASE_DIR=$(realpath src) CXX_OTHER_FLAGS="-O3"
+	$(MAKE) -C $@ OBJECTS_BASE_DIR=$(realpath obj-release) SOURCES_BASE_DIR=$(realpath src) CXX_OTHER_FLAGS="-O3 -DNDEBUG -DRELEASE"
 
 
 
diff --git a/acast2/makefile b/acast2/makefile
index f19c977454b02b96a4b7f81bfdb2e4dcaab19f6e..7d3c3454db062836e8a6a630c98712bd6b81622e 100644
--- a/acast2/makefile
+++ b/acast2/makefile
@@ -113,10 +113,10 @@ bin-release/$(EXECUTABLE): obj-release/ $(OBJECTS_RELEASE)
 
 
 obj-debug/: FORCE | obj-debug/makefile 
-	$(MAKE) -C $@ OBJECTS_BASE_DIR=$(realpath obj-debug) SOURCES_BASE_DIR=$(realpath src) CXX_OTHER_FLAGS="-g -O0"
+	$(MAKE) -C $@ OBJECTS_BASE_DIR=$(realpath obj-debug) SOURCES_BASE_DIR=$(realpath src) CXX_OTHER_FLAGS="-g -O0 -DDEBUG"
 
 obj-release/: FORCE | obj-release/makefile
-	$(MAKE) -C $@ OBJECTS_BASE_DIR=$(realpath obj-release) SOURCES_BASE_DIR=$(realpath src) CXX_OTHER_FLAGS="-O3"
+	$(MAKE) -C $@ OBJECTS_BASE_DIR=$(realpath obj-release) SOURCES_BASE_DIR=$(realpath src) CXX_OTHER_FLAGS="-O3 -DNDEBUG -DRELEASE"
 
 
 
diff --git a/acompaction2/makefile b/acompaction2/makefile
index f19c977454b02b96a4b7f81bfdb2e4dcaab19f6e..7d3c3454db062836e8a6a630c98712bd6b81622e 100644
--- a/acompaction2/makefile
+++ b/acompaction2/makefile
@@ -113,10 +113,10 @@ bin-release/$(EXECUTABLE): obj-release/ $(OBJECTS_RELEASE)
 
 
 obj-debug/: FORCE | obj-debug/makefile 
-	$(MAKE) -C $@ OBJECTS_BASE_DIR=$(realpath obj-debug) SOURCES_BASE_DIR=$(realpath src) CXX_OTHER_FLAGS="-g -O0"
+	$(MAKE) -C $@ OBJECTS_BASE_DIR=$(realpath obj-debug) SOURCES_BASE_DIR=$(realpath src) CXX_OTHER_FLAGS="-g -O0 -DDEBUG"
 
 obj-release/: FORCE | obj-release/makefile
-	$(MAKE) -C $@ OBJECTS_BASE_DIR=$(realpath obj-release) SOURCES_BASE_DIR=$(realpath src) CXX_OTHER_FLAGS="-O3"
+	$(MAKE) -C $@ OBJECTS_BASE_DIR=$(realpath obj-release) SOURCES_BASE_DIR=$(realpath src) CXX_OTHER_FLAGS="-O3 -DNDEBUG -DRELEASE"
 
 
 
diff --git a/acompare2/makefile b/acompare2/makefile
index f19c977454b02b96a4b7f81bfdb2e4dcaab19f6e..7d3c3454db062836e8a6a630c98712bd6b81622e 100644
--- a/acompare2/makefile
+++ b/acompare2/makefile
@@ -113,10 +113,10 @@ bin-release/$(EXECUTABLE): obj-release/ $(OBJECTS_RELEASE)
 
 
 obj-debug/: FORCE | obj-debug/makefile 
-	$(MAKE) -C $@ OBJECTS_BASE_DIR=$(realpath obj-debug) SOURCES_BASE_DIR=$(realpath src) CXX_OTHER_FLAGS="-g -O0"
+	$(MAKE) -C $@ OBJECTS_BASE_DIR=$(realpath obj-debug) SOURCES_BASE_DIR=$(realpath src) CXX_OTHER_FLAGS="-g -O0 -DDEBUG"
 
 obj-release/: FORCE | obj-release/makefile
-	$(MAKE) -C $@ OBJECTS_BASE_DIR=$(realpath obj-release) SOURCES_BASE_DIR=$(realpath src) CXX_OTHER_FLAGS="-O3"
+	$(MAKE) -C $@ OBJECTS_BASE_DIR=$(realpath obj-release) SOURCES_BASE_DIR=$(realpath src) CXX_OTHER_FLAGS="-O3 -DNDEBUG -DRELEASE"
 
 
 
diff --git a/aconversions2/makefile b/aconversions2/makefile
index f19c977454b02b96a4b7f81bfdb2e4dcaab19f6e..7d3c3454db062836e8a6a630c98712bd6b81622e 100644
--- a/aconversions2/makefile
+++ b/aconversions2/makefile
@@ -113,10 +113,10 @@ bin-release/$(EXECUTABLE): obj-release/ $(OBJECTS_RELEASE)
 
 
 obj-debug/: FORCE | obj-debug/makefile 
-	$(MAKE) -C $@ OBJECTS_BASE_DIR=$(realpath obj-debug) SOURCES_BASE_DIR=$(realpath src) CXX_OTHER_FLAGS="-g -O0"
+	$(MAKE) -C $@ OBJECTS_BASE_DIR=$(realpath obj-debug) SOURCES_BASE_DIR=$(realpath src) CXX_OTHER_FLAGS="-g -O0 -DDEBUG"
 
 obj-release/: FORCE | obj-release/makefile
-	$(MAKE) -C $@ OBJECTS_BASE_DIR=$(realpath obj-release) SOURCES_BASE_DIR=$(realpath src) CXX_OTHER_FLAGS="-O3"
+	$(MAKE) -C $@ OBJECTS_BASE_DIR=$(realpath obj-release) SOURCES_BASE_DIR=$(realpath src) CXX_OTHER_FLAGS="-O3 -DNDEBUG -DRELEASE"
 
 
 
diff --git a/aconvert2/makefile b/aconvert2/makefile
index f19c977454b02b96a4b7f81bfdb2e4dcaab19f6e..7d3c3454db062836e8a6a630c98712bd6b81622e 100644
--- a/aconvert2/makefile
+++ b/aconvert2/makefile
@@ -113,10 +113,10 @@ bin-release/$(EXECUTABLE): obj-release/ $(OBJECTS_RELEASE)
 
 
 obj-debug/: FORCE | obj-debug/makefile 
-	$(MAKE) -C $@ OBJECTS_BASE_DIR=$(realpath obj-debug) SOURCES_BASE_DIR=$(realpath src) CXX_OTHER_FLAGS="-g -O0"
+	$(MAKE) -C $@ OBJECTS_BASE_DIR=$(realpath obj-debug) SOURCES_BASE_DIR=$(realpath src) CXX_OTHER_FLAGS="-g -O0 -DDEBUG"
 
 obj-release/: FORCE | obj-release/makefile
-	$(MAKE) -C $@ OBJECTS_BASE_DIR=$(realpath obj-release) SOURCES_BASE_DIR=$(realpath src) CXX_OTHER_FLAGS="-O3"
+	$(MAKE) -C $@ OBJECTS_BASE_DIR=$(realpath obj-release) SOURCES_BASE_DIR=$(realpath src) CXX_OTHER_FLAGS="-O3 -DNDEBUG -DRELEASE"
 
 
 
diff --git a/aderivation2/makefile b/aderivation2/makefile
index f19c977454b02b96a4b7f81bfdb2e4dcaab19f6e..7d3c3454db062836e8a6a630c98712bd6b81622e 100644
--- a/aderivation2/makefile
+++ b/aderivation2/makefile
@@ -113,10 +113,10 @@ bin-release/$(EXECUTABLE): obj-release/ $(OBJECTS_RELEASE)
 
 
 obj-debug/: FORCE | obj-debug/makefile 
-	$(MAKE) -C $@ OBJECTS_BASE_DIR=$(realpath obj-debug) SOURCES_BASE_DIR=$(realpath src) CXX_OTHER_FLAGS="-g -O0"
+	$(MAKE) -C $@ OBJECTS_BASE_DIR=$(realpath obj-debug) SOURCES_BASE_DIR=$(realpath src) CXX_OTHER_FLAGS="-g -O0 -DDEBUG"
 
 obj-release/: FORCE | obj-release/makefile
-	$(MAKE) -C $@ OBJECTS_BASE_DIR=$(realpath obj-release) SOURCES_BASE_DIR=$(realpath src) CXX_OTHER_FLAGS="-O3"
+	$(MAKE) -C $@ OBJECTS_BASE_DIR=$(realpath obj-release) SOURCES_BASE_DIR=$(realpath src) CXX_OTHER_FLAGS="-O3 -DNDEBUG -DRELEASE"
 
 
 
diff --git a/adeterminize2/makefile b/adeterminize2/makefile
index f19c977454b02b96a4b7f81bfdb2e4dcaab19f6e..7d3c3454db062836e8a6a630c98712bd6b81622e 100644
--- a/adeterminize2/makefile
+++ b/adeterminize2/makefile
@@ -113,10 +113,10 @@ bin-release/$(EXECUTABLE): obj-release/ $(OBJECTS_RELEASE)
 
 
 obj-debug/: FORCE | obj-debug/makefile 
-	$(MAKE) -C $@ OBJECTS_BASE_DIR=$(realpath obj-debug) SOURCES_BASE_DIR=$(realpath src) CXX_OTHER_FLAGS="-g -O0"
+	$(MAKE) -C $@ OBJECTS_BASE_DIR=$(realpath obj-debug) SOURCES_BASE_DIR=$(realpath src) CXX_OTHER_FLAGS="-g -O0 -DDEBUG"
 
 obj-release/: FORCE | obj-release/makefile
-	$(MAKE) -C $@ OBJECTS_BASE_DIR=$(realpath obj-release) SOURCES_BASE_DIR=$(realpath src) CXX_OTHER_FLAGS="-O3"
+	$(MAKE) -C $@ OBJECTS_BASE_DIR=$(realpath obj-release) SOURCES_BASE_DIR=$(realpath src) CXX_OTHER_FLAGS="-O3 -DNDEBUG -DRELEASE"
 
 
 
diff --git a/aecho2/makefile b/aecho2/makefile
index f19c977454b02b96a4b7f81bfdb2e4dcaab19f6e..7d3c3454db062836e8a6a630c98712bd6b81622e 100644
--- a/aecho2/makefile
+++ b/aecho2/makefile
@@ -113,10 +113,10 @@ bin-release/$(EXECUTABLE): obj-release/ $(OBJECTS_RELEASE)
 
 
 obj-debug/: FORCE | obj-debug/makefile 
-	$(MAKE) -C $@ OBJECTS_BASE_DIR=$(realpath obj-debug) SOURCES_BASE_DIR=$(realpath src) CXX_OTHER_FLAGS="-g -O0"
+	$(MAKE) -C $@ OBJECTS_BASE_DIR=$(realpath obj-debug) SOURCES_BASE_DIR=$(realpath src) CXX_OTHER_FLAGS="-g -O0 -DDEBUG"
 
 obj-release/: FORCE | obj-release/makefile
-	$(MAKE) -C $@ OBJECTS_BASE_DIR=$(realpath obj-release) SOURCES_BASE_DIR=$(realpath src) CXX_OTHER_FLAGS="-O3"
+	$(MAKE) -C $@ OBJECTS_BASE_DIR=$(realpath obj-release) SOURCES_BASE_DIR=$(realpath src) CXX_OTHER_FLAGS="-O3 -DNDEBUG -DRELEASE"
 
 
 
diff --git a/aepsilon2/makefile b/aepsilon2/makefile
index f19c977454b02b96a4b7f81bfdb2e4dcaab19f6e..7d3c3454db062836e8a6a630c98712bd6b81622e 100644
--- a/aepsilon2/makefile
+++ b/aepsilon2/makefile
@@ -113,10 +113,10 @@ bin-release/$(EXECUTABLE): obj-release/ $(OBJECTS_RELEASE)
 
 
 obj-debug/: FORCE | obj-debug/makefile 
-	$(MAKE) -C $@ OBJECTS_BASE_DIR=$(realpath obj-debug) SOURCES_BASE_DIR=$(realpath src) CXX_OTHER_FLAGS="-g -O0"
+	$(MAKE) -C $@ OBJECTS_BASE_DIR=$(realpath obj-debug) SOURCES_BASE_DIR=$(realpath src) CXX_OTHER_FLAGS="-g -O0 -DDEBUG"
 
 obj-release/: FORCE | obj-release/makefile
-	$(MAKE) -C $@ OBJECTS_BASE_DIR=$(realpath obj-release) SOURCES_BASE_DIR=$(realpath src) CXX_OTHER_FLAGS="-O3"
+	$(MAKE) -C $@ OBJECTS_BASE_DIR=$(realpath obj-release) SOURCES_BASE_DIR=$(realpath src) CXX_OTHER_FLAGS="-O3 -DNDEBUG -DRELEASE"
 
 
 
diff --git a/agenerate2/makefile b/agenerate2/makefile
index f19c977454b02b96a4b7f81bfdb2e4dcaab19f6e..7d3c3454db062836e8a6a630c98712bd6b81622e 100644
--- a/agenerate2/makefile
+++ b/agenerate2/makefile
@@ -113,10 +113,10 @@ bin-release/$(EXECUTABLE): obj-release/ $(OBJECTS_RELEASE)
 
 
 obj-debug/: FORCE | obj-debug/makefile 
-	$(MAKE) -C $@ OBJECTS_BASE_DIR=$(realpath obj-debug) SOURCES_BASE_DIR=$(realpath src) CXX_OTHER_FLAGS="-g -O0"
+	$(MAKE) -C $@ OBJECTS_BASE_DIR=$(realpath obj-debug) SOURCES_BASE_DIR=$(realpath src) CXX_OTHER_FLAGS="-g -O0 -DDEBUG"
 
 obj-release/: FORCE | obj-release/makefile
-	$(MAKE) -C $@ OBJECTS_BASE_DIR=$(realpath obj-release) SOURCES_BASE_DIR=$(realpath src) CXX_OTHER_FLAGS="-O3"
+	$(MAKE) -C $@ OBJECTS_BASE_DIR=$(realpath obj-release) SOURCES_BASE_DIR=$(realpath src) CXX_OTHER_FLAGS="-O3 -DNDEBUG -DRELEASE"
 
 
 
diff --git a/aintegral2/makefile b/aintegral2/makefile
index f19c977454b02b96a4b7f81bfdb2e4dcaab19f6e..7d3c3454db062836e8a6a630c98712bd6b81622e 100644
--- a/aintegral2/makefile
+++ b/aintegral2/makefile
@@ -113,10 +113,10 @@ bin-release/$(EXECUTABLE): obj-release/ $(OBJECTS_RELEASE)
 
 
 obj-debug/: FORCE | obj-debug/makefile 
-	$(MAKE) -C $@ OBJECTS_BASE_DIR=$(realpath obj-debug) SOURCES_BASE_DIR=$(realpath src) CXX_OTHER_FLAGS="-g -O0"
+	$(MAKE) -C $@ OBJECTS_BASE_DIR=$(realpath obj-debug) SOURCES_BASE_DIR=$(realpath src) CXX_OTHER_FLAGS="-g -O0 -DDEBUG"
 
 obj-release/: FORCE | obj-release/makefile
-	$(MAKE) -C $@ OBJECTS_BASE_DIR=$(realpath obj-release) SOURCES_BASE_DIR=$(realpath src) CXX_OTHER_FLAGS="-O3"
+	$(MAKE) -C $@ OBJECTS_BASE_DIR=$(realpath obj-release) SOURCES_BASE_DIR=$(realpath src) CXX_OTHER_FLAGS="-O3 -DNDEBUG -DRELEASE"
 
 
 
diff --git a/alangop2/makefile b/alangop2/makefile
index f19c977454b02b96a4b7f81bfdb2e4dcaab19f6e..7d3c3454db062836e8a6a630c98712bd6b81622e 100644
--- a/alangop2/makefile
+++ b/alangop2/makefile
@@ -113,10 +113,10 @@ bin-release/$(EXECUTABLE): obj-release/ $(OBJECTS_RELEASE)
 
 
 obj-debug/: FORCE | obj-debug/makefile 
-	$(MAKE) -C $@ OBJECTS_BASE_DIR=$(realpath obj-debug) SOURCES_BASE_DIR=$(realpath src) CXX_OTHER_FLAGS="-g -O0"
+	$(MAKE) -C $@ OBJECTS_BASE_DIR=$(realpath obj-debug) SOURCES_BASE_DIR=$(realpath src) CXX_OTHER_FLAGS="-g -O0 -DDEBUG"
 
 obj-release/: FORCE | obj-release/makefile
-	$(MAKE) -C $@ OBJECTS_BASE_DIR=$(realpath obj-release) SOURCES_BASE_DIR=$(realpath src) CXX_OTHER_FLAGS="-O3"
+	$(MAKE) -C $@ OBJECTS_BASE_DIR=$(realpath obj-release) SOURCES_BASE_DIR=$(realpath src) CXX_OTHER_FLAGS="-O3 -DNDEBUG -DRELEASE"
 
 
 
diff --git a/alib2algo/makefile b/alib2algo/makefile
index ced22944d22918d27696ad19c892bd00ff948563..73b514d3a815252ec17a16dec0446c6edfc78fdc 100644
--- a/alib2algo/makefile
+++ b/alib2algo/makefile
@@ -182,7 +182,7 @@ obj-debug/: FORCE obj-debug/makefile
 	$(MAKE) -C $@ OBJECTS_BASE_DIR=$(realpath obj-debug) SOURCES_BASE_DIR=$(realpath src) CXX_OTHER_FLAGS="-g -O0 -DDEBUG"
 
 obj-release/: FORCE obj-release/makefile
-	$(MAKE) -C $@ OBJECTS_BASE_DIR=$(realpath obj-release) SOURCES_BASE_DIR=$(realpath src) CXX_OTHER_FLAGS="-O3 -DRELEASE"
+	$(MAKE) -C $@ OBJECTS_BASE_DIR=$(realpath obj-release) SOURCES_BASE_DIR=$(realpath src) CXX_OTHER_FLAGS="-O3 -DNDEBUG -DRELEASE"
 
 
 
@@ -225,7 +225,7 @@ test-obj-debug/: FORCE test-obj-debug/makefile
 	$(MAKE) -C $@ OBJECTS_BASE_DIR=$(realpath test-obj-debug) SOURCES_BASE_DIR=$(realpath test-src) CXX_OTHER_FLAGS="-g -O0 -DDEBUG"
 
 test-obj-release/: FORCE test-obj-release/makefile
-	$(MAKE) -C $@ OBJECTS_BASE_DIR=$(realpath test-obj-release) SOURCES_BASE_DIR=$(realpath test-src) CXX_OTHER_FLAGS="-O3 -DRELEASE"
+	$(MAKE) -C $@ OBJECTS_BASE_DIR=$(realpath test-obj-release) SOURCES_BASE_DIR=$(realpath test-src) CXX_OTHER_FLAGS="-O3 -DNDEBUG -DRELEASE"
 
 
 
diff --git a/alib2data/makefile b/alib2data/makefile
index ced22944d22918d27696ad19c892bd00ff948563..73b514d3a815252ec17a16dec0446c6edfc78fdc 100644
--- a/alib2data/makefile
+++ b/alib2data/makefile
@@ -182,7 +182,7 @@ obj-debug/: FORCE obj-debug/makefile
 	$(MAKE) -C $@ OBJECTS_BASE_DIR=$(realpath obj-debug) SOURCES_BASE_DIR=$(realpath src) CXX_OTHER_FLAGS="-g -O0 -DDEBUG"
 
 obj-release/: FORCE obj-release/makefile
-	$(MAKE) -C $@ OBJECTS_BASE_DIR=$(realpath obj-release) SOURCES_BASE_DIR=$(realpath src) CXX_OTHER_FLAGS="-O3 -DRELEASE"
+	$(MAKE) -C $@ OBJECTS_BASE_DIR=$(realpath obj-release) SOURCES_BASE_DIR=$(realpath src) CXX_OTHER_FLAGS="-O3 -DNDEBUG -DRELEASE"
 
 
 
@@ -225,7 +225,7 @@ test-obj-debug/: FORCE test-obj-debug/makefile
 	$(MAKE) -C $@ OBJECTS_BASE_DIR=$(realpath test-obj-debug) SOURCES_BASE_DIR=$(realpath test-src) CXX_OTHER_FLAGS="-g -O0 -DDEBUG"
 
 test-obj-release/: FORCE test-obj-release/makefile
-	$(MAKE) -C $@ OBJECTS_BASE_DIR=$(realpath test-obj-release) SOURCES_BASE_DIR=$(realpath test-src) CXX_OTHER_FLAGS="-O3 -DRELEASE"
+	$(MAKE) -C $@ OBJECTS_BASE_DIR=$(realpath test-obj-release) SOURCES_BASE_DIR=$(realpath test-src) CXX_OTHER_FLAGS="-O3 -DNDEBUG -DRELEASE"
 
 
 
diff --git a/alib2elgo/makefile b/alib2elgo/makefile
index ced22944d22918d27696ad19c892bd00ff948563..73b514d3a815252ec17a16dec0446c6edfc78fdc 100644
--- a/alib2elgo/makefile
+++ b/alib2elgo/makefile
@@ -182,7 +182,7 @@ obj-debug/: FORCE obj-debug/makefile
 	$(MAKE) -C $@ OBJECTS_BASE_DIR=$(realpath obj-debug) SOURCES_BASE_DIR=$(realpath src) CXX_OTHER_FLAGS="-g -O0 -DDEBUG"
 
 obj-release/: FORCE obj-release/makefile
-	$(MAKE) -C $@ OBJECTS_BASE_DIR=$(realpath obj-release) SOURCES_BASE_DIR=$(realpath src) CXX_OTHER_FLAGS="-O3 -DRELEASE"
+	$(MAKE) -C $@ OBJECTS_BASE_DIR=$(realpath obj-release) SOURCES_BASE_DIR=$(realpath src) CXX_OTHER_FLAGS="-O3 -DNDEBUG -DRELEASE"
 
 
 
@@ -225,7 +225,7 @@ test-obj-debug/: FORCE test-obj-debug/makefile
 	$(MAKE) -C $@ OBJECTS_BASE_DIR=$(realpath test-obj-debug) SOURCES_BASE_DIR=$(realpath test-src) CXX_OTHER_FLAGS="-g -O0 -DDEBUG"
 
 test-obj-release/: FORCE test-obj-release/makefile
-	$(MAKE) -C $@ OBJECTS_BASE_DIR=$(realpath test-obj-release) SOURCES_BASE_DIR=$(realpath test-src) CXX_OTHER_FLAGS="-O3 -DRELEASE"
+	$(MAKE) -C $@ OBJECTS_BASE_DIR=$(realpath test-obj-release) SOURCES_BASE_DIR=$(realpath test-src) CXX_OTHER_FLAGS="-O3 -DNDEBUG -DRELEASE"
 
 
 
diff --git a/alib2raw/makefile b/alib2raw/makefile
index ced22944d22918d27696ad19c892bd00ff948563..73b514d3a815252ec17a16dec0446c6edfc78fdc 100644
--- a/alib2raw/makefile
+++ b/alib2raw/makefile
@@ -182,7 +182,7 @@ obj-debug/: FORCE obj-debug/makefile
 	$(MAKE) -C $@ OBJECTS_BASE_DIR=$(realpath obj-debug) SOURCES_BASE_DIR=$(realpath src) CXX_OTHER_FLAGS="-g -O0 -DDEBUG"
 
 obj-release/: FORCE obj-release/makefile
-	$(MAKE) -C $@ OBJECTS_BASE_DIR=$(realpath obj-release) SOURCES_BASE_DIR=$(realpath src) CXX_OTHER_FLAGS="-O3 -DRELEASE"
+	$(MAKE) -C $@ OBJECTS_BASE_DIR=$(realpath obj-release) SOURCES_BASE_DIR=$(realpath src) CXX_OTHER_FLAGS="-O3 -DNDEBUG -DRELEASE"
 
 
 
@@ -225,7 +225,7 @@ test-obj-debug/: FORCE test-obj-debug/makefile
 	$(MAKE) -C $@ OBJECTS_BASE_DIR=$(realpath test-obj-debug) SOURCES_BASE_DIR=$(realpath test-src) CXX_OTHER_FLAGS="-g -O0 -DDEBUG"
 
 test-obj-release/: FORCE test-obj-release/makefile
-	$(MAKE) -C $@ OBJECTS_BASE_DIR=$(realpath test-obj-release) SOURCES_BASE_DIR=$(realpath test-src) CXX_OTHER_FLAGS="-O3 -DRELEASE"
+	$(MAKE) -C $@ OBJECTS_BASE_DIR=$(realpath test-obj-release) SOURCES_BASE_DIR=$(realpath test-src) CXX_OTHER_FLAGS="-O3 -DNDEBUG -DRELEASE"
 
 
 
diff --git a/alib2std/makefile b/alib2std/makefile
index ced22944d22918d27696ad19c892bd00ff948563..73b514d3a815252ec17a16dec0446c6edfc78fdc 100644
--- a/alib2std/makefile
+++ b/alib2std/makefile
@@ -182,7 +182,7 @@ obj-debug/: FORCE obj-debug/makefile
 	$(MAKE) -C $@ OBJECTS_BASE_DIR=$(realpath obj-debug) SOURCES_BASE_DIR=$(realpath src) CXX_OTHER_FLAGS="-g -O0 -DDEBUG"
 
 obj-release/: FORCE obj-release/makefile
-	$(MAKE) -C $@ OBJECTS_BASE_DIR=$(realpath obj-release) SOURCES_BASE_DIR=$(realpath src) CXX_OTHER_FLAGS="-O3 -DRELEASE"
+	$(MAKE) -C $@ OBJECTS_BASE_DIR=$(realpath obj-release) SOURCES_BASE_DIR=$(realpath src) CXX_OTHER_FLAGS="-O3 -DNDEBUG -DRELEASE"
 
 
 
@@ -225,7 +225,7 @@ test-obj-debug/: FORCE test-obj-debug/makefile
 	$(MAKE) -C $@ OBJECTS_BASE_DIR=$(realpath test-obj-debug) SOURCES_BASE_DIR=$(realpath test-src) CXX_OTHER_FLAGS="-g -O0 -DDEBUG"
 
 test-obj-release/: FORCE test-obj-release/makefile
-	$(MAKE) -C $@ OBJECTS_BASE_DIR=$(realpath test-obj-release) SOURCES_BASE_DIR=$(realpath test-src) CXX_OTHER_FLAGS="-O3 -DRELEASE"
+	$(MAKE) -C $@ OBJECTS_BASE_DIR=$(realpath test-obj-release) SOURCES_BASE_DIR=$(realpath test-src) CXX_OTHER_FLAGS="-O3 -DNDEBUG -DRELEASE"
 
 
 
diff --git a/alib2str/makefile b/alib2str/makefile
index ced22944d22918d27696ad19c892bd00ff948563..73b514d3a815252ec17a16dec0446c6edfc78fdc 100644
--- a/alib2str/makefile
+++ b/alib2str/makefile
@@ -182,7 +182,7 @@ obj-debug/: FORCE obj-debug/makefile
 	$(MAKE) -C $@ OBJECTS_BASE_DIR=$(realpath obj-debug) SOURCES_BASE_DIR=$(realpath src) CXX_OTHER_FLAGS="-g -O0 -DDEBUG"
 
 obj-release/: FORCE obj-release/makefile
-	$(MAKE) -C $@ OBJECTS_BASE_DIR=$(realpath obj-release) SOURCES_BASE_DIR=$(realpath src) CXX_OTHER_FLAGS="-O3 -DRELEASE"
+	$(MAKE) -C $@ OBJECTS_BASE_DIR=$(realpath obj-release) SOURCES_BASE_DIR=$(realpath src) CXX_OTHER_FLAGS="-O3 -DNDEBUG -DRELEASE"
 
 
 
@@ -225,7 +225,7 @@ test-obj-debug/: FORCE test-obj-debug/makefile
 	$(MAKE) -C $@ OBJECTS_BASE_DIR=$(realpath test-obj-debug) SOURCES_BASE_DIR=$(realpath test-src) CXX_OTHER_FLAGS="-g -O0 -DDEBUG"
 
 test-obj-release/: FORCE test-obj-release/makefile
-	$(MAKE) -C $@ OBJECTS_BASE_DIR=$(realpath test-obj-release) SOURCES_BASE_DIR=$(realpath test-src) CXX_OTHER_FLAGS="-O3 -DRELEASE"
+	$(MAKE) -C $@ OBJECTS_BASE_DIR=$(realpath test-obj-release) SOURCES_BASE_DIR=$(realpath test-src) CXX_OTHER_FLAGS="-O3 -DNDEBUG -DRELEASE"
 
 
 
diff --git a/alphabetManip2/makefile b/alphabetManip2/makefile
index f19c977454b02b96a4b7f81bfdb2e4dcaab19f6e..7d3c3454db062836e8a6a630c98712bd6b81622e 100644
--- a/alphabetManip2/makefile
+++ b/alphabetManip2/makefile
@@ -113,10 +113,10 @@ bin-release/$(EXECUTABLE): obj-release/ $(OBJECTS_RELEASE)
 
 
 obj-debug/: FORCE | obj-debug/makefile 
-	$(MAKE) -C $@ OBJECTS_BASE_DIR=$(realpath obj-debug) SOURCES_BASE_DIR=$(realpath src) CXX_OTHER_FLAGS="-g -O0"
+	$(MAKE) -C $@ OBJECTS_BASE_DIR=$(realpath obj-debug) SOURCES_BASE_DIR=$(realpath src) CXX_OTHER_FLAGS="-g -O0 -DDEBUG"
 
 obj-release/: FORCE | obj-release/makefile
-	$(MAKE) -C $@ OBJECTS_BASE_DIR=$(realpath obj-release) SOURCES_BASE_DIR=$(realpath src) CXX_OTHER_FLAGS="-O3"
+	$(MAKE) -C $@ OBJECTS_BASE_DIR=$(realpath obj-release) SOURCES_BASE_DIR=$(realpath src) CXX_OTHER_FLAGS="-O3 -DNDEBUG -DRELEASE"
 
 
 
diff --git a/aminimize2/makefile b/aminimize2/makefile
index f19c977454b02b96a4b7f81bfdb2e4dcaab19f6e..7d3c3454db062836e8a6a630c98712bd6b81622e 100644
--- a/aminimize2/makefile
+++ b/aminimize2/makefile
@@ -113,10 +113,10 @@ bin-release/$(EXECUTABLE): obj-release/ $(OBJECTS_RELEASE)
 
 
 obj-debug/: FORCE | obj-debug/makefile 
-	$(MAKE) -C $@ OBJECTS_BASE_DIR=$(realpath obj-debug) SOURCES_BASE_DIR=$(realpath src) CXX_OTHER_FLAGS="-g -O0"
+	$(MAKE) -C $@ OBJECTS_BASE_DIR=$(realpath obj-debug) SOURCES_BASE_DIR=$(realpath src) CXX_OTHER_FLAGS="-g -O0 -DDEBUG"
 
 obj-release/: FORCE | obj-release/makefile
-	$(MAKE) -C $@ OBJECTS_BASE_DIR=$(realpath obj-release) SOURCES_BASE_DIR=$(realpath src) CXX_OTHER_FLAGS="-O3"
+	$(MAKE) -C $@ OBJECTS_BASE_DIR=$(realpath obj-release) SOURCES_BASE_DIR=$(realpath src) CXX_OTHER_FLAGS="-O3 -DNDEBUG -DRELEASE"
 
 
 
diff --git a/anormalize2/makefile b/anormalize2/makefile
index f19c977454b02b96a4b7f81bfdb2e4dcaab19f6e..7d3c3454db062836e8a6a630c98712bd6b81622e 100644
--- a/anormalize2/makefile
+++ b/anormalize2/makefile
@@ -113,10 +113,10 @@ bin-release/$(EXECUTABLE): obj-release/ $(OBJECTS_RELEASE)
 
 
 obj-debug/: FORCE | obj-debug/makefile 
-	$(MAKE) -C $@ OBJECTS_BASE_DIR=$(realpath obj-debug) SOURCES_BASE_DIR=$(realpath src) CXX_OTHER_FLAGS="-g -O0"
+	$(MAKE) -C $@ OBJECTS_BASE_DIR=$(realpath obj-debug) SOURCES_BASE_DIR=$(realpath src) CXX_OTHER_FLAGS="-g -O0 -DDEBUG"
 
 obj-release/: FORCE | obj-release/makefile
-	$(MAKE) -C $@ OBJECTS_BASE_DIR=$(realpath obj-release) SOURCES_BASE_DIR=$(realpath src) CXX_OTHER_FLAGS="-O3"
+	$(MAKE) -C $@ OBJECTS_BASE_DIR=$(realpath obj-release) SOURCES_BASE_DIR=$(realpath src) CXX_OTHER_FLAGS="-O3 -DNDEBUG -DRELEASE"
 
 
 
diff --git a/arand2/makefile b/arand2/makefile
index f19c977454b02b96a4b7f81bfdb2e4dcaab19f6e..7d3c3454db062836e8a6a630c98712bd6b81622e 100644
--- a/arand2/makefile
+++ b/arand2/makefile
@@ -113,10 +113,10 @@ bin-release/$(EXECUTABLE): obj-release/ $(OBJECTS_RELEASE)
 
 
 obj-debug/: FORCE | obj-debug/makefile 
-	$(MAKE) -C $@ OBJECTS_BASE_DIR=$(realpath obj-debug) SOURCES_BASE_DIR=$(realpath src) CXX_OTHER_FLAGS="-g -O0"
+	$(MAKE) -C $@ OBJECTS_BASE_DIR=$(realpath obj-debug) SOURCES_BASE_DIR=$(realpath src) CXX_OTHER_FLAGS="-g -O0 -DDEBUG"
 
 obj-release/: FORCE | obj-release/makefile
-	$(MAKE) -C $@ OBJECTS_BASE_DIR=$(realpath obj-release) SOURCES_BASE_DIR=$(realpath src) CXX_OTHER_FLAGS="-O3"
+	$(MAKE) -C $@ OBJECTS_BASE_DIR=$(realpath obj-release) SOURCES_BASE_DIR=$(realpath src) CXX_OTHER_FLAGS="-O3 -DNDEBUG -DRELEASE"
 
 
 
diff --git a/araw2/makefile b/araw2/makefile
index f19c977454b02b96a4b7f81bfdb2e4dcaab19f6e..7d3c3454db062836e8a6a630c98712bd6b81622e 100644
--- a/araw2/makefile
+++ b/araw2/makefile
@@ -113,10 +113,10 @@ bin-release/$(EXECUTABLE): obj-release/ $(OBJECTS_RELEASE)
 
 
 obj-debug/: FORCE | obj-debug/makefile 
-	$(MAKE) -C $@ OBJECTS_BASE_DIR=$(realpath obj-debug) SOURCES_BASE_DIR=$(realpath src) CXX_OTHER_FLAGS="-g -O0"
+	$(MAKE) -C $@ OBJECTS_BASE_DIR=$(realpath obj-debug) SOURCES_BASE_DIR=$(realpath src) CXX_OTHER_FLAGS="-g -O0 -DDEBUG"
 
 obj-release/: FORCE | obj-release/makefile
-	$(MAKE) -C $@ OBJECTS_BASE_DIR=$(realpath obj-release) SOURCES_BASE_DIR=$(realpath src) CXX_OTHER_FLAGS="-O3"
+	$(MAKE) -C $@ OBJECTS_BASE_DIR=$(realpath obj-release) SOURCES_BASE_DIR=$(realpath src) CXX_OTHER_FLAGS="-O3 -DNDEBUG -DRELEASE"
 
 
 
diff --git a/arename2/makefile b/arename2/makefile
index f19c977454b02b96a4b7f81bfdb2e4dcaab19f6e..7d3c3454db062836e8a6a630c98712bd6b81622e 100644
--- a/arename2/makefile
+++ b/arename2/makefile
@@ -113,10 +113,10 @@ bin-release/$(EXECUTABLE): obj-release/ $(OBJECTS_RELEASE)
 
 
 obj-debug/: FORCE | obj-debug/makefile 
-	$(MAKE) -C $@ OBJECTS_BASE_DIR=$(realpath obj-debug) SOURCES_BASE_DIR=$(realpath src) CXX_OTHER_FLAGS="-g -O0"
+	$(MAKE) -C $@ OBJECTS_BASE_DIR=$(realpath obj-debug) SOURCES_BASE_DIR=$(realpath src) CXX_OTHER_FLAGS="-g -O0 -DDEBUG"
 
 obj-release/: FORCE | obj-release/makefile
-	$(MAKE) -C $@ OBJECTS_BASE_DIR=$(realpath obj-release) SOURCES_BASE_DIR=$(realpath src) CXX_OTHER_FLAGS="-O3"
+	$(MAKE) -C $@ OBJECTS_BASE_DIR=$(realpath obj-release) SOURCES_BASE_DIR=$(realpath src) CXX_OTHER_FLAGS="-O3 -DNDEBUG -DRELEASE"
 
 
 
diff --git a/areverse2/makefile b/areverse2/makefile
index f19c977454b02b96a4b7f81bfdb2e4dcaab19f6e..7d3c3454db062836e8a6a630c98712bd6b81622e 100644
--- a/areverse2/makefile
+++ b/areverse2/makefile
@@ -113,10 +113,10 @@ bin-release/$(EXECUTABLE): obj-release/ $(OBJECTS_RELEASE)
 
 
 obj-debug/: FORCE | obj-debug/makefile 
-	$(MAKE) -C $@ OBJECTS_BASE_DIR=$(realpath obj-debug) SOURCES_BASE_DIR=$(realpath src) CXX_OTHER_FLAGS="-g -O0"
+	$(MAKE) -C $@ OBJECTS_BASE_DIR=$(realpath obj-debug) SOURCES_BASE_DIR=$(realpath src) CXX_OTHER_FLAGS="-g -O0 -DDEBUG"
 
 obj-release/: FORCE | obj-release/makefile
-	$(MAKE) -C $@ OBJECTS_BASE_DIR=$(realpath obj-release) SOURCES_BASE_DIR=$(realpath src) CXX_OTHER_FLAGS="-O3"
+	$(MAKE) -C $@ OBJECTS_BASE_DIR=$(realpath obj-release) SOURCES_BASE_DIR=$(realpath src) CXX_OTHER_FLAGS="-O3 -DNDEBUG -DRELEASE"
 
 
 
diff --git a/arun2/makefile b/arun2/makefile
index f19c977454b02b96a4b7f81bfdb2e4dcaab19f6e..7d3c3454db062836e8a6a630c98712bd6b81622e 100644
--- a/arun2/makefile
+++ b/arun2/makefile
@@ -113,10 +113,10 @@ bin-release/$(EXECUTABLE): obj-release/ $(OBJECTS_RELEASE)
 
 
 obj-debug/: FORCE | obj-debug/makefile 
-	$(MAKE) -C $@ OBJECTS_BASE_DIR=$(realpath obj-debug) SOURCES_BASE_DIR=$(realpath src) CXX_OTHER_FLAGS="-g -O0"
+	$(MAKE) -C $@ OBJECTS_BASE_DIR=$(realpath obj-debug) SOURCES_BASE_DIR=$(realpath src) CXX_OTHER_FLAGS="-g -O0 -DDEBUG"
 
 obj-release/: FORCE | obj-release/makefile
-	$(MAKE) -C $@ OBJECTS_BASE_DIR=$(realpath obj-release) SOURCES_BASE_DIR=$(realpath src) CXX_OTHER_FLAGS="-O3"
+	$(MAKE) -C $@ OBJECTS_BASE_DIR=$(realpath obj-release) SOURCES_BASE_DIR=$(realpath src) CXX_OTHER_FLAGS="-O3 -DNDEBUG -DRELEASE"
 
 
 
diff --git a/astat2/makefile b/astat2/makefile
index f19c977454b02b96a4b7f81bfdb2e4dcaab19f6e..7d3c3454db062836e8a6a630c98712bd6b81622e 100644
--- a/astat2/makefile
+++ b/astat2/makefile
@@ -113,10 +113,10 @@ bin-release/$(EXECUTABLE): obj-release/ $(OBJECTS_RELEASE)
 
 
 obj-debug/: FORCE | obj-debug/makefile 
-	$(MAKE) -C $@ OBJECTS_BASE_DIR=$(realpath obj-debug) SOURCES_BASE_DIR=$(realpath src) CXX_OTHER_FLAGS="-g -O0"
+	$(MAKE) -C $@ OBJECTS_BASE_DIR=$(realpath obj-debug) SOURCES_BASE_DIR=$(realpath src) CXX_OTHER_FLAGS="-g -O0 -DDEBUG"
 
 obj-release/: FORCE | obj-release/makefile
-	$(MAKE) -C $@ OBJECTS_BASE_DIR=$(realpath obj-release) SOURCES_BASE_DIR=$(realpath src) CXX_OTHER_FLAGS="-O3"
+	$(MAKE) -C $@ OBJECTS_BASE_DIR=$(realpath obj-release) SOURCES_BASE_DIR=$(realpath src) CXX_OTHER_FLAGS="-O3 -DNDEBUG -DRELEASE"
 
 
 
diff --git a/astringology2/makefile b/astringology2/makefile
index f19c977454b02b96a4b7f81bfdb2e4dcaab19f6e..7d3c3454db062836e8a6a630c98712bd6b81622e 100644
--- a/astringology2/makefile
+++ b/astringology2/makefile
@@ -113,10 +113,10 @@ bin-release/$(EXECUTABLE): obj-release/ $(OBJECTS_RELEASE)
 
 
 obj-debug/: FORCE | obj-debug/makefile 
-	$(MAKE) -C $@ OBJECTS_BASE_DIR=$(realpath obj-debug) SOURCES_BASE_DIR=$(realpath src) CXX_OTHER_FLAGS="-g -O0"
+	$(MAKE) -C $@ OBJECTS_BASE_DIR=$(realpath obj-debug) SOURCES_BASE_DIR=$(realpath src) CXX_OTHER_FLAGS="-g -O0 -DDEBUG"
 
 obj-release/: FORCE | obj-release/makefile
-	$(MAKE) -C $@ OBJECTS_BASE_DIR=$(realpath obj-release) SOURCES_BASE_DIR=$(realpath src) CXX_OTHER_FLAGS="-O3"
+	$(MAKE) -C $@ OBJECTS_BASE_DIR=$(realpath obj-release) SOURCES_BASE_DIR=$(realpath src) CXX_OTHER_FLAGS="-O3 -DNDEBUG -DRELEASE"
 
 
 
diff --git a/atrim2/makefile b/atrim2/makefile
index f19c977454b02b96a4b7f81bfdb2e4dcaab19f6e..7d3c3454db062836e8a6a630c98712bd6b81622e 100644
--- a/atrim2/makefile
+++ b/atrim2/makefile
@@ -113,10 +113,10 @@ bin-release/$(EXECUTABLE): obj-release/ $(OBJECTS_RELEASE)
 
 
 obj-debug/: FORCE | obj-debug/makefile 
-	$(MAKE) -C $@ OBJECTS_BASE_DIR=$(realpath obj-debug) SOURCES_BASE_DIR=$(realpath src) CXX_OTHER_FLAGS="-g -O0"
+	$(MAKE) -C $@ OBJECTS_BASE_DIR=$(realpath obj-debug) SOURCES_BASE_DIR=$(realpath src) CXX_OTHER_FLAGS="-g -O0 -DDEBUG"
 
 obj-release/: FORCE | obj-release/makefile
-	$(MAKE) -C $@ OBJECTS_BASE_DIR=$(realpath obj-release) SOURCES_BASE_DIR=$(realpath src) CXX_OTHER_FLAGS="-O3"
+	$(MAKE) -C $@ OBJECTS_BASE_DIR=$(realpath obj-release) SOURCES_BASE_DIR=$(realpath src) CXX_OTHER_FLAGS="-O3 -DNDEBUG -DRELEASE"
 
 
 
diff --git a/tniceprint/makefile b/tniceprint/makefile
index f19c977454b02b96a4b7f81bfdb2e4dcaab19f6e..7d3c3454db062836e8a6a630c98712bd6b81622e 100644
--- a/tniceprint/makefile
+++ b/tniceprint/makefile
@@ -113,10 +113,10 @@ bin-release/$(EXECUTABLE): obj-release/ $(OBJECTS_RELEASE)
 
 
 obj-debug/: FORCE | obj-debug/makefile 
-	$(MAKE) -C $@ OBJECTS_BASE_DIR=$(realpath obj-debug) SOURCES_BASE_DIR=$(realpath src) CXX_OTHER_FLAGS="-g -O0"
+	$(MAKE) -C $@ OBJECTS_BASE_DIR=$(realpath obj-debug) SOURCES_BASE_DIR=$(realpath src) CXX_OTHER_FLAGS="-g -O0 -DDEBUG"
 
 obj-release/: FORCE | obj-release/makefile
-	$(MAKE) -C $@ OBJECTS_BASE_DIR=$(realpath obj-release) SOURCES_BASE_DIR=$(realpath src) CXX_OTHER_FLAGS="-O3"
+	$(MAKE) -C $@ OBJECTS_BASE_DIR=$(realpath obj-release) SOURCES_BASE_DIR=$(realpath src) CXX_OTHER_FLAGS="-O3 -DNDEBUG -DRELEASE"