radioshack-dmm: build fixes

diff --git a/configure.ac b/configure.ac
index bc51a1e7a7281baf9e90dceb2d98871b74c249f4..857d0ead47a024a9a26eb70b165366be77f3ff07 100644 (file)
--- 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 ecb4ad5c9ff1b51982e5ca5ccb787660059c846f..912a3a9dc5b4dda2e37cc714e0b5440364ed54a0 100644 (file)
--- a/hardware/radioshack-dmm/api.c
+++ b/hardware/radioshack-dmm/api.c
@@ -19,7 +19,7 @@
  */
 
 #include <glib.h>
-#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 (file)
index e69de29..0000000

diff --git a/hardware/radioshack-dmm/radioshack.c b/hardware/radioshack-dmm/radioshack.c
index 078160e01aace910ca8a1f40ce595df5327632f0..9e05bef794f56b487767e9ed53446e7ff60f6eff 100644 (file)
--- 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;
 }
 
-