move JSON_INDENT to config.mk

Makefile

@@ -33,6 +33,12 @@ ifeq ($(HAVE_HTTP),yes)
 	LIBS += -lssl
 endif
 
+ifeq ($(JSON_INDENT),yes)
+	CFLAGS += -DJSON_INDENT="\" \""
+else
+	CFLAGS += -DJSON_INDENT=NULL
+endif
+
 CFLAGS += -DSTORAGEDEFAULT=\"$(STORAGEDEFAULT)\"
 
 

config.h.example

@@ -11,10 +11,3 @@
  */
 
 #define DEFAULT_HISTORY_HOURS 6
-
-/*
- * Indented JSON or not? Choose.
- */
-
-#define JSON_INDENT	" "	/* indented */
-// #define JSON_INDENT	NULL	/* not indented */

config.mk.in

@@ -25,3 +25,6 @@ MOSQUITTO_LIB = -L/usr/lib
 
 GHASHPREC = 7
 
+# Should the JSON emitted by recorder be indented? (i.e. beautified)
+# yes or no
+JSON_INDENT ?= yes