From 6ea09a138aa676b4df7608151b675dfb308ee197 Mon Sep 17 00:00:00 2001 From: Nate Bargmann Date: Tue, 10 Dec 2013 20:14:22 -0600 Subject: [PATCH] Clean up build system, fix test programs Clean up various left over commented lines from dlopen to single libhamlib transition. Remove unneeded configure variables. Correct minor inconsistencies in Makefile.am files. Define a new variable, READLINE_LIBS, so that only programs that offer Readline support are linked against it. Fix various compilation warnings and errors in test files revealed with 'make check' on MinGW. Define rig and rotor backends to (mostly) be built in alphabetical order. --- Makefile.am | 21 +++++---- ars/Makefile.am | 2 +- c++/Makefile.am | 5 +- configure.ac | 31 ++++-------- gnuradio/Makefile.am | 11 ++--- hamlib.pc.in | 2 +- kit/Makefile.am | 6 +-- lib/Makefile.am | 6 +-- macros/ax_lib_readline.m4 | 8 +++- src/Makefile.am | 7 ++- tests/Makefile.am | 99 ++++++++++----------------------------- tests/dumpmem.c | 5 ++ tests/testbcd.c | 4 +- tests/testfreq.c | 10 ++-- tests/testrig.c | 5 ++ tests/testtrn.c | 5 ++ winradio/Makefile.am | 2 +- 17 files changed, 93 insertions(+), 136 deletions(-) diff --git a/Makefile.am b/Makefile.am index 8ca0bc867..7428c1859 100644 --- a/Makefile.am +++ b/Makefile.am @@ -10,18 +10,19 @@ EXTRA_DIST = PLAN TODO LICENSE hamlib.m4 hamlib.pc.in README.developer \ README.betatester README.win32 Android.mk SUBDIRS = macros include lib \ - @BACKEND_LIST@ \ - @ROT_BACKEND_LIST@ \ + $(BACKEND_LIST) \ + $(ROT_BACKEND_LIST) \ src \ - @BINDINGS@ \ - tests doc android + $(BINDINGS) \ + tests doc -DIST_SUBDIRS = macros include lib src c++ bindings tests doc \ - icom kenwood aor yaesu dummy pcr alinco uniden tentec kachina jrc \ - winradio adat easycomm fodtrack drake rotorez \ - flexradio sartek lowe rft rs tapr kit skanti prm80 wj racal tuner \ - gs232a heathkit spid ars m2 amsat scripts ts7400 celestron android \ - ether6 +## Static list of distributed directories. $(BACKEND_LIST) is dynamically +## assigned by 'configure' so list rig backends statically. +DIST_SUBDIRS = macros include lib src c++ bindings tests doc android scripts \ + adat alinco aor drake dummy flexradio icom jrc kachina kenwood kit \ + lowe pcr prm80 racal rft rs skanti tapr tentec tuner uniden wj yaesu \ + winradio \ + $(ROT_BACKEND_LIST) # Install any third party macros into our tree for distribution ACLOCAL_AMFLAGS = -I macros --install diff --git a/ars/Makefile.am b/ars/Makefile.am index c0c971a1e..5dfdc2515 100644 --- a/ars/Makefile.am +++ b/ars/Makefile.am @@ -1,4 +1,4 @@ -AM_CFLAGS = @AM_CFLAGS@ $(PTHREAD_CFLAGS) +AM_CFLAGS += $(PTHREAD_CFLAGS) noinst_LTLIBRARIES = libhamlib-ars.la libhamlib_ars_la_SOURCES = ars.c ars.h diff --git a/c++/Makefile.am b/c++/Makefile.am index 5ef0e8c37..c95ae1e06 100644 --- a/c++/Makefile.am +++ b/c++/Makefile.am @@ -1,15 +1,14 @@ lib_LTLIBRARIES = libhamlib++.la libhamlib___la_SOURCES = rigclass.cc rotclass.cc -libhamlib___la_LDFLAGS = -no-undefined -version-info @ABI_VERSION@:@ABI_REVISION@:@ABI_AGE@ +libhamlib___la_LDFLAGS = -no-undefined -version-info $(ABI_VERSION):$(ABI_REVISION):$(ABI_AGE) libhamlib___la_LIBADD = $(top_builddir)/src/libhamlib.la check_PROGRAMS = testcpp testcpp_SOURCES = testcpp.cc testcpp_LDADD = libhamlib++.la -testcpp_LDFLAGS = @BACKENDLNK@ -testcpp_DEPENDENCIES = libhamlib++.la @BACKENDEPS@ +testcpp_DEPENDENCIES = libhamlib++.la check_SCRIPTS = testcpp.sh diff --git a/configure.ac b/configure.ac index eb2e24800..c3521aceb 100644 --- a/configure.ac +++ b/configure.ac @@ -46,10 +46,11 @@ m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) dnl New backends must be listed here! Also the new Makefile path must be dnl added to AC_CONFIG_FILES near the end of this file. See README.developer -BACKEND_LIST="icom kenwood aor yaesu dummy pcr alinco uniden tentec kachina jrc drake lowe rft rs kit skanti prm80 tapr flexradio wj racal tuner adat" -# ROT_BACKEND_LIST="dummy easycomm fodtrack gs232a heathkit kit rotorez sartek spid ars m2 amsat ts7400 celestron ether6" -# Beware of duplication. At the end we will have a single list. -ROT_BACKEND_LIST="easycomm fodtrack gs232a heathkit rotorez sartek spid ars m2 amsat ts7400 celestron ether6" +dnl Beware of duplication should a backend directory include both rig and +dnl rotor definitions, e.g. "dummy". Optional backends will not be listed +dnl here but will be added later, e.g. "winradio". +BACKEND_LIST="adat alinco aor drake dummy flexradio icom jrc kachina kenwood kit lowe pcr prm80 racal rft rs skanti tapr tentec tuner uniden wj yaesu" +ROT_BACKEND_LIST="amsat ars celestron easycomm ether6 fodtrack gs232a heathkit m2 rotorez sartek spid ts7400" dnl See README.release on setting these values # Values given to -version-info when linking. See libtool documentation. @@ -414,17 +415,17 @@ dnl http://lists.gnu.org/archive/html/automake/2011-03/msg00008.html dnl dnl Check for pkg-config program, used for configuring some libraries. m4_define_default([PKG_PROG_PKG_CONFIG], - [AC_MSG_CHECKING([pkg-config]) - AC_MSG_RESULT([no])]) + [AC_MSG_CHECKING([pkg-config] + AC_MSG_RESULT([no])]) PKG_PROG_PKG_CONFIG dnl If the pkg-config autoconf support isn't installed, define its dnl autoconf macro to disable any packages depending on it. m4_define_default([PKG_CHECK_MODULES], - [AC_MSG_CHECKING([$1]) - AC_MSG_RESULT([no]) - $4]) + [AC_MSG_CHECKING([$1]) + AC_MSG_RESULT([no]) + $4]) ]) @@ -655,13 +656,7 @@ for be in ${BACKEND_LIST} ; do BACKENDEPS="${BACKENDEPS} \$(top_builddir)/${be}/libhamlib-${be}.la" done -BACKENDLNK="" -for be in ${BACKEND_LIST} ; do - BACKENDLNK="${BACKENDLNK} \$(top_builddir)/${be}/libhamlib-${be}.la" -done - AC_SUBST([BACKEND_LIST]) -AC_SUBST([BACKENDLNK]) AC_SUBST([BACKENDEPS]) @@ -675,13 +670,7 @@ for be in ${ROT_BACKEND_LIST} ; do ROT_BACKENDEPS="${ROT_BACKENDEPS} \$(top_builddir)/${be}/libhamlib-${be}.la" done -ROT_BACKENDLNK="" -for be in ${ROT_BACKEND_LIST} ; do - ROT_BACKENDLNK="${ROT_BACKENDLNK} \$(top_builddir)/${be}/libhamlib-${be}.la" -done - AC_SUBST([ROT_BACKEND_LIST]) -AC_SUBST([ROT_BACKENDLNK]) AC_SUBST([ROT_BACKENDEPS]) diff --git a/gnuradio/Makefile.am b/gnuradio/Makefile.am index ef6588189..acc3cd78d 100644 --- a/gnuradio/Makefile.am +++ b/gnuradio/Makefile.am @@ -1,8 +1,8 @@ -GNURADIOSRC = mc4020.c graudio.c gnuradio.h gr.c gnuradio.cc am.h demod.h - gr_priv.h HrAGC.h nfm.h ssb.h wfm.h \ +GNURADIOSRC = mc4020.c graudio.c gnuradio.h gr.c gnuradio.cc am.h demod.h \ + gr_priv.h HrAGC.h nfm.h ssb.h wfm.h -AM_CFLAGS = @AM_CFLAGS@ @GNURADIO_CFLAGS@ $(PTHREAD_CFLAGS) -AM_CXXFLAGS = @AM_CXXFLAGS@ @GNURADIO_CFLAGS@ $(PTHREAD_CFLAGS) +AM_CFLAGS += @GNURADIO_CFLAGS@ $(PTHREAD_CFLAGS) +AM_CXXFLAGS += @GNURADIO_CFLAGS@ $(PTHREAD_CFLAGS) noinst_LTLIBRARIES = hamlib-gnuradio.la hamlib_gnuradio_la_SOURCES = $(GNURADIOSRC) @@ -15,5 +15,4 @@ check_PROGRAMS = testgr testgr_SOURCES = testgr.cc testgr_LDADD = $(top_builddir)/src/libhamlib.la @GNURADIO_LIBS@ -testgr_LDFLAGS = @BACKENDLNK@ -testgr_DEPENDENCIES = @BACKENDEPS@ $(top_builddir)/src/libhamlib.la +testgr_DEPENDENCIES = $(top_builddir)/src/libhamlib.la diff --git a/hamlib.pc.in b/hamlib.pc.in index 94f599b3e..3a62d0287 100644 --- a/hamlib.pc.in +++ b/hamlib.pc.in @@ -10,4 +10,4 @@ Version: @PACKAGE_VERSION@ Requires.private: @LIBUSB@ Cflags: -I${includedir} @PTHREAD_CFLAGS@ Libs: -L${libdir} -lhamlib -Libs.private: @MATH_LIBS@ @DL_LIB@ @PTHREAD_LIBS@ +Libs.private: @MATH_LIBS@ @DL_LIBS@ @PTHREAD_LIBS@ diff --git a/kit/Makefile.am b/kit/Makefile.am index 19cfc081a..8024b2aba 100644 --- a/kit/Makefile.am +++ b/kit/Makefile.am @@ -1,4 +1,4 @@ -AM_CFLAGS = @AM_CFLAGS@ $(LIBUSB_CFLAGS) +AM_CFLAGS += $(LIBUSB_CFLAGS) # FIXME: compile usrp only if CXX available @@ -8,7 +8,7 @@ KITSRC = elektor304.c drt1.c dwt.c usrp.c elektor507.c dds60.c miniVNA.c \ if HAVE_USRP # Append to the already defined AM_CXXFLAGS that exists outside the conditional. - AM_CXXFLAGS += @USRP_CFLAGS@ + AM_CXXFLAGS += $(USRP_CFLAGS) KITSRC += usrp_impl.cc libhamlib_kit_la_LINK = $(CXXLINK) $(libhamlib_kit_la_LDFLAGS) else @@ -22,6 +22,6 @@ KITROTSRC = pcrotor.c noinst_LTLIBRARIES = libhamlib-kit.la libhamlib_kit_la_SOURCES = $(KITSRC) $(KITROTSRC) -libhamlib_kit_la_LIBADD = $(USRP_LIBS) $(LIBUSB_LIBS) @MATH_LIBS@ +libhamlib_kit_la_LIBADD = $(USRP_LIBS) $(LIBUSB_LIBS) $(MATH_LIBS) EXTRA_DIST = README.funcubedongle Android.mk diff --git a/lib/Makefile.am b/lib/Makefile.am index 45d978614..36fde6aac 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -1,7 +1,7 @@ EXTRA_DIST = getopt.c getopt.h getopt_long.c usleep.c \ - termios.c win32termios.h gettimeofday.c getaddrinfo.c + termios.c win32termios.h gettimeofday.c getaddrinfo.c noinst_LTLIBRARIES = libmisc.la -libmisc_la_SOURCES = -libmisc_la_LIBADD = @LTLIBOBJS@ @NET_LIBS@ +libmisc_la_SOURCES = +libmisc_la_LIBADD = $(LTLIBOBJS) $(NET_LIBS) diff --git a/macros/ax_lib_readline.m4 b/macros/ax_lib_readline.m4 index 056f25c2a..75761a1a0 100644 --- a/macros/ax_lib_readline.m4 +++ b/macros/ax_lib_readline.m4 @@ -58,7 +58,9 @@ # and this notice are preserved. This file is offered as-is, without any # warranty. -#serial 6 +#serial 6.1 + +# For Hamlib, set READLINE_LIBS instead of LIBS AU_ALIAS([VL_LIB_READLINE], [AX_LIB_READLINE]) AC_DEFUN([AX_LIB_READLINE], [ @@ -89,6 +91,7 @@ AC_DEFUN([AX_LIB_READLINE], [ ]) if test "$ax_cv_lib_readline" != "no"; then + ORIG_LIBS="$LIBS" LIBS="$LIBS $ax_cv_lib_readline" AC_DEFINE(HAVE_LIBREADLINE, 1, [Define if you have a readline compatible library]) @@ -103,5 +106,8 @@ AC_DEFUN([AX_LIB_READLINE], [ [Define if your readline library has \`add_history']) AC_CHECK_HEADERS(history.h readline/history.h) fi + LIBS="$ORIG_LIBS" + READLINE_LIBS="$ax_cv_lib_readline" + AC_SUBST([READLINE_LIBS]) fi ])dnl diff --git a/src/Makefile.am b/src/Makefile.am index d8e0fe62d..ca39ab9d1 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -8,12 +8,11 @@ RIGSRC = rig.c serial.c serial.h misc.c misc.h register.c register.h event.c \ lib_LTLIBRARIES = libhamlib.la libhamlib_la_SOURCES = $(RIGSRC) -libhamlib_la_LDFLAGS = $(WINLDFLAGS) $(OSXLDFLAGS) -no-undefined -version-info @ABI_VERSION@:@ABI_REVISION@:@ABI_AGE@ +libhamlib_la_LDFLAGS = $(WINLDFLAGS) $(OSXLDFLAGS) -no-undefined -version-info $(ABI_VERSION):$(ABI_REVISION):$(ABI_AGE) libhamlib_la_LIBADD = $(top_builddir)/lib/libmisc.la \ - @BACKENDEPS@ @ROT_BACKENDEPS@ \ - @NET_LIBS@ @MATH_LIBS@ $(LIBUSB_LIBS) + $(BACKENDEPS) $(ROT_BACKENDEPS) $(NET_LIBS) $(MATH_LIBS) $(LIBUSB_LIBS) -libhamlib_la_DEPENDENCIES = $(top_builddir)/lib/libmisc.la @BACKENDEPS@ @ROT_BACKENDEPS@ +libhamlib_la_DEPENDENCIES = $(top_builddir)/lib/libmisc.la $(BACKENDEPS) $(ROT_BACKENDEPS) EXTRA_DIST = Android.mk diff --git a/tests/Makefile.am b/tests/Makefile.am index 8b7def53d..1933772b7 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -10,98 +10,47 @@ 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 +check_PROGRAMS = dumpmem testrig testtrn testbcd testfreq listrigs 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 -rotctl_SOURCES = rotctl.c rotctl_parse.c dumpcaps_rot.c -rotctld_SOURCES = rotctld.c rotctl_parse.c dumpcaps_rot.c +RIGCOMMONSRC = rigctl_parse.c rigctl_parse.h dumpcaps.c sprintflst.c sprintflst.h uthash.h +ROTCOMMONSRC = rotctl_parse.c rotctl_parse.h dumpcaps_rot.c uthash.h + +rigctl_SOURCES = rigctl.c $(RIGCOMMONSRC) +rigctld_SOURCES = rigctld.c $(RIGCOMMONSRC) +rotctl_SOURCES = rotctl.c $(ROTCOMMONSRC) +rotctld_SOURCES = rotctld.c $(ROTCOMMONSRC) 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 +rigmem_SOURCES = rigmem.c memsave.c memload.c memcsv.c sprintflst.c sprintflst.h # all the programs need this -LDADD = $(top_builddir)/src/libhamlib.la $(top_builddir)/lib/libmisc.la $(LIBUSB_LIBS) -DEPENDENCIES = $(top_builddir)/src/libhamlib.la +LDADD = $(top_builddir)/src/libhamlib.la $(top_builddir)/lib/libmisc.la -rigmem_CFLAGS = $(AM_CFLAGS) @LIBXML2_CFLAGS@ +rigmem_CFLAGS = $(AM_CFLAGS) $(LIBXML2_CFLAGS) rigctld_CFLAGS = $(AM_CFLAGS) $(PTHREAD_CFLAGS) rotctld_CFLAGS = $(AM_CFLAGS) $(PTHREAD_CFLAGS) -## Linker options -##########" IN FACT, WILL BE USELESS, THERE WILL BE ONLY libhamlib.a AT THE END. OR libhamlib.so. -########## EVEN libmisc WILL NOT APPEAR. -###### listrigs_LDFLAGS = @BACKENDLNK@ -listrigs_LDFLAGS = -###### dumpmem_LDFLAGS = @BACKENDLNK@ -dumpmem_LDFLAGS = -###### testrig_LDFLAGS = @BACKENDLNK@ -testrig_LDFLAGS = -###### rig_bench_LDFLAGS = $(top_builddir)/lib/libmisc.la @BACKENDLNK@ -rig_bench_LDFLAGS = -###### testtrn_LDFLAGS = @BACKENDLNK@ -testtrn_LDFLAGS = -###### rigctl_LDFLAGS = @BACKENDLNK@ $(PTHREAD_LIBS) @WINEXELDFLAGS@ -rigctl_LDFLAGS = $(PTHREAD_LIBS) @WINEXELDFLAGS@ -###### rigswr_LDFLAGS = @BACKENDLNK@ @WINEXELDFLAGS@ -rigswr_LDFLAGS = @WINEXELDFLAGS@ -###### rigsmtr_LDFLAGS = @BACKENDLNK@ @WINEXELDFLAGS@ -rigsmtr_LDFLAGS = @WINEXELDFLAGS@ -###### rigmem_LDFLAGS = @BACKENDLNK@ @LIBXML2_LIBS@ @WINEXELDFLAGS@ -rigmem_LDFLAGS = @LIBXML2_LIBS@ @WINEXELDFLAGS@ -###### rotctl_LDFLAGS = @ROT_BACKENDLNK@ $(PTHREAD_LIBS) @WINEXELDFLAGS@ -rotctl_LDFLAGS = $(PTHREAD_LIBS) @WINEXELDFLAGS@ -###### rigctld_LDFLAGS = @BACKENDLNK@ $(PTHREAD_LIBS) @NET_LIBS@ @WINEXELDFLAGS@ -rigctld_LDFLAGS = $(PTHREAD_LIBS) @NET_LIBS@ @WINEXELDFLAGS@ -###### rotctld_LDFLAGS = @ROT_BACKENDLNK@ $(PTHREAD_LIBS) @NET_LIBS@ @WINEXELDFLAGS@ -rotctld_LDFLAGS = $(PTHREAD_LIBS) @NET_LIBS@ @WINEXELDFLAGS@ - -# temporary hack -testbcd_LDFLAGS = -dlpreopen self -testloc_LDFLAGS = -dlpreopen self - - -## Dependencies - -##### dumpmem_DEPENDENCIES = $(DEPENDENCIES) @BACKENDEPS@ -##### testrig_DEPENDENCIES = $(DEPENDENCIES) @BACKENDEPS@ -##### rig_bench_DEPENDENCIES = $(DEPENDENCIES) @BACKENDEPS@ -##### testtrn_DEPENDENCIES = $(DEPENDENCIES) @BACKENDEPS@ -##### listrigs_DEPENDENCIES = $(DEPENDENCIES) @BACKENDEPS@ -##### rigctl_DEPENDENCIES = $(DEPENDENCIES) @BACKENDEPS@ -##### rigmem_DEPENDENCIES = $(DEPENDENCIES) @BACKENDEPS@ -##### rigswr_DEPENDENCIES = $(DEPENDENCIES) @BACKENDEPS@ -##### rigsmtr_DEPENDENCIES = $(DEPENDENCIES) @BACKENDEPS@ -##### rotctl_DEPENDENCIES = $(DEPENDENCIES) @ROT_BACKENDEPS@ -##### rigctld_DEPENDENCIES = $(DEPENDENCIES) @BACKENDEPS@ -##### rotctld_DEPENDENCIES = $(DEPENDENCIES) @ROT_BACKENDEPS@ - -dumpmem_DEPENDENCIES = $(DEPENDENCIES) -testrig_DEPENDENCIES = $(DEPENDENCIES) -rig_bench_DEPENDENCIES = $(DEPENDENCIES) -testtrn_DEPENDENCIES = $(DEPENDENCIES) -listrigs_DEPENDENCIES = $(DEPENDENCIES) -rigctl_DEPENDENCIES = $(DEPENDENCIES) -rigmem_DEPENDENCIES = $(DEPENDENCIES) -rigswr_DEPENDENCIES = $(DEPENDENCIES) -rigsmtr_DEPENDENCIES = $(DEPENDENCIES) -rotctl_DEPENDENCIES = $(DEPENDENCIES) -rigctld_DEPENDENCIES = $(DEPENDENCIES) -rotctld_DEPENDENCIES = $(DEPENDENCIES) +rigctl_LDADD = $(PTHREAD_LIBS) $(LDADD) $(READLINE_LIBS) +rigctld_LDADD = $(NET_LIBS) $(PTHREAD_LIBS) $(LDADD) $(READLINE_LIBS) +rotctl_LDADD = $(PTHREAD_LIBS) $(LDADD) $(READLINE_LIBS) +rotctld_LDADD = $(NET_LIBS) $(PTHREAD_LIBS) $(LDADD) $(READLINE_LIBS) +rigmem_LDADD = $(LIBXML2_LIBS) $(LDADD) +# Linker options +rigctl_LDFLAGS = $(WINEXELDFLAGS) +rigswr_LDFLAGS = $(WINEXELDFLAGS) +rigsmtr_LDFLAGS = $(WINEXELDFLAGS) +rigmem_LDFLAGS = $(WINEXELDFLAGS) +rotctl_LDFLAGS = $(WINEXELDFLAGS) +rigctld_LDFLAGS = $(WINEXELDFLAGS) +rotctld_LDFLAGS = $(WINEXELDFLAGS) if HTML_MATRIX EXTRA_PROGRAMS = rigmatrix # rigmatrix needs libgd -##### rigmatrix_LDFLAGS = -lgd -lz @BACKENDLNK@ -##### rigmatrix_DEPENDENCIES = $(DEPENDENCIES) @BACKENDEPS@ rigmatrix_LDFLAGS = -lgd -lz -rigmatrix_DEPENDENCIES = $(DEPENDENCIES) 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 diff --git a/tests/dumpmem.c b/tests/dumpmem.c index ed842e37e..c237fdb43 100644 --- a/tests/dumpmem.c +++ b/tests/dumpmem.c @@ -25,6 +25,11 @@ #include #include + +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + #include "misc.h" #define SERIAL_PORT "/dev/ttyS0" diff --git a/tests/testbcd.c b/tests/testbcd.c index 7d89733a1..a642cbe1e 100644 --- a/tests/testbcd.c +++ b/tests/testbcd.c @@ -40,7 +40,7 @@ int main (int argc, char *argv[]) printf("BCD: %2.2x",b[0]); for (i = 1; i < (digits+1)/2; i++) printf(",%2.2x",b[i]); - printf("\nResult after recoding: %llu\n", from_bcd(b, digits)); + printf("\nResult after recoding: %"PRIll"\n", from_bcd(b, digits)); printf("\nBig Endian mode\n"); printf("Frequency: %"PRIfreq"\n",f); @@ -48,7 +48,7 @@ int main (int argc, char *argv[]) printf("BCD: %2.2x",b[0]); for (i = 1; i < (digits+1)/2; i++) printf(",%2.2x",b[i]); - printf("\nResult after recoding: %llu\n", from_bcd_be(b, digits)); + printf("\nResult after recoding: %"PRIll"\n", from_bcd_be(b, digits)); return 0; } diff --git a/tests/testfreq.c b/tests/testfreq.c index 416ac185d..47553352d 100644 --- a/tests/testfreq.c +++ b/tests/testfreq.c @@ -28,11 +28,11 @@ int main (int argc, char *argv[]) #endif printf("%s\n", hamlib_version); - printf("caps size: %lu\n", sizeof(struct rig_caps)); - printf("state size: %lu\n", sizeof(struct rig_state)); - printf("RIG size: %lu\n", sizeof(struct rig)); - printf("freq_t size: %lu\n", sizeof(freq_t)); - printf("shortfreq_t size: %lu\n", sizeof(shortfreq_t)); + printf("caps size: %lu\n", (long unsigned) sizeof(struct rig_caps)); + printf("state size: %lu\n", (long unsigned) sizeof(struct rig_state)); + printf("RIG size: %lu\n", (long unsigned) sizeof(struct rig)); + printf("freq_t size: %lu\n", (long unsigned) sizeof(freq_t)); + printf("shortfreq_t size: %lu\n", (long unsigned) sizeof(shortfreq_t)); /* freq on 31bits test */ f = GHz(2); diff --git a/tests/testrig.c b/tests/testrig.c index 903af6a21..234d32225 100644 --- a/tests/testrig.c +++ b/tests/testrig.c @@ -6,8 +6,13 @@ #include #include #include + #include +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + /* HAVE_SSLEEP is defined when Windows Sleep is found * HAVE_SLEEP is defined when POSIX sleep is found * _WIN32 is defined when compiling with MinGW diff --git a/tests/testtrn.c b/tests/testtrn.c index 2cb0abb12..c497d6a75 100644 --- a/tests/testtrn.c +++ b/tests/testtrn.c @@ -6,8 +6,13 @@ #include #include #include + #include +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + /* HAVE_SSLEEP is defined when Windows Sleep is found * HAVE_SLEEP is defined when POSIX sleep is found * _WIN32 is defined when compiling with MinGW diff --git a/winradio/Makefile.am b/winradio/Makefile.am index 9f436b276..28df61208 100644 --- a/winradio/Makefile.am +++ b/winradio/Makefile.am @@ -4,7 +4,7 @@ WRSRC = wr1000.c wr1500.c wr1550.c wr3100.c wr3150.c wr3500.c wr3700.c \ if G313_LINUX_GNU WRSRC += g313-posix.c linradio/wrg313api.c linradio/wrg313api.h -libhamlib_winradio_la_LDFLAGS = $(DL_LIBS) +libhamlib_winradio_la_LIBADD = $(DL_LIBS) endif if G313_WINDOWS