Merge branch 'master' of https://github.com/Hamlib/Hamlib

Makefile.am

@@ -7,7 +7,8 @@ pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = hamlib.pc
 
 EXTRA_DIST = PLAN LICENSE hamlib.m4 hamlib.pc.in README.developer \
-	README.betatester README.win32 Android.mk
+	README.betatester README.freqranges README.multicast README.osx \
+	Android.mk
 
 doc_DATA = ChangeLog COPYING COPYING.LIB LICENSE \
 	README README.betatester README.developer

NEWS

@@ -8,6 +8,7 @@ Please send Hamlib bug reports to hamlib-developer@lists.sourceforge.net
 
 Version 4.3
         * 2021-??-??
+        * Generating documentation now requires GNU source-highlighter.
 
 Version 4.2
         * 2021-05-17

README.developer

@@ -269,6 +269,7 @@ backend.  The older version of libusb 0.1.x is no longer supported.
 
 Documentation:
 * Doxygen
+* GNU Source-highlight
 
 N.B.:  Some systems can have several versions of the autotools installed. In
 that case, autoconf may be called "autoconf2.59", autoheader

doc/Makefile.am

@@ -1,4 +1,4 @@
-EXTRA_DIST = hamlib.cfg index.doxygen hamlib.css footer.html
+EXTRA_DIST = hamlib.cfg index.doxygen hamlib.css footer.html hamlib.png
 
 dist_man_MANS = man1/ampctl.1 man1/ampctld.1 \
 	man1/rigctl.1 man1/rigctld.1 man1/rigmem.1 man1/rigsmtr.1 \
@@ -8,5 +8,16 @@ dist_man_MANS = man1/ampctl.1 man1/ampctld.1 \
 SRCDOCLST = ../src/rig.c ../src/rotator.c ../src/tones.c ../src/locator.c \
 	../src/event.c ../src/conf.c ../src/mem.c ../src/settings.c
 
+SCRIPTSLST = build-w32.sh build-w64.sh
+
+
+# Use GNU source-highlight to generate highlighted shell scripts for the
+# Doxygen manual.
 doc: hamlib.cfg $(SRCDOCLST)
+	for script in $(SCRIPTSLST) ; do \
+		source-highlight -n -i $(top_srcdir)/scripts/$${script} -o $(top_builddir)/scripts/$${script}.html ; \
+	done ; \
 	doxygen hamlib.cfg
+
+clean-local:
+	-rm -rf $(top_builddir)/doc/html $(top_builddir)/scripts/build-w*.sh.html

doc/hamlib.cfg.in

@@ -30,8 +30,8 @@ INCLUDE_PATH     = @top_srcdir@/include
 EXAMPLE_PATH     = @top_srcdir@/tests/testrig.c \
                    @top_srcdir@ \
                    @top_srcdir@/scripts/README.build-Windows \
-                   @top_srcdir@/scripts/build-w32.sh \
-                   @top_srcdir@/scripts/build-w64.sh
+                   @top_builddir@/scripts/build-w32.sh.html \
+                   @top_builddir@/scripts/build-w64.sh.html
 
 
 QUIET            = YES

doc/index.doxygen

@@ -24,7 +24,6 @@ These text files are distributed with the Hamlib package.
 \subpage Rdmeosx "Mac OS X";
 \subpage Rdmefrq "Frequency range changes";
 \subpage Rdmemulti "Multicast support";
-\subpage Security "Security policy";
 
 \li Other files: \subpage INSTALL;
 \subpage AUTHORS;
@@ -87,9 +86,9 @@ GNU/Linux.
 \section Build README.build-Windows
 \verbinclude README.build-Windows
 \subsection W32 The build-w32.sh script
-\include{lineno} build-w32.sh
+\htmlinclude build-w32.sh.html
 \subsection W64 The build-w64.sh script
-\include{lineno} build-w64.sh
+\htmlinclude build-w64.sh.html
 */
 
 /*! \page Rdmeosx README.osx
@@ -104,11 +103,6 @@ GNU/Linux.
 \verbinclude README.multicast
 */
 
-/* FIXME: figure out how to include Markdown for HTML output. */
-/*! \page Security SECURITY.md
-\include SECURITY.md
-*/
-
 /*! \page INSTALL INSTALL
 \verbinclude INSTALL
 */