libsigrok: Fix #includes.

In the lib, we should only #include "sigrok.h" or "sigrok-internal.h",
but not the (possibly installed and thus different/older versions) via
<sigrok.h> or <sigrok-internal.h>.

Frontends should of course use <sigrok.h> and <sigrok-internal.h>.

diff --git a/Makefile.am b/Makefile.am
index c01801e40fd72ee906162a09ac3122629b749d9e..b9e0c0745b6cf1778b619efcaca1e78a09687732 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -17,7 +17,7 @@
 ## along with this program.  If not, see <http://www.gnu.org/licenses/>.
 ##
 
-AM_CPPFLAGS = -I $(top_srcdir)/libsigrok
+AM_CPPFLAGS = -I$(top_srcdir)/libsigrok
 
 SUBDIRS = hardware input output firmware
 

diff --git a/backend.c b/backend.c
index fc914e18cd47710ee193f0d6045b032f9a2e6009..0e22e6ed00a5eddff32bf8ad70ca1b3edecc1ea9 100644 (file)
--- a/backend.c
+++ b/backend.c
@@ -18,8 +18,8 @@
  */
 
 #include <glib.h>
-#include <sigrok.h>
-#include <sigrok-internal.h>
+#include "sigrok.h"
+#include "sigrok-internal.h"
 
 /**
  * Initialize libsigrok.

diff --git a/datastore.c b/datastore.c
index fccb4d5b0fd73bf2026f4d43f58019e8d4b2f0a9..3d72c99d794b904e6fa28e9ed4199c8e4caf489c 100644 (file)
--- a/datastore.c
+++ b/datastore.c
@@ -21,8 +21,8 @@
 #include <stdint.h>
 #include <string.h>
 #include <glib.h>
-#include <sigrok.h>
-#include <sigrok-internal.h>
+#include "sigrok.h"
+#include "sigrok-internal.h"
 
 static gpointer new_chunk(struct sr_datastore **ds);
 

diff --git a/device.c b/device.c
index 5596c173b99c7b5d8356698fc549b627c761b875..b18fcacd3f9cbef0eb287f39d9c918dd44d8f715 100644 (file)
--- a/device.c
+++ b/device.c
@@ -19,8 +19,8 @@
 
 #include <stdio.h>
 #include <glib.h>
-#include <sigrok.h>
-#include <sigrok-internal.h>
+#include "sigrok.h"
+#include "sigrok-internal.h"
 
 static GSList *devices = NULL;
 

diff --git a/filter.c b/filter.c
index 2da2755b0e063d4d87320d6b18e50b7f6abcc6f0..fef7005239c58608614fcea49036bfd708551b7f 100644 (file)
--- a/filter.c
+++ b/filter.c
@@ -20,7 +20,7 @@
 #include <stdlib.h>
 #include <stdint.h>
 #include <string.h>
-#include <sigrok.h>
+#include "sigrok.h"
 #include "sigrok-internal.h"
 
 /**

diff --git a/hardware/alsa/alsa.c b/hardware/alsa/alsa.c
index d61246e4388721bc95b535cef0759752dd90c59d..5d0214bdfcc2637bd87c3a2470809f99dd0f89e3 100644 (file)
--- a/hardware/alsa/alsa.c
+++ b/hardware/alsa/alsa.c
@@ -22,9 +22,9 @@
 #include <stdlib.h>
 #include <unistd.h>
 #include <string.h>
-#include <sigrok.h>
-#include <sigrok-internal.h>
 #include <alsa/asoundlib.h>
+#include "sigrok.h"
+#include "sigrok-internal.h"
 
 #define NUM_PROBES 2
 #define SAMPLE_WIDTH 16

diff --git a/hardware/asix-sigma/asix-sigma.c b/hardware/asix-sigma/asix-sigma.c
index e6a109c638b3faa81f7fe5d8b0ead3025fe94318..b6b914ce30a72064965d9f68b63b25d0b76b9b06 100644 (file)
--- a/hardware/asix-sigma/asix-sigma.c
+++ b/hardware/asix-sigma/asix-sigma.c
@@ -29,8 +29,8 @@
 #include <ftdi.h>
 #include <string.h>
 #include <zlib.h>
-#include <sigrok.h>
-#include <sigrok-internal.h>
+#include "sigrok.h"
+#include "sigrok-internal.h"
 #include "asix-sigma.h"
 
 #define USB_VENDOR                     0xa600

diff --git a/hardware/chronovu-la8/chronovu-la8.c b/hardware/chronovu-la8/chronovu-la8.c
index e63e3a5069a21178c2f1e44750a92ea200151f25..478df4853ff2e875c0bea2cea3a37733f8297944 100644 (file)
--- a/hardware/chronovu-la8/chronovu-la8.c
+++ b/hardware/chronovu-la8/chronovu-la8.c
@@ -21,8 +21,8 @@
 #include <ftdi.h>
 #include <glib.h>
 #include <string.h>
-#include <sigrok.h>
-#include <sigrok-internal.h>
+#include "sigrok.h"
+#include "sigrok-internal.h"
 
 #define USB_VENDOR_ID                  0x0403
 #define USB_PRODUCT_ID                 0x6001

diff --git a/hardware/common/ezusb.c b/hardware/common/ezusb.c
index 058a7a024dbf4271e9b7b04dc2b9ddcb856530b4..426af3ab6e3a27e88bb28cbe333d8f39814ab00c 100644 (file)
--- a/hardware/common/ezusb.c
+++ b/hardware/common/ezusb.c
@@ -21,8 +21,6 @@
  * Helper functions for the Cypress EZ-USB / FX2 series chips.
  */
 
-#include <sigrok.h>
-#include <sigrok-internal.h>
 #include <libusb.h>
 #include <glib.h>
 #include <glib/gstdio.h>
@@ -30,6 +28,8 @@
 #include <errno.h>
 #include <string.h>
 #include "config.h"
+#include "sigrok.h"
+#include "sigrok-internal.h"
 
 int ezusb_reset(struct libusb_device_handle *hdl, int set_clear)
 {

diff --git a/hardware/common/serial.c b/hardware/common/serial.c
index 1e03d4dfff1d0896f1d60c365d4f520929e95c75..80b6f22cd2a37e2be1edae8e1344956343397863 100644 (file)
--- a/hardware/common/serial.c
+++ b/hardware/common/serial.c
@@ -30,8 +30,8 @@
 #endif
 #include <stdlib.h>
 #include <glib.h>
-#include <sigrok.h>
-#include <sigrok-internal.h>
+#include "sigrok.h"
+#include "sigrok-internal.h"
 
 // FIXME: Must be moved, or rather passed as function argument.
 #ifdef _WIN32

diff --git a/hardware/demo/demo.c b/hardware/demo/demo.c
index 1492dadf3ad205032889bebd521505077791e040..9531d0b03f08fc943faf516b1ae2ade1fc78e931 100644 (file)
--- a/hardware/demo/demo.c
+++ b/hardware/demo/demo.c
@@ -22,14 +22,14 @@
 #include <stdlib.h>
 #include <unistd.h>
 #include <string.h>
-#include <sigrok.h>
-#include <sigrok-internal.h>
 #ifdef _WIN32
 #include <io.h>
 #include <fcntl.h>
 #define pipe(fds) _pipe(fds, 4096, _O_BINARY)
 #endif
 #include "config.h"
+#include "sigrok.h"
+#include "sigrok-internal.h"
 
 /* TODO: Number of probes should be configurable. */
 #define NUM_PROBES             8

diff --git a/hardware/link-mso19/link-mso19.c b/hardware/link-mso19/link-mso19.c
index 63b910318615002dfc653225232898ce5e50e464..83fb4db04233ca81c5010ff68338a11056ef4b25 100644 (file)
--- a/hardware/link-mso19/link-mso19.c
+++ b/hardware/link-mso19/link-mso19.c
@@ -26,9 +26,9 @@
 #include <inttypes.h>
 #include <glib.h>
 #include <libudev.h>
-#include <sigrok.h>
 #include <arpa/inet.h>
-#include <sigrok-internal.h>
+#include "sigrok.h"
+#include "sigrok-internal.h"
 #include "config.h"
 #include "link-mso19.h"
 

diff --git a/hardware/openbench-logic-sniffer/ols.c b/hardware/openbench-logic-sniffer/ols.c
index 2edb6acbb0aaf93b8ba5059aad28c05b70ba2e4d..4f78ba5b4c7f84063b588ff8b9f988f4b32b4725 100644 (file)
--- a/hardware/openbench-logic-sniffer/ols.c
+++ b/hardware/openbench-logic-sniffer/ols.c
@@ -38,8 +38,8 @@
 #include <arpa/inet.h>
 #endif
 #include <glib.h>
-#include <sigrok.h>
-#include <sigrok-internal.h>
+#include "sigrok.h"
+#include "sigrok-internal.h"
 #include "ols.h"
 
 #ifdef _WIN32

diff --git a/hardware/saleae-logic/saleae-logic.c b/hardware/saleae-logic/saleae-logic.c
index ed3ed092a9ec79d69c20c15c6c2121ea9c265d06..c8b3dfa3ec017a104b54cd3219aa39e1cbc1539f 100644 (file)
--- a/hardware/saleae-logic/saleae-logic.c
+++ b/hardware/saleae-logic/saleae-logic.c
@@ -24,8 +24,8 @@
 #include <inttypes.h>
 #include <glib.h>
 #include <libusb.h>
-#include <sigrok.h>
-#include <sigrok-internal.h>
+#include "sigrok.h"
+#include "sigrok-internal.h"
 #include "saleae-logic.h"
 
 static struct fx2_profile supported_fx2[] = {

diff --git a/hardware/saleae-logic/saleae-logic.h b/hardware/saleae-logic/saleae-logic.h
index 9ccd8a1a68491dd2cc630ef6f69a6e6c0ec87db0..1dfc39d9f562201ab01508e858a4aed0cbc5ba3a 100644 (file)
--- a/hardware/saleae-logic/saleae-logic.h
+++ b/hardware/saleae-logic/saleae-logic.h
@@ -17,7 +17,6 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-
 #ifndef SALEAE_LOGIC_H_
 #define SALEAE_LOGIC_H_
 
@@ -72,9 +71,6 @@ struct fx2_device {
         * on the session bus along with samples.
         */
        void *session_data;
-
 };
 
-
-
 #endif /* SALEAE_LOGIC_H_ */

diff --git a/hardware/zeroplus-logic-cube/gl_usb.c b/hardware/zeroplus-logic-cube/gl_usb.c
index 5fa7fd22182aaf29c290799b55374beaa301c111..3ba083264f44615abdae4d5c63566e61c9c98de5 100644 (file)
--- a/hardware/zeroplus-logic-cube/gl_usb.c
+++ b/hardware/zeroplus-logic-cube/gl_usb.c
@@ -31,7 +31,7 @@
 
 #include <libusb.h>
 #include <stdio.h>
-#include <sigrok-internal.h>
+#include "sigrok-internal.h"
 #include "gl_usb.h"
 
 #define CTRL_IN                (LIBUSB_REQUEST_TYPE_VENDOR | LIBUSB_ENDPOINT_IN | \

diff --git a/hardware/zeroplus-logic-cube/zeroplus.c b/hardware/zeroplus-logic-cube/zeroplus.c
index 749925f9e03ef1a79a794516c011bcf407bd6c40..75cd772f110fab40af032f36bc207372f62727de 100644 (file)
--- a/hardware/zeroplus-logic-cube/zeroplus.c
+++ b/hardware/zeroplus-logic-cube/zeroplus.c
@@ -24,8 +24,8 @@
 #include <inttypes.h>
 #include <glib.h>
 #include <libusb.h>
-#include <sigrok.h>
-#include <sigrok-internal.h>
+#include "sigrok.h"
+#include "sigrok-internal.h"
 #include "analyzer.h"
 
 #define USB_VENDOR                     0x0c12

diff --git a/hwplugin.c b/hwplugin.c
index 0ffd6f2eeae77e17bbf0d86046b42771917d6a30..60a121c9a5dc5a67612b87a4034ab22bcf1209d4 100644 (file)
--- a/hwplugin.c
+++ b/hwplugin.c
@@ -24,8 +24,8 @@
 #include <dirent.h>
 #include <string.h>
 #include <glib.h>
-#include <sigrok.h>
-#include <sigrok-internal.h>
+#include "sigrok.h"
+#include "sigrok-internal.h"
 
 /* The list of loaded plugins lives here. */
 static GSList *plugins;

diff --git a/log.c b/log.c
index 02eb9aa31ad321029f687f996e564768d8fd412d..844f58b2de47fd4483ee3d0840f62bfd7b1f8fca 100644 (file)
--- a/log.c
+++ b/log.c
@@ -20,8 +20,8 @@
 
 #include <stdarg.h>
 #include <stdio.h>
-#include <sigrok.h>
-#include <sigrok-internal.h>
+#include "sigrok.h"
+#include "sigrok-internal.h"
 
 static int sr_loglevel = SR_LOG_WARN; /* Show errors+warnings per default. */
 

diff --git a/session.c b/session.c
index 8f8edcce0eddd1c91f178b46f42e2ec7b63c9948..caa794a142377ca75953ba032ee53dd08984ba3c 100644 (file)
--- a/session.c
+++ b/session.c
@@ -23,8 +23,8 @@
 #include <unistd.h>
 #include <string.h>
 #include <glib.h>
-#include <sigrok.h>
-#include <sigrok-internal.h>
+#include "sigrok.h"
+#include "sigrok-internal.h"
 
 /* demo.c */
 extern GIOChannel channels[2];

diff --git a/session_driver.c b/session_driver.c
index 689e1da7d27caab9c7f42c854f62fc5f80e9ee54..fe9765edee82039ed397fec330dae94963f57281 100644 (file)
--- a/session_driver.c
+++ b/session_driver.c
@@ -23,8 +23,8 @@
 #include <unistd.h>
 #include <sys/time.h>
 #include <zip.h>
-#include <sigrok.h>
-#include <sigrok-internal.h>
+#include "sigrok.h"
+#include "sigrok-internal.h"
 
 /* size of payloads sent across the session bus */
 #define CHUNKSIZE 4096

diff --git a/session_file.c b/session_file.c
index ec98065d2c8f052a89630eb1ddb7ec6344da50a4..637e647edc7e5dcc80ac10d5714377ff2430dcae 100644 (file)
--- a/session_file.c
+++ b/session_file.c
@@ -24,8 +24,8 @@
 #include <zip.h>
 #include <glib.h>
 #include <glib/gstdio.h>
-#include <sigrok.h>
-#include <sigrok-internal.h>
+#include "sigrok.h"
+#include "sigrok-internal.h"
 
 extern struct sr_session *session;
 extern struct sr_device_plugin session_driver;

diff --git a/strutil.c b/strutil.c
index b26caea0190c3510931eabdb6ef0f545d0ac7263..ef6d9633a28ba84be38df1ebd7d12bb93e2c5068 100644 (file)
--- a/strutil.c
+++ b/strutil.c
@@ -21,8 +21,8 @@
 #include <stdint.h>
 #include <stdlib.h>
 #include <string.h>
-#include <sigrok.h>
-#include <sigrok-internal.h>
+#include "sigrok.h"
+#include "sigrok-internal.h"
 
 /**
  * Convert a numeric samplerate value to its "natural" string representation.