commit 5a9d7c67d1ec1e4410995eae4b50f929396935f6
author E. Scott Daniels <daniels@research.att.com> Thu Jul 09 11:56:10 2020 -0400
committer E. Scott Daniels <daniels@research.att.com> Mon Jul 13 10:59:59 2020 -0400
tree c04af28d488c616de66e71e9613be24165105e90
parent 97204c8a0eb213af5f4c656cd30f1ecf82c8a520

Actually put the JSON doc into the user manual

The user manual include statment wasn't pulling the json section.
This change fixes that.

This change also closes some memory leaks in the json wrapper.

Signed-off-by: E. Scott Daniels <daniels@research.att.com>
Change-Id: I54849c67960fd945a85327a3ff308d7d7651b673

doc/src/user/Makefile

diff --git a/doc/src/user/Makefile b/doc/src/user/Makefile
index ca3c252..70ab002 100644
--- a/doc/src/user/Makefile
+++ b/doc/src/user/Makefile
@@ -17,6 +17,8 @@
 
 # this uses {X}fm which can be cloned from: https://gitlab.com/rouxware/xfm
 
+XPATH=XFM_PATH=.:/usr/local/share/xfm TFM_PATH=.:/usr/local/share/xfm
+
 docs = user_guide
 src = user_guide.xfm
 imbed_src = cpp_frame.im example1.im example2.im example3.im jhash.im
@@ -28,20 +30,20 @@
 # references etc.
 #
 %.ps: %.xfm
-	OUTPUT_TYPE=generic_ps XFM_PASS=1 pfm $< /dev/null
-	OUTPUT_TYPE=generic_ps XFM_PASS=2 pfm $< $@
+	$(XPATH) OUTPUT_TYPE=generic_ps XFM_PASS=1 pfm $< /dev/null
+	$(XPATH) OUTPUT_TYPE=generic_ps XFM_PASS=2 pfm $< $@
 
 %.md: %.xfm
-	OUTPUT_TYPE=markdown XFM_PASS=1 tfm $< /dev/null
-	OUTPUT_TYPE=markdown XFM_PASS=2 tfm $< | sed 's/^ //' >$@
+	$(XPATH) OUTPUT_TYPE=markdown XFM_PASS=1 tfm $< /dev/null
+	$(XPATH) OUTPUT_TYPE=markdown XFM_PASS=2 tfm $< | sed 's/^ //' >$@
 
 %.rst: %.xfm
-	OUTPUT_TYPE=rst XFM_PASS=1 tfm $< /dev/null
-	GEN_TITLE=1 OUTPUT_TYPE=rst XFM_PASS=2 tfm $< | sed 's/^ //; s/ *$$//' >$@
+	$(XPATH) OUTPUT_TYPE=rst XFM_PASS=1 tfm $< /dev/null
+	$(XPATH) GEN_TITLE=1 OUTPUT_TYPE=rst XFM_PASS=2 tfm $< | sed 's/^ //; s/ *$$//' >$@
 
 %.txt: %.xfm
-	OUTPUT_TYPE=txt XFM_PASS=1 tfm $< /dev/null
-	OUTPUT_TYPE=txt XFM_PASS=2 tfm $< $@
+	$(XPATH) OUTPUT_TYPE=txt XFM_PASS=1 tfm $< /dev/null
+	$(XPATH) OUTPUT_TYPE=txt XFM_PASS=2 tfm $< $@
 
 # -----------------------------------------------------------------------------------
 all:    $(desired_out:%=user_guide.%)