Add ZT_DEBUG to DEFS when specified

make-linux.mk

@@ -45,17 +45,14 @@ endif
 # Trying to use dynamically linked libhttp-parser causes tons of compatibility problems.
 ONE_OBJS+=ext/http-parser/http_parser.o
 
-ifeq ($(ZT_DEBUG_TRACE),1)
-	DEFS+=-DZT_DEBUG_TRACE
-endif
-ifeq ($(ZT_TRACE),1)
-	DEFS+=-DZT_TRACE
-endif
-
 ifeq ($(ZT_RULES_ENGINE_DEBUGGING),1)
 	override DEFS+=-DZT_RULES_ENGINE_DEBUGGING
 endif
 
+ifeq ($(ZT_DEBUG_TRACE),1)
+	DEFS+=-DZT_DEBUG_TRACE
+endif
+
 # Build with address sanitization library for advanced debugging (clang)
 ifeq ($(ZT_SANITIZE),1)
 	override DEFS+=-fsanitize=address -DASAN_OPTIONS=symbolize=1
@@ -98,6 +95,10 @@ ifeq ($(ZT_TRACE),1)
 	override DEFS+=-DZT_TRACE
 endif
 
+ifeq ($(ZT_DEBUG),1)
+	override DEFS+=-DZT_DEBUG
+endif
+
 ifeq ($(ZT_USE_TEST_TAP),1)
 	override DEFS+=-DZT_USE_TEST_TAP
 endif

make-mac.mk

@@ -92,6 +92,10 @@ ifeq ($(ZT_TRACE),1)
 	DEFS+=-DZT_TRACE
 endif
 
+ifeq ($(ZT_DEBUG),1)
+	DEFS+=-DZT_DEBUG
+endif
+
 ifeq ($(ZT_VAULT_SUPPORT),1)
 	DEFS+=-DZT_VAULT_SUPPORT=1
 	LIBS+=-lcurl