rigmatrix.html target is conditional in tests/Makefile

If libgd-dev is not installed, an Automake conditional will disable the
rigmatrix.html target in tests/Makefile.  Optionally, this target may
also be disabled by use of the '--disable-html-matrix' option passed to
the configure script.  By default the configure script will enable the
target if the libgd development files are found and disable it when they
are not.
Hamlib-3.0
Nate Bargmann 2012-10-17 21:06:03 -05:00
rodzic 2fea683ca1
commit 3bb0556f9f
3 zmienionych plików z 48 dodań i 42 usunięć

13
INSTALL
Wyświetl plik

@ -231,14 +231,14 @@ Win32
=====
- Debian system with mingw32msvc cross-compiler
./configure --with-included-ltdl --host=i586-mingw32msvc
./configure --with-included-ltdl --host=i586-mingw32msvc
- Mingw compiler under Cygwin
CC="gcc -mno-cygwin" CXX="g++ -mno-cygwin" \
CC="gcc -mno-cygwin" CXX="g++ -mno-cygwin" \
./configure --with-included-ltdl --host=i686-pc-mingw32
- Cygwin
Native Cygwin requires no special options besides regular ones.
Native Cygwin requires no special options besides regular ones.
N.B. See the 'build-win32.sh' script and its associated README.build-win32 file
in the 'scripts' directory for complete details on build a Win32 binary.
@ -258,10 +258,10 @@ are:
--with-tcl=PATH directory containing tcl configuration (tclConfig.sh)
--with-python-binding build python binding and demo [default=no]
Optional features that are disabled by default but may require specialized
hardware are:
Optional features that may require specialized hardware are:
--enable-rigmatrix generate rigmatrix tool (requires libgd)
--disable-html-matrix do not generate HTML rig feature matrix (requires
libgd-dev) [default=check]
--disable-winradio do not build winradio backend [default=yes]
--enable-usrp build USRP backend [default=no]
@ -278,4 +278,3 @@ has no effect on rigctld/rotctld). You may get a make error (which means it
will quit before compilation is complete) if the
--with-[perl|python|tcl]-binding option(s) are given and the Swig package is
not installed.

Wyświetl plik

@ -382,25 +382,28 @@ AC_SUBST([LIBXML2_CFLAGS])
dnl Check if libgd-dev is installed, so we can enable rigmatrix
AC_ARG_ENABLE([rigmatrix],
[AS_HELP_STRING([--enable-rigmatrix],
[generate rigmatrix tool (requires libgd)])],
[AC_CHECK_HEADERS([gd.h],
[AC_CHECK_LIB([gd],
[gdImageCreate],
[enable_rigmatrix=yes],
[enable_rigmatrix=no],
[-lz])
])],
[enable_rigmatrix=no])
AC_MSG_CHECKING([whether to build HTML rig feature matrix])
AC_ARG_ENABLE([html-matrix],
[AS_HELP_STRING([--disable-html-matrix],
[do not generate HTML rig feature matrix (requires libgd-dev) @<:@default=check@:>@])],
[cf_enable_html_matrix=no],
[cf_enable_html_matrix=check]
)
AC_MSG_CHECKING([whether to build rigmatrix])
AC_MSG_RESULT([$enable_rigmatrix])
AS_IF([test x"${enable_rigmatrix}" = "xno"],
[RIGMATRIX=],
[RIGMATRIX="rigmatrix"])
AC_MSG_RESULT([$cf_enable_html_matrix])
AC_SUBST([RIGMATRIX])
AS_IF([test x"$cf_enable_html_matrix" != "xno"],
[AC_CHECK_HEADERS([gd.h],
[AC_CHECK_LIB([gd],
[gdImageCreate],
[cf_enable_html_matrix=yes],
[cf_enable_html_matrix=no],
[-lz])],
[cf_enable_html_matrix=no]
)
])
AM_CONDITIONAL([HTML_MATRIX], [test x"${cf_enable_html_matrix}" = "xyes"])
## ----------------- ##
@ -717,18 +720,18 @@ echo \
Package features:
With C++ binding ${cf_with_cxx_binding}
With Perl binding ${cf_with_perl_binding}
With Python binding ${cf_with_python_binding}
With TCL binding ${build_tcl}
With rigmem XML support ${cf_with_xml_support}
With included ltdl ${with_included_ltdl}
With C++ binding ${cf_with_cxx_binding}
With Perl binding ${cf_with_perl_binding}
With Python binding ${cf_with_python_binding}
With TCL binding ${build_tcl}
With rigmem XML support ${cf_with_xml_support}
With included ltdl ${with_included_ltdl}
Enable Rig Matrix ${enable_rigmatrix}
Enable WinRadio ${cf_with_winradio}
Enable USRP ${cf_with_usrp}
Enable USB backends ${cf_with_libusb}
Enable shared libs ${enable_shared}
Enable static libs ${enable_static}
Enable HTML rig feature matrix ${cf_enable_html_matrix}
Enable WinRadio ${cf_with_winradio}
Enable USRP ${cf_with_usrp}
Enable USB backends ${cf_with_libusb}
Enable shared libs ${enable_shared}
Enable static libs ${enable_static}
-----------------------------------------------------------------------"

Wyświetl plik

@ -7,10 +7,11 @@
DISTCLEANFILES = rigctl.log rigctl.sum testbcd.log testbcd.sum
bin_PROGRAMS = rigctl rigmem rigswr rigsmtr rotctl rigctld rotctld
man_MANS = rigctl.1 rigmem.1 rigswr.1 rigsmtr.1 rotctl.1 rigctld.8 rotctld.8
check_PROGRAMS = dumpmem testrig testtrn testbcd testfreq listrigs \
testloc rig_bench @RIGMATRIX@
testloc rig_bench
rigctl_SOURCES = rigctl.c rigctl_parse.c dumpcaps.c sprintflst.c
rigctld_SOURCES = rigctld.c rigctl_parse.c dumpcaps.c sprintflst.c
@ -19,9 +20,9 @@ rotctld_SOURCES = rotctld.c rotctl_parse.c dumpcaps_rot.c
rigswr_SOURCES = rigswr.c
rigsmtr_SOURCES = rigsmtr.c
rigmem_SOURCES = rigmem.c memsave.c memload.c memcsv.c sprintflst.c
noinst_HEADERS = sprintflst.h rigctl_parse.h rotctl_parse.h uthash.h
EXTRA_PROGRAMS = rigmatrix rigctld rotctld
# all the programs need this
LDADD = $(top_builddir)/src/libhamlib.la $(top_builddir)/lib/libmisc.la
@ -47,8 +48,6 @@ rotctld_LDFLAGS = @ROT_BACKENDLNK@ @PTHREAD_LIBS@ @NET_LIBS@ @WINEXELDFLAGS@
testbcd_LDFLAGS = -dlpreopen self
testloc_LDFLAGS = -dlpreopen self
# rigmatrix needs also libgd
rigmatrix_LDFLAGS = -lgd -lz @BACKENDLNK@
## Dependencies
@ -62,17 +61,23 @@ rigmem_DEPENDENCIES = $(DEPENDENCIES) @BACKENDEPS@
rigswr_DEPENDENCIES = $(DEPENDENCIES) @BACKENDEPS@
rigsmtr_DEPENDENCIES = $(DEPENDENCIES) @BACKENDEPS@
rotctl_DEPENDENCIES = $(DEPENDENCIES) @ROT_BACKENDEPS@
rigmatrix_DEPENDENCIES = $(DEPENDENCIES) @BACKENDEPS@
rigctld_DEPENDENCIES = $(DEPENDENCIES) @BACKENDEPS@
rotctld_DEPENDENCIES = $(DEPENDENCIES) @ROT_BACKENDEPS@
if HTML_MATRIX
EXTRA_PROGRAMS = rigmatrix
# rigmatrix needs libgd
rigmatrix_LDFLAGS = -lgd -lz @BACKENDLNK@
rigmatrix_DEPENDENCIES = $(DEPENDENCIES) @BACKENDEPS@
rigmatrix.html: rigmatrix_head.html rigmatrix listrigs
mkdir -p sup-info/support
( cat $(srcdir)/rigmatrix_head.html && cd sup-info && ../rigmatrix ) > sup-info/rigmatrix.html
for f in `./listrigs | tail -n +2 | cut -f1` ; do ( ./rigctl -m $$f -u > sup-info/support/model$$f.txt || exit 0 ) ; done
./rigctl -l |sort -n | $(srcdir)/rig_split_lst.awk -v lst_dir="sup-info"
endif
EXTRA_DIST = rigmatrix_head.html rig_split_lst.awk $(man_MANS) testctld.pl testrotctld.pl
@ -100,4 +105,3 @@ testloc.sh:
CLEANFILES = testrig.sh testfreq.sh testbcd.sh testloc.sh