From 7b0a85c81c6bce43ced9bf59d99b3584fd1498d8 Mon Sep 17 00:00:00 2001 From: Bert Vermeulen Date: Mon, 15 Oct 2012 18:25:48 +0200 Subject: [PATCH] radioshack-dmm: build fixes --- configure.ac | 2 +- hardware/radioshack-dmm/api.c | 2 +- hardware/radioshack-dmm/radioshack-dmm.c | 0 hardware/radioshack-dmm/radioshack.c | 1 - 4 files changed, 2 insertions(+), 3 deletions(-) delete mode 100644 hardware/radioshack-dmm/radioshack-dmm.c diff --git a/configure.ac b/configure.ac index bc51a1e7..857d0ead 100644 --- a/configure.ac +++ b/configure.ac @@ -124,7 +124,7 @@ if test "x$HW_FLUKE_DMM" = "xyes"; then fi AC_ARG_ENABLE(radioshack-dmm, AC_HELP_STRING([--enable-radioshack-dmm], - [Enable Fluke DMM support. [default=yes]]), + [Enable Radio Shack DMM support. [default=yes]]), [HW_RADIOSHACK_DMM="$enableval"], [HW_RADIOSHACK_DMM=yes]) AM_CONDITIONAL(HW_RADIOSHACK_DMM, test x$HW_RADIOSHACK_DMM = xyes) diff --git a/hardware/radioshack-dmm/api.c b/hardware/radioshack-dmm/api.c index ecb4ad5c..912a3a9d 100644 --- a/hardware/radioshack-dmm/api.c +++ b/hardware/radioshack-dmm/api.c @@ -19,7 +19,7 @@ */ #include -#include "libsigrok/libsigrok.h" +#include "libsigrok.h" #include "libsigrok-internal.h" #include "config.h" #include "radioshack-dmm.h" diff --git a/hardware/radioshack-dmm/radioshack-dmm.c b/hardware/radioshack-dmm/radioshack-dmm.c deleted file mode 100644 index e69de29b..00000000 diff --git a/hardware/radioshack-dmm/radioshack.c b/hardware/radioshack-dmm/radioshack.c index 078160e0..9e05bef7 100644 --- a/hardware/radioshack-dmm/radioshack.c +++ b/hardware/radioshack-dmm/radioshack.c @@ -403,4 +403,3 @@ SR_PRIV int radioshack_receive_data(int fd, int revents, void *cb_data) return TRUE; } -