Build: Set local include directories in Makefile.am

Move the include flags for files in the source tree from
configure.ac to Makefile.am where they belong.  Also use
AM_CPPFLAGS instead of CFLAGS/CXXFLAGS to make sure the
files in the build/source tree are always picked up first.

Also, remove the include/libsigrok sub-directory from the
search path, thereby making the <libsigrok/> prefix mandatory
when building libsigrok itself.  This matches the convention
already imposed on users of the library.

diff --git a/Makefile.am b/Makefile.am
index 3e2388982bd03ab9e70d3529040dbf92ad975161..c0a228656e2f2a1c190ea2808e64d7465c125163 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -20,7 +20,10 @@
 
 ACLOCAL_AMFLAGS = -I autostuff
 
 
 ACLOCAL_AMFLAGS = -I autostuff
 

-AM_CPPFLAGS = -I$(srcdir)/src -DFIRMWARE_DIR='"$(FIRMWARE_DIR)"'
+local_includes = -Iinclude -I$(srcdir)/include -I$(srcdir)/src
+local_includes += -Ibindings/cxx/include -I${srcdir}/bindings/cxx/include -Ibindings/cxx
+
+AM_CPPFLAGS = $(local_includes) -DFIRMWARE_DIR='"$(FIRMWARE_DIR)"'

 
 lib_LTLIBRARIES = libsigrok.la
 
 
 lib_LTLIBRARIES = libsigrok.la
 


@@ -585,7 +588,7 @@ $(JDOC): bindings/swig/doc.py $(CPPXMLDOC)
 $(JCXX): $(JSWG) $(JDOC) bindings/swig/classes.i $(library_include_HEADERS)
        $(AM_V_at)make java-clean
        $(AM_V_GEN)swig -c++ -java -package org.sigrok.core.classes \
 $(JCXX): $(JSWG) $(JDOC) bindings/swig/classes.i $(library_include_HEADERS)
        $(AM_V_at)make java-clean
        $(AM_V_GEN)swig -c++ -java -package org.sigrok.core.classes \

-               -I$(srcdir)/include -I$(srcdir)/bindings/cxx/include -I$(srcdir) -I$(JCLS) -Ibindings/cxx/include -outdir $(JCLS) -o $@ $<
+               $(local_includes) -I$(JCLS) -I. -I$(srcdir) -outdir $(JCLS) -o $@ $<

 
 $(JJAR): $(JCXX)
        $(AM_V_GEN)$(JAVAC) -sourcepath $(JDIR) -d $(JDIR) $(JSRC)
 
 $(JJAR): $(JCXX)
        $(AM_V_GEN)$(JAVAC) -sourcepath $(JDIR) -d $(JDIR) $(JSRC)

diff --git a/configure.ac b/configure.ac
index ff9c93958177b3580b8b326d7ead27b86261c456..45ee40cf00e0de0d5b0aa72e8359fcf7cadf0b97 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -456,8 +456,8 @@ esac
 
 AC_SUBST(SR_PKGLIBS)
 
 
 AC_SUBST(SR_PKGLIBS)
 

-CFLAGS="$CFLAGS -Iinclude/libsigrok -I${srcdir}/include/libsigrok $LIB_CFLAGS"
-CXXFLAGS="$CXXFLAGS -Iinclude/libsigrok -I${srcdir}/include -Ibindings/cxx -Ibindings/cxx/include/libsigrokcxx -I${srcdir}/bindings/cxx/include $LIB_CFLAGS"
+CFLAGS="$CFLAGS $LIB_CFLAGS"
+CXXFLAGS="$CXXFLAGS $LIB_CFLAGS"

 
 # Find Java compiler and JNI includes for Java bindings.
 AC_CHECK_PROG([HAVE_JAVAC], [javac], [yes], [no])
 
 # Find Java compiler and JNI includes for Java bindings.
 AC_CHECK_PROG([HAVE_JAVAC], [javac], [yes], [no])

diff --git a/include/libsigrok/libsigrok.h b/include/libsigrok/libsigrok.h
index 085ac06173b18f7bd83e513d8caf52d073fc4560..0e35957f05ee76a95868136e92ed6069c101f2db 100644 (file)
--- a/include/libsigrok/libsigrok.h
+++ b/include/libsigrok/libsigrok.h
@@ -1099,8 +1099,8 @@ struct sr_serial_port {
        char *description;
 };
 
        char *description;
 };
 

-#include "proto.h"
-#include "version.h"
+#include <libsigrok/proto.h>
+#include <libsigrok/version.h>

 
 #ifdef __cplusplus
 }
 
 #ifdef __cplusplus
 }

diff --git a/src/analog.c b/src/analog.c
index 10c4c1c7ac25ff145dbab628d14135e2a33753a2..a0a48de9754115647f90c0ea844683aa5a5db719 100644 (file)
--- a/src/analog.c
+++ b/src/analog.c
@@ -21,7 +21,7 @@
 #include <stdint.h>
 #include <string.h>
 #include <ctype.h>
 #include <stdint.h>
 #include <string.h>
 #include <ctype.h>

-#include "libsigrok.h"
+#include <libsigrok/libsigrok.h>

 #include "libsigrok-internal.h"
 
 /** @cond PRIVATE */
 #include "libsigrok-internal.h"
 
 /** @cond PRIVATE */

diff --git a/src/backend.c b/src/backend.c
index 4889358a9d6fd9e06fbe6446f76df060e0f429cc..baf1f8d97fe4c037d2feaa45327c9acbf530483e 100644 (file)
--- a/src/backend.c
+++ b/src/backend.c
@@ -20,7 +20,7 @@
 
 #include <glib.h>
 #include "config.h" /* Needed for HAVE_LIBUSB_1_0 and others. */
 
 #include <glib.h>
 #include "config.h" /* Needed for HAVE_LIBUSB_1_0 and others. */

-#include "libsigrok.h"
+#include <libsigrok/libsigrok.h>

 #include "libsigrok-internal.h"
 
 /** @cond PRIVATE */
 #include "libsigrok-internal.h"
 
 /** @cond PRIVATE */

diff --git a/src/device.c b/src/device.c
index 01f413486357d546817c05c7bffc27974c031d13..fe3e231616e67c13989be8340cb74dcddd7195ae 100644 (file)
--- a/src/device.c
+++ b/src/device.c
@@ -20,7 +20,7 @@
 #include <stdio.h>
 #include <glib.h>
 #include "config.h" /* Needed for HAVE_LIBUSB_1_0 and others. */
 #include <stdio.h>
 #include <glib.h>
 #include "config.h" /* Needed for HAVE_LIBUSB_1_0 and others. */

-#include "libsigrok.h"
+#include <libsigrok/libsigrok.h>

 #include "libsigrok-internal.h"
 
 /** @cond PRIVATE */
 #include "libsigrok-internal.h"
 
 /** @cond PRIVATE */

diff --git a/src/dmm/bm25x.c b/src/dmm/bm25x.c
index 67c2d04f6940b626c9370e35aecb9cd90ef05b00..1e231a905dcd9a046971ee71e95401209bbe1107 100644 (file)
--- a/src/dmm/bm25x.c
+++ b/src/dmm/bm25x.c
@@ -24,7 +24,7 @@
  */
 
 #include <math.h>
  */
 
 #include <math.h>

-#include "libsigrok.h"
+#include <libsigrok/libsigrok.h>

 #include "libsigrok-internal.h"
 
 #define LOG_PREFIX "brymen-bm25x"
 #include "libsigrok-internal.h"
 
 #define LOG_PREFIX "brymen-bm25x"

diff --git a/src/dmm/es519xx.c b/src/dmm/es519xx.c
index 075587ce40fcc37fcde278f84ec7976ea5a94ee7..2385a2208fa181208f7cec0495c15fa28ea427b5 100644 (file)
--- a/src/dmm/es519xx.c
+++ b/src/dmm/es519xx.c
@@ -29,7 +29,7 @@
 #include <ctype.h>
 #include <math.h>
 #include <glib.h>
 #include <ctype.h>
 #include <math.h>
 #include <glib.h>

-#include "libsigrok.h"
+#include <libsigrok/libsigrok.h>

 #include "libsigrok-internal.h"
 
 #define LOG_PREFIX "es519xx"
 #include "libsigrok-internal.h"
 
 #define LOG_PREFIX "es519xx"

diff --git a/src/dmm/fs9721.c b/src/dmm/fs9721.c
index aa7746ef3be30d22c8d5f190784606ca11308a2e..6bc151a78b2d999c104f3527ec99def4a77f92af 100644 (file)
--- a/src/dmm/fs9721.c
+++ b/src/dmm/fs9721.c
@@ -35,7 +35,7 @@
 #include <ctype.h>
 #include <math.h>
 #include <glib.h>
 #include <ctype.h>
 #include <math.h>
 #include <glib.h>

-#include "libsigrok.h"
+#include <libsigrok/libsigrok.h>

 #include "libsigrok-internal.h"
 
 #define LOG_PREFIX "fs9721"
 #include "libsigrok-internal.h"
 
 #define LOG_PREFIX "fs9721"

diff --git a/src/dmm/fs9922.c b/src/dmm/fs9922.c
index caaa51c708d46b418245ff62a286afe292f3d675..698e1184dd602d4b69b7c3405433fb97f33e8064 100644 (file)
--- a/src/dmm/fs9922.c
+++ b/src/dmm/fs9922.c
@@ -26,7 +26,7 @@
 #include <ctype.h>
 #include <math.h>
 #include <glib.h>
 #include <ctype.h>
 #include <math.h>
 #include <glib.h>

-#include "libsigrok.h"
+#include <libsigrok/libsigrok.h>

 #include "libsigrok-internal.h"
 
 #define LOG_PREFIX "fs9922"
 #include "libsigrok-internal.h"
 
 #define LOG_PREFIX "fs9922"

diff --git a/src/dmm/m2110.c b/src/dmm/m2110.c
index 5863cef1e706e31d4923a51d02754f65c3c1cc32..8f094a5c8144196e243214118d24f60f0ccad50f 100644 (file)
--- a/src/dmm/m2110.c
+++ b/src/dmm/m2110.c
@@ -28,7 +28,7 @@
 #include <string.h>
 #include <math.h>
 #include <glib.h>
 #include <string.h>
 #include <math.h>
 #include <glib.h>

-#include "libsigrok.h"
+#include <libsigrok/libsigrok.h>

 #include "libsigrok-internal.h"
 
 #define LOG_PREFIX "m2110"
 #include "libsigrok-internal.h"
 
 #define LOG_PREFIX "m2110"

diff --git a/src/dmm/metex14.c b/src/dmm/metex14.c
index e2d14ec34348992326c1d852983df56ff1b859f1..90278ffd21646e8eee5e4d833a58f10f2975a060 100644 (file)
--- a/src/dmm/metex14.c
+++ b/src/dmm/metex14.c
@@ -35,7 +35,7 @@
 #include <ctype.h>
 #include <math.h>
 #include <glib.h>
 #include <ctype.h>
 #include <math.h>
 #include <glib.h>

-#include "libsigrok.h"
+#include <libsigrok/libsigrok.h>

 #include "libsigrok-internal.h"
 
 #define LOG_PREFIX "metex14"
 #include "libsigrok-internal.h"
 
 #define LOG_PREFIX "metex14"

diff --git a/src/dmm/rs9lcd.c b/src/dmm/rs9lcd.c
index 539c2335e265931e328dae71d6fc8c452848a85a..44080604789eb79b83aaf0b0da3e96935f188e45 100644 (file)
--- a/src/dmm/rs9lcd.c
+++ b/src/dmm/rs9lcd.c
@@ -32,7 +32,7 @@
 #include <ctype.h>
 #include <math.h>
 #include <glib.h>
 #include <ctype.h>
 #include <math.h>
 #include <glib.h>

-#include "libsigrok.h"
+#include <libsigrok/libsigrok.h>

 #include "libsigrok-internal.h"
 
 #define LOG_PREFIX "rs9lcd"
 #include "libsigrok-internal.h"
 
 #define LOG_PREFIX "rs9lcd"

diff --git a/src/dmm/ut372.c b/src/dmm/ut372.c
index 2de3da3436fbb60e25b6de6f39240642caeed1b1..d2fd8bc9e8b5643d8996a87d62737b17af868836 100644 (file)
--- a/src/dmm/ut372.c
+++ b/src/dmm/ut372.c
@@ -25,7 +25,7 @@
 #include <stdlib.h>
 #include <stdint.h>
 #include <math.h>
 #include <stdlib.h>
 #include <stdint.h>
 #include <math.h>

-#include "libsigrok.h"
+#include <libsigrok/libsigrok.h>

 #include "libsigrok-internal.h"
 
 #define LOG_PREFIX "ut372"
 #include "libsigrok-internal.h"
 
 #define LOG_PREFIX "ut372"

diff --git a/src/dmm/ut71x.c b/src/dmm/ut71x.c
index ce23dccd690b9f236461bd42bea5fcdb4263c451..d519ecc4f0ad1c4dffd094cf0236552678440a65 100644 (file)
--- a/src/dmm/ut71x.c
+++ b/src/dmm/ut71x.c
@@ -28,7 +28,7 @@
 #include <ctype.h>
 #include <math.h>
 #include <glib.h>
 #include <ctype.h>
 #include <math.h>
 #include <glib.h>

-#include "libsigrok.h"
+#include <libsigrok/libsigrok.h>

 #include "libsigrok-internal.h"
 
 #define LOG_PREFIX "ut71x"
 #include "libsigrok-internal.h"
 
 #define LOG_PREFIX "ut71x"

diff --git a/src/dmm/vc870.c b/src/dmm/vc870.c
index 0c1de7853668effebf5504a9d4acede6c6efba8f..8b7f191f85c4fd8b7faffefca31cdefd2d5b9ee3 100644 (file)
--- a/src/dmm/vc870.c
+++ b/src/dmm/vc870.c
@@ -22,7 +22,7 @@
 #include <ctype.h>
 #include <math.h>
 #include <glib.h>
 #include <ctype.h>
 #include <math.h>
 #include <glib.h>

-#include "libsigrok.h"
+#include <libsigrok/libsigrok.h>

 #include "libsigrok-internal.h"
 
 #define LOG_PREFIX "vc870"
 #include "libsigrok-internal.h"
 
 #define LOG_PREFIX "vc870"

diff --git a/src/drivers.c b/src/drivers.c
index d37d55290c89545a08e24eb0c911062b5801bf76..15e1084269e254dd9e636b5ec4637b74fa041915 100644 (file)
--- a/src/drivers.c
+++ b/src/drivers.c
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 

-#include "libsigrok.h"
+#include <libsigrok/libsigrok.h>

 #include "libsigrok-internal.h"
 
 /** @cond PRIVATE */
 #include "libsigrok-internal.h"
 
 /** @cond PRIVATE */

diff --git a/src/error.c b/src/error.c
index 0d43abf16b544780c40105f62e5d6b8e391a3aab..0280449ea61137f477faba993935450f13a2bae9 100644 (file)
--- a/src/error.c
+++ b/src/error.c
@@ -18,7 +18,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 

-#include "libsigrok.h"
+#include <libsigrok/libsigrok.h>

 
 /**
  * @file
 
 /**
  * @file

diff --git a/src/ezusb.c b/src/ezusb.c
index 9f40d3b72179e5fd1b2a81afb1c077babc3b986f..465dab0360f4c72f3e6b601ad43c264aaac0ed91 100644 (file)
--- a/src/ezusb.c
+++ b/src/ezusb.c
@@ -27,7 +27,7 @@
 #include <stdio.h>
 #include <errno.h>
 #include <string.h>
 #include <stdio.h>
 #include <errno.h>
 #include <string.h>

-#include "libsigrok.h"
+#include <libsigrok/libsigrok.h>

 #include "libsigrok-internal.h"
 
 #define LOG_PREFIX "ezusb"
 #include "libsigrok-internal.h"
 
 #define LOG_PREFIX "ezusb"

diff --git a/src/fallback.c b/src/fallback.c
index d66c4b8d2406b5dba2457a1542d84db6bf6a0343..677676994766cedd1a743984d682705b655f3254 100644 (file)
--- a/src/fallback.c
+++ b/src/fallback.c
@@ -19,7 +19,7 @@
 
 #include <glib.h>
 #include "config.h"
 
 #include <glib.h>
 #include "config.h"

-#include "libsigrok.h"
+#include <libsigrok/libsigrok.h>

 
 #ifndef HAVE_LIBSERIALPORT
 
 
 #ifndef HAVE_LIBSERIALPORT
 

diff --git a/src/hardware/agilent-dmm/api.c b/src/hardware/agilent-dmm/api.c
index cefea4f29a47bbe03298122d1c31059224c76279..273c7f06c5290a8db26929398c811cc7fc75286a 100644 (file)
--- a/src/hardware/agilent-dmm/api.c
+++ b/src/hardware/agilent-dmm/api.c
@@ -22,7 +22,7 @@
 #include <sys/stat.h>
 #include <fcntl.h>
 #include <string.h>
 #include <sys/stat.h>
 #include <fcntl.h>
 #include <string.h>

-#include "libsigrok.h"
+#include <libsigrok/libsigrok.h>

 #include "libsigrok-internal.h"
 #include "agilent-dmm.h"
 
 #include "libsigrok-internal.h"
 #include "agilent-dmm.h"
 

diff --git a/src/hardware/agilent-dmm/sched.c b/src/hardware/agilent-dmm/sched.c
index 1fe962f575aa29682c8f810dc3f0cc602b9b907c..2db3b74877f6af8685a2b352f1ae3389054eb27b 100644 (file)
--- a/src/hardware/agilent-dmm/sched.c
+++ b/src/hardware/agilent-dmm/sched.c
@@ -21,7 +21,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <math.h>
 #include <stdlib.h>
 #include <string.h>
 #include <math.h>

-#include "libsigrok.h"
+#include <libsigrok/libsigrok.h>

 #include "libsigrok-internal.h"
 #include "agilent-dmm.h"
 
 #include "libsigrok-internal.h"
 #include "agilent-dmm.h"
 

diff --git a/src/hardware/appa-55ii/protocol.h b/src/hardware/appa-55ii/protocol.h
index fa3c247694a4c2b9b680b18e84c2fbc4c250fdca..4e8b1292ee862132cbaf9f1e31baf6d3c3d9ddf3 100644 (file)
--- a/src/hardware/appa-55ii/protocol.h
+++ b/src/hardware/appa-55ii/protocol.h
@@ -22,7 +22,7 @@
 
 #include <stdint.h>
 #include <glib.h>
 
 #include <stdint.h>
 #include <glib.h>

-#include "libsigrok.h"
+#include <libsigrok/libsigrok.h>

 #include "libsigrok-internal.h"
 
 #define LOG_PREFIX "appa-55ii"
 #include "libsigrok-internal.h"
 
 #define LOG_PREFIX "appa-55ii"

diff --git a/src/hardware/asix-sigma/asix-sigma.c b/src/hardware/asix-sigma/asix-sigma.c
index 0a2ec990ac38d47467715d015b9cab1d3c09366d..eaade4bf8077ea9081c619867c1092fdfffba575 100644 (file)
--- a/src/hardware/asix-sigma/asix-sigma.c
+++ b/src/hardware/asix-sigma/asix-sigma.c
@@ -28,7 +28,7 @@
 #include <ftdi.h>
 #include <string.h>
 #include <unistd.h>
 #include <ftdi.h>
 #include <string.h>
 #include <unistd.h>

-#include "libsigrok.h"
+#include <libsigrok/libsigrok.h>

 #include "libsigrok-internal.h"
 #include "asix-sigma.h"
 
 #include "libsigrok-internal.h"
 #include "asix-sigma.h"
 

diff --git a/src/hardware/atten-pps3xxx/protocol.h b/src/hardware/atten-pps3xxx/protocol.h
index 01983d3bdf2cbac3cd7984709902b47096971103..633c0a20d39835f7beb3be79b430ba92bc3b98a9 100644 (file)
--- a/src/hardware/atten-pps3xxx/protocol.h
+++ b/src/hardware/atten-pps3xxx/protocol.h
@@ -22,7 +22,7 @@
 
 #include <stdint.h>
 #include <glib.h>
 
 #include <stdint.h>
 #include <glib.h>

-#include "libsigrok.h"
+#include <libsigrok/libsigrok.h>

 #include "libsigrok-internal.h"
 
 #define LOG_PREFIX "atten-pps3xxx"
 #include "libsigrok-internal.h"
 
 #define LOG_PREFIX "atten-pps3xxx"

diff --git a/src/hardware/baylibre-acme/gpio.c b/src/hardware/baylibre-acme/gpio.c
index fb5d298c7e3b018f9730daedb4c3b0e08c277728..bb6c54d56fff3074fe1387cf645ba4da2e138ff2 100644 (file)
--- a/src/hardware/baylibre-acme/gpio.c
+++ b/src/hardware/baylibre-acme/gpio.c
@@ -23,7 +23,7 @@
 #include <fcntl.h>
 #include <errno.h>
 #include <string.h>
 #include <fcntl.h>
 #include <errno.h>
 #include <string.h>

-#include "libsigrok.h"
+#include <libsigrok/libsigrok.h>

 #include "libsigrok-internal.h"
 #include "gpio.h"
 
 #include "libsigrok-internal.h"
 #include "gpio.h"
 

diff --git a/src/hardware/baylibre-acme/protocol.h b/src/hardware/baylibre-acme/protocol.h
index a3f4452c12e1d67ae2ce07fdd55e904c133d1985..9410e114fa0ec5fd0f7644e00dc497fcb4d86e10 100644 (file)
--- a/src/hardware/baylibre-acme/protocol.h
+++ b/src/hardware/baylibre-acme/protocol.h
@@ -23,7 +23,7 @@
 #include <stdint.h>
 #include <glib.h>
 #include <unistd.h>
 #include <stdint.h>
 #include <glib.h>
 #include <unistd.h>

-#include "libsigrok.h"
+#include <libsigrok/libsigrok.h>

 #include "libsigrok-internal.h"
 
 #define LOG_PREFIX "baylibre-acme"
 #include "libsigrok-internal.h"
 
 #define LOG_PREFIX "baylibre-acme"

diff --git a/src/hardware/beaglelogic/protocol.h b/src/hardware/beaglelogic/protocol.h
index 90fad482e56b896c7f6d946f6e3f6703bbb1d133..75e74725f86c221902b05b6e17e4decf3af771a8 100644 (file)
--- a/src/hardware/beaglelogic/protocol.h
+++ b/src/hardware/beaglelogic/protocol.h
@@ -22,7 +22,7 @@
 
 #include <stdint.h>
 #include <glib.h>
 
 #include <stdint.h>
 #include <glib.h>

-#include "libsigrok.h"
+#include <libsigrok/libsigrok.h>

 #include "libsigrok-internal.h"
 
 #define LOG_PREFIX "beaglelogic"
 #include "libsigrok-internal.h"
 
 #define LOG_PREFIX "beaglelogic"

diff --git a/src/hardware/brymen-bm86x/protocol.h b/src/hardware/brymen-bm86x/protocol.h
index 57af1552217dbdc79cff2d41f224991994f96bda..6e33e8bd80016eaa6f460d4edcfe29f69db6182a 100644 (file)
--- a/src/hardware/brymen-bm86x/protocol.h
+++ b/src/hardware/brymen-bm86x/protocol.h
@@ -22,7 +22,7 @@
 
 #include <stdint.h>
 #include <glib.h>
 
 #include <stdint.h>
 #include <glib.h>

-#include "libsigrok.h"
+#include <libsigrok/libsigrok.h>

 #include "libsigrok-internal.h"
 
 #define LOG_PREFIX "brymen-bm86x"
 #include "libsigrok-internal.h"
 
 #define LOG_PREFIX "brymen-bm86x"

diff --git a/src/hardware/brymen-dmm/protocol.h b/src/hardware/brymen-dmm/protocol.h
index 7c9aaae6cd0710b8c3f3d41823eeb159243eeb5a..3a695b4471f65ddfda9e1b898a74d153dd0289f9 100644 (file)
--- a/src/hardware/brymen-dmm/protocol.h
+++ b/src/hardware/brymen-dmm/protocol.h
@@ -25,7 +25,7 @@
 #include <stdlib.h>
 #include <math.h>
 #include <glib.h>
 #include <stdlib.h>
 #include <math.h>
 #include <glib.h>

-#include "libsigrok.h"
+#include <libsigrok/libsigrok.h>

 #include "libsigrok-internal.h"
 
 #define LOG_PREFIX "brymen-dmm"
 #include "libsigrok-internal.h"
 
 #define LOG_PREFIX "brymen-dmm"

diff --git a/src/hardware/cem-dt-885x/protocol.h b/src/hardware/cem-dt-885x/protocol.h
index 1f0e191b0d1d9468940ec9e9ec27e9d343790a5f..69afacaefc32471a7d47880aeac7f661800284aa 100644 (file)
--- a/src/hardware/cem-dt-885x/protocol.h
+++ b/src/hardware/cem-dt-885x/protocol.h
@@ -22,7 +22,7 @@
 
 #include <stdint.h>
 #include <glib.h>
 
 #include <stdint.h>
 #include <glib.h>

-#include "libsigrok.h"
+#include <libsigrok/libsigrok.h>

 #include "libsigrok-internal.h"
 
 #define LOG_PREFIX "cem-dt-885x"
 #include "libsigrok-internal.h"
 
 #define LOG_PREFIX "cem-dt-885x"

diff --git a/src/hardware/center-3xx/protocol.h b/src/hardware/center-3xx/protocol.h
index c920f32a3352e1e61edf1c4ded7be4318df07345..8ff5d2cc801c35fd521ad40dd512dd90a0af62d3 100644 (file)
--- a/src/hardware/center-3xx/protocol.h
+++ b/src/hardware/center-3xx/protocol.h
@@ -26,7 +26,7 @@
 #include <ctype.h>
 #include <math.h>
 #include <glib.h>
 #include <ctype.h>
 #include <math.h>
 #include <glib.h>

-#include "libsigrok.h"
+#include <libsigrok/libsigrok.h>

 #include "libsigrok-internal.h"
 
 #define LOG_PREFIX "center-3xx"
 #include "libsigrok-internal.h"
 
 #define LOG_PREFIX "center-3xx"

diff --git a/src/hardware/chronovu-la/protocol.h b/src/hardware/chronovu-la/protocol.h
index c74feaa2c2cafd51b0e317eda5accad3440f60d3..be7e64a660be2b9636e6822b8da2271508742041 100644 (file)
--- a/src/hardware/chronovu-la/protocol.h
+++ b/src/hardware/chronovu-la/protocol.h
@@ -25,7 +25,7 @@
 #include <ftdi.h>
 #include <stdint.h>
 #include <string.h>
 #include <ftdi.h>
 #include <stdint.h>
 #include <string.h>

-#include "libsigrok.h"
+#include <libsigrok/libsigrok.h>

 #include "libsigrok-internal.h"
 
 #define LOG_PREFIX "la8/la16"
 #include "libsigrok-internal.h"
 
 #define LOG_PREFIX "la8/la16"

diff --git a/src/hardware/colead-slm/api.c b/src/hardware/colead-slm/api.c
index fe697277c0c8df4003b352b1b0b6bcbbc7d31d2a..0e2c9198fe16165ad05b9fdb928a0702d7db8589 100644 (file)
--- a/src/hardware/colead-slm/api.c
+++ b/src/hardware/colead-slm/api.c
@@ -22,7 +22,7 @@
 #include <sys/stat.h>
 #include <fcntl.h>
 #include <string.h>
 #include <sys/stat.h>
 #include <fcntl.h>
 #include <string.h>

-#include "libsigrok.h"
+#include <libsigrok/libsigrok.h>

 #include "libsigrok-internal.h"
 #include "protocol.h"
 
 #include "libsigrok-internal.h"
 #include "protocol.h"
 

diff --git a/src/hardware/colead-slm/protocol.c b/src/hardware/colead-slm/protocol.c
index 9a7c9fd0d1b6117652ad2fea8e7553e988bde2c2..f29d1bb95570c35764aaff411e6cebd8add92ea2 100644 (file)
--- a/src/hardware/colead-slm/protocol.c
+++ b/src/hardware/colead-slm/protocol.c
@@ -20,7 +20,7 @@
 #include <stdlib.h>
 #include <glib.h>
 #include <string.h>
 #include <stdlib.h>
 #include <glib.h>
 #include <string.h>

-#include "libsigrok.h"
+#include <libsigrok/libsigrok.h>

 #include "libsigrok-internal.h"
 #include "protocol.h"
 
 #include "libsigrok-internal.h"
 #include "protocol.h"
 

diff --git a/src/hardware/colead-slm/protocol.h b/src/hardware/colead-slm/protocol.h
index 8942ac8558863a1dd5d94169c0a4c7836ded1f9c..4cc49974a2682e608591ee3299c69e91236d386c 100644 (file)
--- a/src/hardware/colead-slm/protocol.h
+++ b/src/hardware/colead-slm/protocol.h
@@ -21,7 +21,7 @@
 #define LIBSIGROK_HARDWARE_COLEAD_SLM_PROTOCOL_H
 
 #include <stdint.h>
 #define LIBSIGROK_HARDWARE_COLEAD_SLM_PROTOCOL_H
 
 #include <stdint.h>

-#include "libsigrok.h"
+#include <libsigrok/libsigrok.h>

 #include "libsigrok-internal.h"
 
 #define LOG_PREFIX "colead-slm"
 #include "libsigrok-internal.h"
 
 #define LOG_PREFIX "colead-slm"

diff --git a/src/hardware/conrad-digi-35-cpu/protocol.h b/src/hardware/conrad-digi-35-cpu/protocol.h
index 1c3885a4bf4f096b5f1af270e10951c19695a73d..340cc23bee01daa17b260a4976a3d55dc227515f 100644 (file)
--- a/src/hardware/conrad-digi-35-cpu/protocol.h
+++ b/src/hardware/conrad-digi-35-cpu/protocol.h
@@ -29,7 +29,7 @@
 #include <stdint.h>
 #include <string.h>
 #include <glib.h>
 #include <stdint.h>
 #include <string.h>
 #include <glib.h>

-#include "libsigrok.h"
+#include <libsigrok/libsigrok.h>

 #include "libsigrok-internal.h"
 
 #define LOG_PREFIX "conrad-digi-35-cpu"
 #include "libsigrok-internal.h"
 
 #define LOG_PREFIX "conrad-digi-35-cpu"

diff --git a/src/hardware/demo/demo.c b/src/hardware/demo/demo.c
index 920c1e4d6c93b33d79b0a1021d6e3d64373d8c98..bdf4185d5ca66168b612f1c8686293ad3630975e 100644 (file)
--- a/src/hardware/demo/demo.c
+++ b/src/hardware/demo/demo.c
@@ -30,7 +30,7 @@
 #include <fcntl.h>
 #define pipe(fds) _pipe(fds, 4096, _O_BINARY)
 #endif
 #include <fcntl.h>
 #define pipe(fds) _pipe(fds, 4096, _O_BINARY)
 #endif

-#include "libsigrok.h"
+#include <libsigrok/libsigrok.h>

 #include "libsigrok-internal.h"
 
 #define LOG_PREFIX "demo"
 #include "libsigrok-internal.h"
 
 #define LOG_PREFIX "demo"

diff --git a/src/hardware/deree-de5000/api.c b/src/hardware/deree-de5000/api.c
index 33e38881232b0be03c60039009492ecf6ed204eb..fdf0bc3ede1a7d89c1339ec3a03ac2f6df7917b2 100644 (file)
--- a/src/hardware/deree-de5000/api.c
+++ b/src/hardware/deree-de5000/api.c
@@ -21,7 +21,7 @@
 #include <string.h>
 #include <math.h>
 #include <glib.h>
 #include <string.h>
 #include <math.h>
 #include <glib.h>

-#include "libsigrok.h"
+#include <libsigrok/libsigrok.h>

 #include "libsigrok-internal.h"
 
 static void std_dev_attach(struct sr_dev_driver *di, struct sr_dev_inst *sdi)
 #include "libsigrok-internal.h"
 
 static void std_dev_attach(struct sr_dev_driver *di, struct sr_dev_inst *sdi)

diff --git a/src/hardware/fluke-dmm/api.c b/src/hardware/fluke-dmm/api.c
index 9c6c8a9437e885a2ed999ea01a2f758dc29b8dc9..47f598f22d5ed5b6f3cb6e677aff91ec77c60f7d 100644 (file)
--- a/src/hardware/fluke-dmm/api.c
+++ b/src/hardware/fluke-dmm/api.c
@@ -22,7 +22,7 @@
 #include <sys/stat.h>
 #include <fcntl.h>
 #include <string.h>
 #include <sys/stat.h>
 #include <fcntl.h>
 #include <string.h>

-#include "libsigrok.h"
+#include <libsigrok/libsigrok.h>

 #include "libsigrok-internal.h"
 #include "fluke-dmm.h"
 
 #include "libsigrok-internal.h"
 #include "fluke-dmm.h"
 

diff --git a/src/hardware/fluke-dmm/fluke.c b/src/hardware/fluke-dmm/fluke.c
index 159a4f9f291d1761e72c72cccbc2375c9f759103..7604afa9a473a41d01497385a2bbb8340ec19f8f 100644 (file)
--- a/src/hardware/fluke-dmm/fluke.c
+++ b/src/hardware/fluke-dmm/fluke.c
@@ -21,7 +21,7 @@
 #include <math.h>
 #include <string.h>
 #include <glib.h>
 #include <math.h>
 #include <string.h>
 #include <glib.h>

-#include "libsigrok.h"
+#include <libsigrok/libsigrok.h>

 #include "libsigrok-internal.h"
 #include "fluke-dmm.h"
 
 #include "libsigrok-internal.h"
 #include "fluke-dmm.h"
 

diff --git a/src/hardware/fx2lafw/protocol.h b/src/hardware/fx2lafw/protocol.h
index 6d7231154e7ef5a64e5892f5d0abecb7aac5eb4d..35a52fba84dec09f21670569716e2a1e094a8709 100644 (file)
--- a/src/hardware/fx2lafw/protocol.h
+++ b/src/hardware/fx2lafw/protocol.h
@@ -26,7 +26,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <libusb.h>
 #include <stdlib.h>
 #include <string.h>
 #include <libusb.h>

-#include "libsigrok.h"
+#include <libsigrok/libsigrok.h>

 #include "libsigrok-internal.h"
 
 #define LOG_PREFIX "fx2lafw"
 #include "libsigrok-internal.h"
 
 #define LOG_PREFIX "fx2lafw"

diff --git a/src/hardware/gmc-mh-1x-2x/protocol.h b/src/hardware/gmc-mh-1x-2x/protocol.h
index b19cd431321ae9a7cdfec4bdd115d7d718e6c94b..b4869ad1f03f1d6bf3e3018fecd59740823f98f3 100644 (file)
--- a/src/hardware/gmc-mh-1x-2x/protocol.h
+++ b/src/hardware/gmc-mh-1x-2x/protocol.h
@@ -27,7 +27,7 @@
 
 #include <stdint.h>
 #include <glib.h>
 
 #include <stdint.h>
 #include <glib.h>

-#include "libsigrok.h"
+#include <libsigrok/libsigrok.h>

 #include "libsigrok-internal.h"
 
 #define LOG_PREFIX "gmc-mh-1x-2x"
 #include "libsigrok-internal.h"
 
 #define LOG_PREFIX "gmc-mh-1x-2x"

diff --git a/src/hardware/hameg-hmo/protocol.h b/src/hardware/hameg-hmo/protocol.h
index 8235b1e733caf1524de6c5df96eb4c4d26692b2c..3747d62b0b36f6e02e1290d6f0f4583ad9143fd0 100644 (file)
--- a/src/hardware/hameg-hmo/protocol.h
+++ b/src/hardware/hameg-hmo/protocol.h
@@ -23,7 +23,7 @@
 #include <glib.h>
 #include <stdint.h>
 #include <string.h>
 #include <glib.h>
 #include <stdint.h>
 #include <string.h>

-#include "libsigrok.h"
+#include <libsigrok/libsigrok.h>

 #include "libsigrok-internal.h"
 
 #define LOG_PREFIX "hameg-hmo"
 #include "libsigrok-internal.h"
 
 #define LOG_PREFIX "hameg-hmo"

diff --git a/src/hardware/hantek-dso/api.c b/src/hardware/hantek-dso/api.c
index 160dbb4d52e777069807db97b30719583499b63b..ba4918d5d5b8b94e195bdf0e3b1c2fb59963c464 100644 (file)
--- a/src/hardware/hantek-dso/api.c
+++ b/src/hardware/hantek-dso/api.c
@@ -29,7 +29,7 @@
 #include <inttypes.h>
 #include <glib.h>
 #include <libusb.h>
 #include <inttypes.h>
 #include <glib.h>
 #include <libusb.h>

-#include "libsigrok.h"
+#include <libsigrok/libsigrok.h>

 #include "libsigrok-internal.h"
 #include "dso.h"
 
 #include "libsigrok-internal.h"
 #include "dso.h"
 

diff --git a/src/hardware/hantek-dso/dso.c b/src/hardware/hantek-dso/dso.c
index 195201fe7302f3e05185cb42d5b583b8d1f25aca..27ef63c1e864b35385973c9750237bbaa3f62ef7 100644 (file)
--- a/src/hardware/hantek-dso/dso.c
+++ b/src/hardware/hantek-dso/dso.c
@@ -22,7 +22,7 @@
 #include <string.h>
 #include <glib.h>
 #include <libusb.h>
 #include <string.h>
 #include <glib.h>
 #include <libusb.h>

-#include "libsigrok.h"
+#include <libsigrok/libsigrok.h>

 #include "libsigrok-internal.h"
 #include "dso.h"
 
 #include "libsigrok-internal.h"
 #include "dso.h"
 

diff --git a/src/hardware/ikalogic-scanalogic2/protocol.h b/src/hardware/ikalogic-scanalogic2/protocol.h
index cd7948212ec723fc884c13b2f33b1f4dffa94ee7..66a5cecf57919f0b2a6cbcf50d6d56624bc15805 100644 (file)
--- a/src/hardware/ikalogic-scanalogic2/protocol.h
+++ b/src/hardware/ikalogic-scanalogic2/protocol.h
@@ -24,7 +24,7 @@
 #include <string.h>
 #include <stdint.h>
 #include <glib.h>
 #include <string.h>
 #include <stdint.h>
 #include <glib.h>

-#include "libsigrok.h"
+#include <libsigrok/libsigrok.h>

 #include "libsigrok-internal.h"
 
 #define LOG_PREFIX "ikalogic-scanalogic2"
 #include "libsigrok-internal.h"
 
 #define LOG_PREFIX "ikalogic-scanalogic2"

diff --git a/src/hardware/ikalogic-scanaplus/protocol.h b/src/hardware/ikalogic-scanaplus/protocol.h
index deb76b1595c46231e1db8717b175aaa72d4edca7..cdd684d0b1acecb3a976630dee49056042b95407 100644 (file)
--- a/src/hardware/ikalogic-scanaplus/protocol.h
+++ b/src/hardware/ikalogic-scanaplus/protocol.h
@@ -25,7 +25,7 @@
 #include <string.h>
 #include <glib.h>
 #include <ftdi.h>
 #include <string.h>
 #include <glib.h>
 #include <ftdi.h>

-#include "libsigrok.h"
+#include <libsigrok/libsigrok.h>

 #include "libsigrok-internal.h"
 
 #define LOG_PREFIX "ikalogic-scanaplus"
 #include "libsigrok-internal.h"
 
 #define LOG_PREFIX "ikalogic-scanaplus"

diff --git a/src/hardware/kecheng-kc-330b/protocol.h b/src/hardware/kecheng-kc-330b/protocol.h
index ff3ce8b90d7f437da9fd85754f8015e3d6dff7ef..a718bdba0ee26162901bbcd82af5b1d138598627 100644 (file)
--- a/src/hardware/kecheng-kc-330b/protocol.h
+++ b/src/hardware/kecheng-kc-330b/protocol.h
@@ -22,7 +22,7 @@
 
 #include <stdint.h>
 #include <glib.h>
 
 #include <stdint.h>
 #include <glib.h>

-#include "libsigrok.h"
+#include <libsigrok/libsigrok.h>

 #include "libsigrok-internal.h"
 
 #define LOG_PREFIX "kecheng-kc-330b"
 #include "libsigrok-internal.h"
 
 #define LOG_PREFIX "kecheng-kc-330b"

diff --git a/src/hardware/lascar-el-usb/api.c b/src/hardware/lascar-el-usb/api.c
index 40a4164943282cd90e076a0b3cf8865b1169a798..682366d0b367918001d8b1f1c7160d15d742d0a5 100644 (file)
--- a/src/hardware/lascar-el-usb/api.c
+++ b/src/hardware/lascar-el-usb/api.c
@@ -19,7 +19,7 @@
 
 #include <glib.h>
 #include <libusb.h>
 
 #include <glib.h>
 #include <libusb.h>

-#include "libsigrok.h"
+#include <libsigrok/libsigrok.h>

 #include "libsigrok-internal.h"
 #include "protocol.h"
 
 #include "libsigrok-internal.h"
 #include "protocol.h"
 

diff --git a/src/hardware/lascar-el-usb/protocol.c b/src/hardware/lascar-el-usb/protocol.c
index 3dad7943ef78e816e865fee81291fff325885ebf..ba60fe3bc95fa82434e9d1dd353f9a20c96f140d 100644 (file)
--- a/src/hardware/lascar-el-usb/protocol.c
+++ b/src/hardware/lascar-el-usb/protocol.c
@@ -22,7 +22,7 @@
 #include <string.h>
 #include <math.h>
 #include <glib.h>
 #include <string.h>
 #include <math.h>
 #include <glib.h>

-#include "libsigrok.h"
+#include <libsigrok/libsigrok.h>

 #include "libsigrok-internal.h"
 #include "protocol.h"
 
 #include "libsigrok-internal.h"
 #include "protocol.h"
 

diff --git a/src/hardware/lascar-el-usb/protocol.h b/src/hardware/lascar-el-usb/protocol.h
index a0f7f4fdb6e16749b28046001c8f7fd4507a6071..08197fb202be065a9d0f7303b8460f1b7cbfb40a 100644 (file)
--- a/src/hardware/lascar-el-usb/protocol.h
+++ b/src/hardware/lascar-el-usb/protocol.h
@@ -21,7 +21,7 @@
 #define LIBSIGROK_HARDWARE_LASCAR_EL_USB_PROTOCOL_H
 
 #include <stdint.h>
 #define LIBSIGROK_HARDWARE_LASCAR_EL_USB_PROTOCOL_H
 
 #include <stdint.h>

-#include "libsigrok.h"
+#include <libsigrok/libsigrok.h>

 #include "libsigrok-internal.h"
 
 #define LOG_PREFIX "lascar-el-usb"
 #include "libsigrok-internal.h"
 
 #define LOG_PREFIX "lascar-el-usb"

diff --git a/src/hardware/link-mso19/protocol.h b/src/hardware/link-mso19/protocol.h
index 337814bf10e32965157a741f3cdda175d8b325bc..e32f39e9f9829ab7c76a3cd9fa41c61419d25cf5 100644 (file)
--- a/src/hardware/link-mso19/protocol.h
+++ b/src/hardware/link-mso19/protocol.h
@@ -26,7 +26,7 @@
 #include <string.h>
 #include <glib.h>
 #include <libudev.h>
 #include <string.h>
 #include <glib.h>
 #include <libudev.h>

-#include "libsigrok.h"
+#include <libsigrok/libsigrok.h>

 #include "libsigrok-internal.h"
 
 #define LOG_PREFIX "link-mso19"
 #include "libsigrok-internal.h"
 
 #define LOG_PREFIX "link-mso19"

diff --git a/src/hardware/manson-hcs-3xxx/protocol.h b/src/hardware/manson-hcs-3xxx/protocol.h
index 465cdd9d9315f38fe01332659ab2f895e044228d..c63f943d7645679f285440621df847f386994ddf 100644 (file)
--- a/src/hardware/manson-hcs-3xxx/protocol.h
+++ b/src/hardware/manson-hcs-3xxx/protocol.h
@@ -31,7 +31,7 @@
 #include <string.h>
 #include <math.h>
 #include <glib.h>
 #include <string.h>
 #include <math.h>
 #include <glib.h>

-#include "libsigrok.h"
+#include <libsigrok/libsigrok.h>

 #include "libsigrok-internal.h"
 
 #define LOG_PREFIX "manson-hcs-3xxx"
 #include "libsigrok-internal.h"
 
 #define LOG_PREFIX "manson-hcs-3xxx"

diff --git a/src/hardware/maynuo-m97/protocol.h b/src/hardware/maynuo-m97/protocol.h
index 7cb1f632a1152d7297626063389c861e409bfd49..62c1d47c942d23a905b42526d62f94603a98c340 100644 (file)
--- a/src/hardware/maynuo-m97/protocol.h
+++ b/src/hardware/maynuo-m97/protocol.h
@@ -21,7 +21,7 @@
 #define LIBSIGROK_HARDWARE_MAYNUO_M97_PROTOCOL_H
 
 #include <stdint.h>
 #define LIBSIGROK_HARDWARE_MAYNUO_M97_PROTOCOL_H
 
 #include <stdint.h>

-#include "libsigrok.h"
+#include <libsigrok/libsigrok.h>

 #include "libsigrok-internal.h"
 
 #define LOG_PREFIX "maynuo-m97"
 #include "libsigrok-internal.h"
 
 #define LOG_PREFIX "maynuo-m97"

diff --git a/src/hardware/mic-985xx/protocol.h b/src/hardware/mic-985xx/protocol.h
index 10d95d0978a75d1eb126ca9c2f39020f6f835dd0..42a01daf6151166e25f849e7a1b5c97c69eb21da 100644 (file)
--- a/src/hardware/mic-985xx/protocol.h
+++ b/src/hardware/mic-985xx/protocol.h
@@ -25,7 +25,7 @@
 #include <string.h>
 #include <ctype.h>
 #include <glib.h>
 #include <string.h>
 #include <ctype.h>
 #include <glib.h>

-#include "libsigrok.h"
+#include <libsigrok/libsigrok.h>

 #include "libsigrok-internal.h"
 
 #define LOG_PREFIX "mic-985xx"
 #include "libsigrok-internal.h"
 
 #define LOG_PREFIX "mic-985xx"

diff --git a/src/hardware/motech-lps-30x/protocol.h b/src/hardware/motech-lps-30x/protocol.h
index de700cf00d18c248fa4abc1638e241906b6e0a75..728c60059c60744d70281ba6ae598dd7ecf6cfc2 100644 (file)
--- a/src/hardware/motech-lps-30x/protocol.h
+++ b/src/hardware/motech-lps-30x/protocol.h
@@ -28,7 +28,7 @@
 
 #include <stdint.h>
 #include <glib.h>
 
 #include <stdint.h>
 #include <glib.h>

-#include "libsigrok.h"
+#include <libsigrok/libsigrok.h>

 #include "libsigrok-internal.h"
 
 SR_PRIV int lps_process_status(struct sr_dev_inst *sdi, int stat);
 #include "libsigrok-internal.h"
 
 SR_PRIV int lps_process_status(struct sr_dev_inst *sdi, int stat);

diff --git a/src/hardware/norma-dmm/protocol.h b/src/hardware/norma-dmm/protocol.h
index 80927150701b7d97f008ac00e035abae3993f73a..7c52b47ffec61a48b206f22c78feb2c8b0fce4fb 100644 (file)
--- a/src/hardware/norma-dmm/protocol.h
+++ b/src/hardware/norma-dmm/protocol.h
@@ -25,7 +25,7 @@
 #include <ctype.h>
 #include <math.h>
 #include <glib.h>
 #include <ctype.h>
 #include <math.h>
 #include <glib.h>

-#include "libsigrok.h"
+#include <libsigrok/libsigrok.h>

 #include "libsigrok-internal.h"
 
 /** @file
 #include "libsigrok-internal.h"
 
 /** @file

diff --git a/src/hardware/openbench-logic-sniffer/protocol.h b/src/hardware/openbench-logic-sniffer/protocol.h
index 6e5d61fe2af8d49dc9b97516f17a18ac0b052c4f..1e6cd69d8052bda5d5a83dc3624b4b00c0a9fc65 100644 (file)
--- a/src/hardware/openbench-logic-sniffer/protocol.h
+++ b/src/hardware/openbench-logic-sniffer/protocol.h
@@ -23,7 +23,7 @@
 #include <stdint.h>
 #include <string.h>
 #include <glib.h>
 #include <stdint.h>
 #include <string.h>
 #include <glib.h>

-#include "libsigrok.h"
+#include <libsigrok/libsigrok.h>

 #include "libsigrok-internal.h"
 
 #define LOG_PREFIX "ols"
 #include "libsigrok-internal.h"
 
 #define LOG_PREFIX "ols"

diff --git a/src/hardware/pipistrello-ols/protocol.h b/src/hardware/pipistrello-ols/protocol.h
index 4923835a3bcad14046aad5d35600575fb05c4d53..c2bd2ccb902ba5cb91f79bcbd8254b32b9dd78ba 100644 (file)
--- a/src/hardware/pipistrello-ols/protocol.h
+++ b/src/hardware/pipistrello-ols/protocol.h
@@ -24,7 +24,7 @@
 #include <string.h>
 #include <glib.h>
 #include <ftdi.h>
 #include <string.h>
 #include <glib.h>
 #include <ftdi.h>

-#include "libsigrok.h"
+#include <libsigrok/libsigrok.h>

 #include "libsigrok-internal.h"
 
 #define LOG_PREFIX "p-ols"
 #include "libsigrok-internal.h"
 
 #define LOG_PREFIX "p-ols"

diff --git a/src/hardware/rigol-ds/api.c b/src/hardware/rigol-ds/api.c
index 3febe605f8230d1e60d951ab23038a1015ecc397..8075a2e8ff8318d3a7b524765d144caae58850f5 100644 (file)
--- a/src/hardware/rigol-ds/api.c
+++ b/src/hardware/rigol-ds/api.c
@@ -26,7 +26,7 @@
 #include <strings.h>
 #include <math.h>
 #include <glib.h>
 #include <strings.h>
 #include <math.h>
 #include <glib.h>

-#include "libsigrok.h"
+#include <libsigrok/libsigrok.h>

 #include "libsigrok-internal.h"
 #include "protocol.h"
 
 #include "libsigrok-internal.h"
 #include "protocol.h"
 

diff --git a/src/hardware/rigol-ds/protocol.c b/src/hardware/rigol-ds/protocol.c
index 7581472414590e3f227d52bdfaed25f1fc61a055..d9a53f547e67e598fb1a0c458828c509e8741798 100644 (file)
--- a/src/hardware/rigol-ds/protocol.c
+++ b/src/hardware/rigol-ds/protocol.c
@@ -28,7 +28,7 @@
 #include <ctype.h>
 #include <time.h>
 #include <glib.h>
 #include <ctype.h>
 #include <time.h>
 #include <glib.h>

-#include "libsigrok.h"
+#include <libsigrok/libsigrok.h>

 #include "libsigrok-internal.h"
 #include "protocol.h"
 
 #include "libsigrok-internal.h"
 #include "protocol.h"
 

diff --git a/src/hardware/rigol-ds/protocol.h b/src/hardware/rigol-ds/protocol.h
index 6298185656663ec12f981ba08376b1a40cc03312..5e5f01ba3b4fc0a5575c156c393cf9a927cd91fd 100644 (file)
--- a/src/hardware/rigol-ds/protocol.h
+++ b/src/hardware/rigol-ds/protocol.h
@@ -23,7 +23,7 @@
 
 #include <stdint.h>
 #include <stdbool.h>
 
 #include <stdint.h>
 #include <stdbool.h>

-#include "libsigrok.h"
+#include <libsigrok/libsigrok.h>

 #include "libsigrok-internal.h"
 
 #define LOG_PREFIX "rigol-ds"
 #include "libsigrok-internal.h"
 
 #define LOG_PREFIX "rigol-ds"

diff --git a/src/hardware/saleae-logic16/api.c b/src/hardware/saleae-logic16/api.c
index 7206c5825125ec2a79883920251d916e9ac27731..af421d3c96733ec83a5b0456e9c0e879171f085d 100644 (file)
--- a/src/hardware/saleae-logic16/api.c
+++ b/src/hardware/saleae-logic16/api.c
@@ -24,7 +24,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <math.h>
 #include <stdlib.h>
 #include <string.h>
 #include <math.h>

-#include "libsigrok.h"
+#include <libsigrok/libsigrok.h>

 #include "libsigrok-internal.h"
 #include "protocol.h"
 
 #include "libsigrok-internal.h"
 #include "protocol.h"
 

diff --git a/src/hardware/saleae-logic16/protocol.c b/src/hardware/saleae-logic16/protocol.c
index 36a688da462c3254c0bf3861292469786f3bb794..532320d9216a10f132652e0d8b5c36a9d4c7bfba 100644 (file)
--- a/src/hardware/saleae-logic16/protocol.c
+++ b/src/hardware/saleae-logic16/protocol.c
@@ -26,7 +26,7 @@
 #include <stdio.h>
 #include <errno.h>
 #include <math.h>
 #include <stdio.h>
 #include <errno.h>
 #include <math.h>

-#include "libsigrok.h"
+#include <libsigrok/libsigrok.h>

 #include "libsigrok-internal.h"
 #include "protocol.h"
 
 #include "libsigrok-internal.h"
 #include "protocol.h"
 

diff --git a/src/hardware/saleae-logic16/protocol.h b/src/hardware/saleae-logic16/protocol.h
index 0cadd359517fc043f3fd9c4f35acd06b671de1be..9f834164c83d14bb3603a75f1815348b13f74e02 100644 (file)
--- a/src/hardware/saleae-logic16/protocol.h
+++ b/src/hardware/saleae-logic16/protocol.h
@@ -24,7 +24,7 @@
 
 #include <stdint.h>
 #include <glib.h>
 
 #include <stdint.h>
 #include <glib.h>

-#include "libsigrok.h"
+#include <libsigrok/libsigrok.h>

 #include "libsigrok-internal.h"
 
 #define LOG_PREFIX "saleae-logic16"
 #include "libsigrok-internal.h"
 
 #define LOG_PREFIX "saleae-logic16"

diff --git a/src/hardware/scpi-pps/protocol.h b/src/hardware/scpi-pps/protocol.h
index 4956e5d4cb0ff8cfe9f116abecf0e548a65db2a1..063fddc1b563fe7bda406e4ff91447a40647cf54 100644 (file)
--- a/src/hardware/scpi-pps/protocol.h
+++ b/src/hardware/scpi-pps/protocol.h
@@ -22,7 +22,7 @@
 
 #include <stdint.h>
 #include <glib.h>
 
 #include <stdint.h>
 #include <glib.h>

-#include "libsigrok.h"
+#include <libsigrok/libsigrok.h>

 #include "libsigrok-internal.h"
 
 #define LOG_PREFIX "scpi-pps"
 #include "libsigrok-internal.h"
 
 #define LOG_PREFIX "scpi-pps"

diff --git a/src/hardware/serial-dmm/api.c b/src/hardware/serial-dmm/api.c
index c71dd0750b109d2c4e44023d6d5845af27e65525..25e7bb61a997c8809753adbe95d8204c484927d5 100644 (file)
--- a/src/hardware/serial-dmm/api.c
+++ b/src/hardware/serial-dmm/api.c
@@ -24,7 +24,7 @@
 #include <fcntl.h>
 #include <string.h>
 #include <glib.h>
 #include <fcntl.h>
 #include <string.h>
 #include <glib.h>

-#include "libsigrok.h"
+#include <libsigrok/libsigrok.h>

 #include "libsigrok-internal.h"
 #include "protocol.h"
 
 #include "libsigrok-internal.h"
 #include "protocol.h"
 

diff --git a/src/hardware/serial-dmm/protocol.c b/src/hardware/serial-dmm/protocol.c
index 84b12cf0e003e0731624ca230b0688a0ece10db2..2e092533954250932a227008e75bc5e7b0d5ac2e 100644 (file)
--- a/src/hardware/serial-dmm/protocol.c
+++ b/src/hardware/serial-dmm/protocol.c
@@ -22,7 +22,7 @@
 #include <math.h>
 #include <string.h>
 #include <glib.h>
 #include <math.h>
 #include <string.h>
 #include <glib.h>

-#include "libsigrok.h"
+#include <libsigrok/libsigrok.h>

 #include "libsigrok-internal.h"
 #include "protocol.h"
 
 #include "libsigrok-internal.h"
 #include "protocol.h"
 

diff --git a/src/hardware/sysclk-lwla/api.c b/src/hardware/sysclk-lwla/api.c
index f5a6d2f1dd1534523f7a57b0a92987e94d1130bc..dc15bb1811065b8ec1389304644cefa33aa07a5b 100644 (file)
--- a/src/hardware/sysclk-lwla/api.c
+++ b/src/hardware/sysclk-lwla/api.c
@@ -21,7 +21,7 @@
 #include <libusb.h>
 #include <stdlib.h>
 #include <string.h>
 #include <libusb.h>
 #include <stdlib.h>
 #include <string.h>

-#include "libsigrok.h"
+#include <libsigrok/libsigrok.h>

 #include "libsigrok-internal.h"
 #include "protocol.h"
 
 #include "libsigrok-internal.h"
 #include "protocol.h"
 

diff --git a/src/hardware/sysclk-lwla/lwla.c b/src/hardware/sysclk-lwla/lwla.c
index 4cc1b656ea46bb90b71e5e5d66755ab666efee94..d2f2a2579e5e41861ef053339736a8e2d672090c 100644 (file)
--- a/src/hardware/sysclk-lwla/lwla.c
+++ b/src/hardware/sysclk-lwla/lwla.c
@@ -19,7 +19,7 @@
 
 #include <errno.h>
 #include <glib/gstdio.h>
 
 #include <errno.h>
 #include <glib/gstdio.h>

-#include "libsigrok.h"
+#include <libsigrok/libsigrok.h>

 #include "libsigrok-internal.h"
 #include "protocol.h"
 #include "lwla.h"
 #include "libsigrok-internal.h"
 #include "protocol.h"
 #include "lwla.h"

diff --git a/src/hardware/sysclk-lwla/lwla.h b/src/hardware/sysclk-lwla/lwla.h
index 8d72eda1dbaebe01faac9206fa07ad6a1bc6ad7a..d4abea3f7662915711a41bb9ed12f358084af923 100644 (file)
--- a/src/hardware/sysclk-lwla/lwla.h
+++ b/src/hardware/sysclk-lwla/lwla.h
@@ -23,7 +23,7 @@
 #include <stdint.h>
 #include <libusb.h>
 #include <glib.h>
 #include <stdint.h>
 #include <libusb.h>
 #include <glib.h>

-#include "libsigrok.h"
+#include <libsigrok/libsigrok.h>

 
 struct sr_usb_dev_inst;
 
 
 struct sr_usb_dev_inst;
 

diff --git a/src/hardware/sysclk-lwla/protocol.h b/src/hardware/sysclk-lwla/protocol.h
index d890775bf75dc4f8ce42c5d2a5061a417fc8c7b0..25f349d1757c4682b934ab53d2065a603895cd01 100644 (file)
--- a/src/hardware/sysclk-lwla/protocol.h
+++ b/src/hardware/sysclk-lwla/protocol.h
@@ -24,7 +24,7 @@
 
 #include <stdint.h>
 #include <glib.h>
 
 #include <stdint.h>
 #include <glib.h>

-#include "libsigrok.h"
+#include <libsigrok/libsigrok.h>

 #include "libsigrok-internal.h"
 #include "lwla.h"
 
 #include "libsigrok-internal.h"
 #include "lwla.h"
 

diff --git a/src/hardware/teleinfo/api.c b/src/hardware/teleinfo/api.c
index 26f3a41a2e101bdf26fb8a10a8ab4071b1843d1b..540143e3bf89488963ba7e08576dd63c82df14bd 100644 (file)
--- a/src/hardware/teleinfo/api.c
+++ b/src/hardware/teleinfo/api.c
@@ -19,7 +19,7 @@
 
 #include <stdlib.h>
 #include <glib.h>
 
 #include <stdlib.h>
 #include <glib.h>

-#include "libsigrok.h"
+#include <libsigrok/libsigrok.h>

 #include "libsigrok-internal.h"
 #include "protocol.h"
 
 #include "libsigrok-internal.h"
 #include "protocol.h"
 

diff --git a/src/hardware/teleinfo/protocol.h b/src/hardware/teleinfo/protocol.h
index 303305e7a66cf67480db0133630d051097ea3595..84a7546e2c2bfa4a03c3244a895f578df74765cf 100644 (file)
--- a/src/hardware/teleinfo/protocol.h
+++ b/src/hardware/teleinfo/protocol.h
@@ -22,7 +22,7 @@
 
 #include <stdint.h>
 #include <glib.h>
 
 #include <stdint.h>
 #include <glib.h>

-#include "libsigrok.h"
+#include <libsigrok/libsigrok.h>

 #include "libsigrok-internal.h"
 
 #define LOG_PREFIX "teleinfo"
 #include "libsigrok-internal.h"
 
 #define LOG_PREFIX "teleinfo"

diff --git a/src/hardware/testo/protocol.h b/src/hardware/testo/protocol.h
index 62607e2b60d152f307cc396b324ed7c160cb56fb..8621bc2cc1f2512595eb6838ad18700308da7598 100644 (file)
--- a/src/hardware/testo/protocol.h
+++ b/src/hardware/testo/protocol.h
@@ -22,7 +22,7 @@
 
 #include <stdint.h>
 #include <glib.h>
 
 #include <stdint.h>
 #include <glib.h>

-#include "libsigrok.h"
+#include <libsigrok/libsigrok.h>

 #include "libsigrok-internal.h"
 
 #define LOG_PREFIX "testo"
 #include "libsigrok-internal.h"
 
 #define LOG_PREFIX "testo"

diff --git a/src/hardware/tondaj-sl-814/api.c b/src/hardware/tondaj-sl-814/api.c
index 83312249cfcdf56755c304d64b5fd1a8d8af73da..fceca24483d118e829dc660ebe490118a5e0b00d 100644 (file)
--- a/src/hardware/tondaj-sl-814/api.c
+++ b/src/hardware/tondaj-sl-814/api.c
@@ -20,7 +20,7 @@
 
 #include <fcntl.h>
 #include <glib.h>
 
 #include <fcntl.h>
 #include <glib.h>

-#include "libsigrok.h"
+#include <libsigrok/libsigrok.h>

 #include "libsigrok-internal.h"
 #include "protocol.h"
 
 #include "libsigrok-internal.h"
 #include "protocol.h"
 

diff --git a/src/hardware/tondaj-sl-814/protocol.c b/src/hardware/tondaj-sl-814/protocol.c
index c3b065615de746b5b89b95624a0aef63ebc78187..97ab844ec3287f39bbcc20b8eddc2ea5783ec88f 100644 (file)
--- a/src/hardware/tondaj-sl-814/protocol.c
+++ b/src/hardware/tondaj-sl-814/protocol.c
@@ -20,7 +20,7 @@
 
 #include <string.h>
 #include <glib.h>
 
 #include <string.h>
 #include <glib.h>

-#include "libsigrok.h"
+#include <libsigrok/libsigrok.h>

 #include "libsigrok-internal.h"
 #include "protocol.h"
 
 #include "libsigrok-internal.h"
 #include "protocol.h"
 

diff --git a/src/hardware/tondaj-sl-814/protocol.h b/src/hardware/tondaj-sl-814/protocol.h
index 027b66dfddce61b60cb3eaee7f58dc2217bbb4ee..77c6ca08fec8d24246bde7b32700fba3784275ce 100644 (file)
--- a/src/hardware/tondaj-sl-814/protocol.h
+++ b/src/hardware/tondaj-sl-814/protocol.h
@@ -22,7 +22,7 @@
 #define LIBSIGROK_HARDWARE_TONDAJ_SL_814_PROTOCOL_H
 
 #include <stdint.h>
 #define LIBSIGROK_HARDWARE_TONDAJ_SL_814_PROTOCOL_H
 
 #include <stdint.h>

-#include "libsigrok.h"
+#include <libsigrok/libsigrok.h>

 #include "libsigrok-internal.h"
 
 #define LOG_PREFIX "tondaj-sl-814"
 #include "libsigrok-internal.h"
 
 #define LOG_PREFIX "tondaj-sl-814"

diff --git a/src/hardware/uni-t-dmm/api.c b/src/hardware/uni-t-dmm/api.c
index 6f3ad6a2b86db5e7a3999ce19e1ce75c8a8baddd..a21663fca5f1d3f0f5f7f71a0bd3b7f90ba3460d 100644 (file)
--- a/src/hardware/uni-t-dmm/api.c
+++ b/src/hardware/uni-t-dmm/api.c
@@ -20,7 +20,7 @@
 
 #include <stdlib.h>
 #include <string.h>
 
 #include <stdlib.h>
 #include <string.h>

-#include "libsigrok.h"
+#include <libsigrok/libsigrok.h>

 #include "libsigrok-internal.h"
 #include "protocol.h"
 
 #include "libsigrok-internal.h"
 #include "protocol.h"
 

diff --git a/src/hardware/uni-t-dmm/protocol.c b/src/hardware/uni-t-dmm/protocol.c
index 7047ca862c3ed4d87d03ed1f265fe15b48e51a47..f30b1d9ba033901ab2408a3f5c59271af10e3859 100644 (file)
--- a/src/hardware/uni-t-dmm/protocol.c
+++ b/src/hardware/uni-t-dmm/protocol.c
@@ -20,7 +20,7 @@
 
 #include <string.h>
 #include <glib.h>
 
 #include <string.h>
 #include <glib.h>

-#include "libsigrok.h"
+#include <libsigrok/libsigrok.h>

 #include "libsigrok-internal.h"
 #include "protocol.h"
 
 #include "libsigrok-internal.h"
 #include "protocol.h"
 

diff --git a/src/hardware/uni-t-dmm/protocol.h b/src/hardware/uni-t-dmm/protocol.h
index 3e063664839a89fdab8ad2454b3f3b744640bff4..02810b727af5239b1517524b8dce3dc4ea0128af 100644 (file)
--- a/src/hardware/uni-t-dmm/protocol.h
+++ b/src/hardware/uni-t-dmm/protocol.h
@@ -24,7 +24,7 @@
 #include <stdint.h>
 #include <glib.h>
 #include <libusb.h>
 #include <stdint.h>
 #include <glib.h>
 #include <libusb.h>

-#include "libsigrok.h"
+#include <libsigrok/libsigrok.h>

 #include "libsigrok-internal.h"
 
 #define LOG_PREFIX "uni-t-dmm"
 #include "libsigrok-internal.h"
 
 #define LOG_PREFIX "uni-t-dmm"

diff --git a/src/hardware/uni-t-ut32x/protocol.h b/src/hardware/uni-t-ut32x/protocol.h
index 1a1cf1f5baa7612e331ffb1e446492e30b126d25..4010e179fc535414ea0ad5bc867709cdd52497f3 100644 (file)
--- a/src/hardware/uni-t-ut32x/protocol.h
+++ b/src/hardware/uni-t-ut32x/protocol.h
@@ -22,7 +22,7 @@
 
 #include <stdint.h>
 #include <glib.h>
 
 #include <stdint.h>
 #include <glib.h>

-#include "libsigrok.h"
+#include <libsigrok/libsigrok.h>

 #include "libsigrok-internal.h"
 
 #define LOG_PREFIX "uni-t-ut32x"
 #include "libsigrok-internal.h"
 
 #define LOG_PREFIX "uni-t-ut32x"

diff --git a/src/hardware/victor-dmm/api.c b/src/hardware/victor-dmm/api.c
index e82302618693c76f09de61eb89e847c9063785c8..3970a838bdea51915410ae597cf7fd5c40e8b07d 100644 (file)
--- a/src/hardware/victor-dmm/api.c
+++ b/src/hardware/victor-dmm/api.c
@@ -21,7 +21,7 @@
 #include <libusb.h>
 #include <stdlib.h>
 #include <string.h>
 #include <libusb.h>
 #include <stdlib.h>
 #include <string.h>

-#include "libsigrok.h"
+#include <libsigrok/libsigrok.h>

 #include "libsigrok-internal.h"
 #include "protocol.h"
 
 #include "libsigrok-internal.h"
 #include "protocol.h"
 

diff --git a/src/hardware/victor-dmm/protocol.c b/src/hardware/victor-dmm/protocol.c
index 6f72d9470f1ee0b843599f77720382153f6eec5b..2e9392db6786a6f97e1edc2de2195230a1c1f63a 100644 (file)
--- a/src/hardware/victor-dmm/protocol.c
+++ b/src/hardware/victor-dmm/protocol.c
@@ -20,7 +20,7 @@
 #include <glib.h>
 #include <string.h>
 #include <math.h>
 #include <glib.h>
 #include <string.h>
 #include <math.h>

-#include "libsigrok.h"
+#include <libsigrok/libsigrok.h>

 #include "libsigrok-internal.h"
 #include "protocol.h"
 
 #include "libsigrok-internal.h"
 #include "protocol.h"
 

diff --git a/src/hardware/victor-dmm/protocol.h b/src/hardware/victor-dmm/protocol.h
index 8f12680314e0a1fe75aa0236eb4177b4a7687f7c..38fd5241a10aee3443f602ea4a07a5b0fa607ce3 100644 (file)
--- a/src/hardware/victor-dmm/protocol.h
+++ b/src/hardware/victor-dmm/protocol.h
@@ -21,7 +21,7 @@
 #define LIBSIGROK_HARDWARE_VICTOR_DMM_PROTOCOL_H
 
 #include <stdint.h>
 #define LIBSIGROK_HARDWARE_VICTOR_DMM_PROTOCOL_H
 
 #include <stdint.h>

-#include "libsigrok.h"
+#include <libsigrok/libsigrok.h>

 #include "libsigrok-internal.h"
 
 #define LOG_PREFIX "victor-dmm"
 #include "libsigrok-internal.h"
 
 #define LOG_PREFIX "victor-dmm"

diff --git a/src/hardware/yokogawa-dlm/protocol.h b/src/hardware/yokogawa-dlm/protocol.h
index 24c8e2787ef64cd1691249cbe64b690ba40e1ee3..80def3f9de550d752f54dc7371f0525ae9e13190 100644 (file)
--- a/src/hardware/yokogawa-dlm/protocol.h
+++ b/src/hardware/yokogawa-dlm/protocol.h
@@ -26,7 +26,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <math.h>
 #include <stdlib.h>
 #include <string.h>
 #include <math.h>

-#include "libsigrok.h"
+#include <libsigrok/libsigrok.h>

 #include "libsigrok-internal.h"
 #include "protocol_wrappers.h"
 
 #include "libsigrok-internal.h"
 #include "protocol_wrappers.h"
 

diff --git a/src/hardware/yokogawa-dlm/protocol_wrappers.h b/src/hardware/yokogawa-dlm/protocol_wrappers.h
index a88ef200f8695702bae3e0f4a3a750a76bd54816..47ae40ecf89114c23bc26a157b066d4663dea28d 100644 (file)
--- a/src/hardware/yokogawa-dlm/protocol_wrappers.h
+++ b/src/hardware/yokogawa-dlm/protocol_wrappers.h
@@ -23,7 +23,7 @@
 #include <glib.h>
 #include <stdint.h>
 #include <string.h>
 #include <glib.h>
 #include <stdint.h>
 #include <string.h>

-#include "libsigrok.h"
+#include <libsigrok/libsigrok.h>

 #include "libsigrok-internal.h"
 #include "protocol.h"
 
 #include "libsigrok-internal.h"
 #include "protocol.h"
 

diff --git a/src/hardware/zeroplus-logic-cube/analyzer.c b/src/hardware/zeroplus-logic-cube/analyzer.c
index 9453bd0b17599168e7d21ff9cb8f5776f941a0e5..6af8cfc7a9842f78763207efe0f3f2d67a6a5671 100644 (file)
--- a/src/hardware/zeroplus-logic-cube/analyzer.c
+++ b/src/hardware/zeroplus-logic-cube/analyzer.c
@@ -30,7 +30,7 @@
  */
 
 #include <assert.h>
  */
 
 #include <assert.h>

-#include "libsigrok.h"
+#include <libsigrok/libsigrok.h>

 #include "libsigrok-internal.h"
 #include "analyzer.h"
 #include "gl_usb.h"
 #include "libsigrok-internal.h"
 #include "analyzer.h"
 #include "gl_usb.h"

diff --git a/src/hardware/zeroplus-logic-cube/analyzer.h b/src/hardware/zeroplus-logic-cube/analyzer.h
index 9f872598b839cdb22b8672ed18501f54c1c9cfa2..41a1eed84dcf7a190eae9ab63f8f2d6cd10b306f 100644 (file)
--- a/src/hardware/zeroplus-logic-cube/analyzer.h
+++ b/src/hardware/zeroplus-logic-cube/analyzer.h
@@ -33,7 +33,7 @@
 #define LIBSIGROK_HARDWARE_ZEROPLUS_LOGIC_CUBE_ANALYZER_H
 
 #include <libusb.h>
 #define LIBSIGROK_HARDWARE_ZEROPLUS_LOGIC_CUBE_ANALYZER_H
 
 #include <libusb.h>

-#include "libsigrok.h"
+#include <libsigrok/libsigrok.h>

 
 #define STATUS_FLAG_NONE       0x00
 #define STATUS_FLAG_RESET      0x01
 
 #define STATUS_FLAG_NONE       0x00
 #define STATUS_FLAG_RESET      0x01

diff --git a/src/hardware/zeroplus-logic-cube/gl_usb.c b/src/hardware/zeroplus-logic-cube/gl_usb.c
index 2443f455131308c99e039632419edc39ce953a43..812e4a765b5b71da44135c77a2d8641923a7823a 100644 (file)
--- a/src/hardware/zeroplus-logic-cube/gl_usb.c
+++ b/src/hardware/zeroplus-logic-cube/gl_usb.c
@@ -31,7 +31,7 @@
 
 #include <stdio.h>
 #include <libusb.h>
 
 #include <stdio.h>
 #include <libusb.h>

-#include "libsigrok.h"
+#include <libsigrok/libsigrok.h>

 #include "libsigrok-internal.h"
 #include "gl_usb.h"
 #include "protocol.h"
 #include "libsigrok-internal.h"
 #include "gl_usb.h"
 #include "protocol.h"

diff --git a/src/hardware/zeroplus-logic-cube/gl_usb.h b/src/hardware/zeroplus-logic-cube/gl_usb.h
index c3a33fb34fb35d867fc14bdddb180472fe826d17..9eef7c9baa142e3531f0c31ee154ba58e30d6dc2 100644 (file)
--- a/src/hardware/zeroplus-logic-cube/gl_usb.h
+++ b/src/hardware/zeroplus-logic-cube/gl_usb.h
@@ -33,7 +33,7 @@
 #define LIBSIGROK_HARDWARE_ZEROPLUS_LOGIC_CUBE_GL_USB_H
 
 #include <libusb.h>
 #define LIBSIGROK_HARDWARE_ZEROPLUS_LOGIC_CUBE_GL_USB_H
 
 #include <libusb.h>

-#include "libsigrok.h"
+#include <libsigrok/libsigrok.h>

 
 SR_PRIV int gl_read_bulk(libusb_device_handle *devh, void *buffer,
                         unsigned int size);
 
 SR_PRIV int gl_read_bulk(libusb_device_handle *devh, void *buffer,
                         unsigned int size);

diff --git a/src/hardware/zeroplus-logic-cube/protocol.h b/src/hardware/zeroplus-logic-cube/protocol.h
index c9db53f500a9ee2d27d8b20a5fd2affb9639b057..4d128bedf30d039262e6612caa3223befdb82498 100644 (file)
--- a/src/hardware/zeroplus-logic-cube/protocol.h
+++ b/src/hardware/zeroplus-logic-cube/protocol.h
@@ -25,7 +25,7 @@
 #include <string.h>
 #include <glib.h>
 #include <libusb.h>
 #include <string.h>
 #include <glib.h>
 #include <libusb.h>

-#include "libsigrok.h"
+#include <libsigrok/libsigrok.h>

 #include "libsigrok-internal.h"
 #include "analyzer.h"
 
 #include "libsigrok-internal.h"
 #include "analyzer.h"
 

diff --git a/src/hwdriver.c b/src/hwdriver.c
index 74d75e6a1e5bdad58909aabb93e207b8f68d7f1e..3348b759562593746bce2792b8a282e49241e5ae 100644 (file)
--- a/src/hwdriver.c
+++ b/src/hwdriver.c
@@ -24,7 +24,7 @@
 #include <string.h>
 #include <glib.h>
 #include "config.h" /* Needed for HAVE_LIBUSB_1_0 and others. */
 #include <string.h>
 #include <glib.h>
 #include "config.h" /* Needed for HAVE_LIBUSB_1_0 and others. */

-#include "libsigrok.h"
+#include <libsigrok/libsigrok.h>

 #include "libsigrok-internal.h"
 
 /** @cond PRIVATE */
 #include "libsigrok-internal.h"
 
 /** @cond PRIVATE */

diff --git a/src/input/binary.c b/src/input/binary.c
index d7080b0b22bf6c83df05abd26d471c272024c99b..23b9574f8de9400bca91ff39755ecd015020c64b 100644 (file)
--- a/src/input/binary.c
+++ b/src/input/binary.c
@@ -23,7 +23,7 @@
 #include <fcntl.h>
 #include <unistd.h>
 #include <sys/time.h>
 #include <fcntl.h>
 #include <unistd.h>
 #include <sys/time.h>

-#include "libsigrok.h"
+#include <libsigrok/libsigrok.h>

 #include "libsigrok-internal.h"
 
 #define LOG_PREFIX "input/binary"
 #include "libsigrok-internal.h"
 
 #define LOG_PREFIX "input/binary"

diff --git a/src/input/chronovu_la8.c b/src/input/chronovu_la8.c
index e62d2c70a30f5eb39b9e48d3d6c75c1826f64179..97eac15040850d0fa4977b1c461a2c916471a7bf 100644 (file)
--- a/src/input/chronovu_la8.c
+++ b/src/input/chronovu_la8.c
@@ -22,7 +22,7 @@
 #include <fcntl.h>
 #include <unistd.h>
 #include <sys/stat.h>
 #include <fcntl.h>
 #include <unistd.h>
 #include <sys/stat.h>

-#include "libsigrok.h"
+#include <libsigrok/libsigrok.h>

 #include "libsigrok-internal.h"
 
 #define LOG_PREFIX "input/chronovu-la8"
 #include "libsigrok-internal.h"
 
 #define LOG_PREFIX "input/chronovu-la8"

diff --git a/src/input/csv.c b/src/input/csv.c
index f4f11f25d18bd21287745620c3c61b93fce1cb3b..cc09045aa281919a88580e681149724c7519300f 100644 (file)
--- a/src/input/csv.c
+++ b/src/input/csv.c
@@ -20,7 +20,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <glib.h>
 #include <stdlib.h>
 #include <string.h>
 #include <glib.h>

-#include "libsigrok.h"
+#include <libsigrok/libsigrok.h>

 #include "libsigrok-internal.h"
 
 #define LOG_PREFIX "input/csv"
 #include "libsigrok-internal.h"
 
 #define LOG_PREFIX "input/csv"

diff --git a/src/input/input.c b/src/input/input.c
index 4b36c887c45028db3c1a2b3030c8c94ebd58a3a7..8e51e3f96b7285d23611d77b8ac8d46083ce1593 100644 (file)
--- a/src/input/input.c
+++ b/src/input/input.c
@@ -23,7 +23,7 @@
 #include <unistd.h>
 #include <fcntl.h>
 #include <errno.h>
 #include <unistd.h>
 #include <fcntl.h>
 #include <errno.h>

-#include "libsigrok.h"
+#include <libsigrok/libsigrok.h>

 #include "libsigrok-internal.h"
 
 /** @cond PRIVATE */
 #include "libsigrok-internal.h"
 
 /** @cond PRIVATE */

diff --git a/src/input/vcd.c b/src/input/vcd.c
index ad0ba7f03d3c839d1b3ee40a862c07fc4ce6826b..0ca7705a08bd6afb441c7f51848aee0968105972 100644 (file)
--- a/src/input/vcd.c
+++ b/src/input/vcd.c
@@ -61,7 +61,7 @@
 #include <glib.h>
 #include <stdio.h>
 #include <string.h>
 #include <glib.h>
 #include <stdio.h>
 #include <string.h>

-#include "libsigrok.h"
+#include <libsigrok/libsigrok.h>

 #include "libsigrok-internal.h"
 
 #define LOG_PREFIX "input/vcd"
 #include "libsigrok-internal.h"
 
 #define LOG_PREFIX "input/vcd"

diff --git a/src/input/wav.c b/src/input/wav.c
index 4f36e8c45126aac8791a55ddef31563bab0db2cc..f2d5db0dfcc21075293c3d9350573aff820410e8 100644 (file)
--- a/src/input/wav.c
+++ b/src/input/wav.c
@@ -24,7 +24,7 @@
 #include <ctype.h>
 #include <string.h>
 #include <stdint.h>
 #include <ctype.h>
 #include <string.h>
 #include <stdint.h>

-#include "libsigrok.h"
+#include <libsigrok/libsigrok.h>

 #include "libsigrok-internal.h"
 
 #define LOG_PREFIX "input/wav"
 #include "libsigrok-internal.h"
 
 #define LOG_PREFIX "input/wav"

diff --git a/src/lcr/es51919.c b/src/lcr/es51919.c
index 06d05d0ff22e2fec3357c16904fedf6bedf0d05c..0e8635f6d06556de841cf1f127927d572ce72983 100644 (file)
--- a/src/lcr/es51919.c
+++ b/src/lcr/es51919.c
@@ -21,7 +21,7 @@
 #include <string.h>
 #include <math.h>
 #include <glib.h>
 #include <string.h>
 #include <math.h>
 #include <glib.h>

-#include "libsigrok.h"
+#include <libsigrok/libsigrok.h>

 #include "libsigrok-internal.h"
 
 #define LOG_PREFIX "es51919"
 #include "libsigrok-internal.h"
 
 #define LOG_PREFIX "es51919"

diff --git a/src/log.c b/src/log.c
index db16c30dabb00597d438307196a19a310b01104f..4750a5bef6a2c13a078e5a1783d956dd63113de6 100644 (file)
--- a/src/log.c
+++ b/src/log.c
@@ -20,7 +20,7 @@
 
 #include <stdarg.h>
 #include <stdio.h>
 
 #include <stdarg.h>
 #include <stdio.h>

-#include "libsigrok.h"
+#include <libsigrok/libsigrok.h>

 /** @cond PRIVATE */
 #define NO_LOG_WRAPPERS
 /** @endcond */
 /** @cond PRIVATE */
 #define NO_LOG_WRAPPERS
 /** @endcond */

diff --git a/src/modbus/modbus.c b/src/modbus/modbus.c
index ee0183318740d5a2e850875c721327ddc0d79b00..e91f6f5e371042347536117c79d71952663af082 100644 (file)
--- a/src/modbus/modbus.c
+++ b/src/modbus/modbus.c
@@ -19,7 +19,7 @@
 
 #include <glib.h>
 #include <string.h>
 
 #include <glib.h>
 #include <string.h>

-#include "libsigrok.h"
+#include <libsigrok/libsigrok.h>

 #include "libsigrok-internal.h"
 
 #define LOG_PREFIX "modbus"
 #include "libsigrok-internal.h"
 
 #define LOG_PREFIX "modbus"

diff --git a/src/modbus/modbus_serial_rtu.c b/src/modbus/modbus_serial_rtu.c
index d8cb046d797917510ba5c01f45c26b8a9732cbd3..b723020ba257064d492dd0d111d5b27102645656 100644 (file)
--- a/src/modbus/modbus_serial_rtu.c
+++ b/src/modbus/modbus_serial_rtu.c
@@ -20,7 +20,7 @@
 #include <glib.h>
 #include <stdlib.h>
 #include <string.h>
 #include <glib.h>
 #include <stdlib.h>
 #include <string.h>

-#include "libsigrok.h"
+#include <libsigrok/libsigrok.h>

 #include "libsigrok-internal.h"
 
 #define LOG_PREFIX "modbus_serial"
 #include "libsigrok-internal.h"
 
 #define LOG_PREFIX "modbus_serial"

diff --git a/src/output/analog.c b/src/output/analog.c
index ff5e91f32f092eb60e67ff29e35d1ad90ca17a41..ed8e163e4984f7ec3b626cd29e38867f369c5ad5 100644 (file)
--- a/src/output/analog.c
+++ b/src/output/analog.c
@@ -21,7 +21,7 @@
 #include <string.h>
 #include <math.h>
 #include <glib.h>
 #include <string.h>
 #include <math.h>
 #include <glib.h>

-#include "libsigrok.h"
+#include <libsigrok/libsigrok.h>

 #include "libsigrok-internal.h"
 
 #define LOG_PREFIX "output/analog"
 #include "libsigrok-internal.h"
 
 #define LOG_PREFIX "output/analog"

diff --git a/src/output/ascii.c b/src/output/ascii.c
index e50724169ea04a69224c1813c765dad79f4f8092..f45081f1e90aef1279f605233b50f84af5d66d1a 100644 (file)
--- a/src/output/ascii.c
+++ b/src/output/ascii.c
@@ -21,7 +21,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <glib.h>
 #include <stdlib.h>
 #include <string.h>
 #include <glib.h>

-#include "libsigrok.h"
+#include <libsigrok/libsigrok.h>

 #include "libsigrok-internal.h"
 
 #define LOG_PREFIX "output/hex"
 #include "libsigrok-internal.h"
 
 #define LOG_PREFIX "output/hex"

diff --git a/src/output/binary.c b/src/output/binary.c
index 4037d9e909db5b446f2ec31c22e1d055ad62f309..196aa4751a3975f0d327692376d206708ae2b77d 100644 (file)
--- a/src/output/binary.c
+++ b/src/output/binary.c
@@ -21,7 +21,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <glib.h>
 #include <stdlib.h>
 #include <string.h>
 #include <glib.h>

-#include "libsigrok.h"
+#include <libsigrok/libsigrok.h>

 #include "libsigrok-internal.h"
 
 #define LOG_PREFIX "output/binary"
 #include "libsigrok-internal.h"
 
 #define LOG_PREFIX "output/binary"

diff --git a/src/output/bits.c b/src/output/bits.c
index a26424d5968913a33ed86f8a6339c3a20f8c6b72..eb134b4e699b770bdc06116e80a15e43fbf9e540 100644 (file)
--- a/src/output/bits.c
+++ b/src/output/bits.c
@@ -20,7 +20,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <glib.h>
 #include <stdlib.h>
 #include <string.h>
 #include <glib.h>

-#include "libsigrok.h"
+#include <libsigrok/libsigrok.h>

 #include "libsigrok-internal.h"
 
 #define LOG_PREFIX "output/bits"
 #include "libsigrok-internal.h"
 
 #define LOG_PREFIX "output/bits"

diff --git a/src/output/chronovu_la8.c b/src/output/chronovu_la8.c
index cfabf4cd99fa6f057f205e904562675636799020..acb499d3915cb68ccfc1806bd9b325515b49be6e 100644 (file)
--- a/src/output/chronovu_la8.c
+++ b/src/output/chronovu_la8.c
@@ -21,7 +21,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <glib.h>
 #include <stdlib.h>
 #include <string.h>
 #include <glib.h>

-#include "libsigrok.h"
+#include <libsigrok/libsigrok.h>

 #include "libsigrok-internal.h"
 
 #define LOG_PREFIX "output/chronovu-la8"
 #include "libsigrok-internal.h"
 
 #define LOG_PREFIX "output/chronovu-la8"

diff --git a/src/output/csv.c b/src/output/csv.c
index 5f0d647c3d5605be98cc1c883b85be2a29b377ef..36cf2e86931b6cb7cd1552eb42716f4191dec6e3 100644 (file)
--- a/src/output/csv.c
+++ b/src/output/csv.c
@@ -22,7 +22,7 @@
 #include <string.h>
 #include <glib.h>
 #include "config.h" /* Needed for PACKAGE_STRING and others. */
 #include <string.h>
 #include <glib.h>
 #include "config.h" /* Needed for PACKAGE_STRING and others. */

-#include "libsigrok.h"
+#include <libsigrok/libsigrok.h>

 #include "libsigrok-internal.h"
 
 #define LOG_PREFIX "output/csv"
 #include "libsigrok-internal.h"
 
 #define LOG_PREFIX "output/csv"

diff --git a/src/output/gnuplot.c b/src/output/gnuplot.c
index fc3c15ac7c04e554abb223a1a3b05212da3d77af..111dcadf26b6b4a4f8d2d14bb54d42616435bb67 100644 (file)
--- a/src/output/gnuplot.c
+++ b/src/output/gnuplot.c
@@ -22,7 +22,7 @@
 #include <string.h>
 #include <glib.h>
 #include "config.h" /* Needed for PACKAGE_STRING and others. */
 #include <string.h>
 #include <glib.h>
 #include "config.h" /* Needed for PACKAGE_STRING and others. */

-#include "libsigrok.h"
+#include <libsigrok/libsigrok.h>

 #include "libsigrok-internal.h"
 
 #define LOG_PREFIX "output/gnuplot"
 #include "libsigrok-internal.h"
 
 #define LOG_PREFIX "output/gnuplot"

diff --git a/src/output/hex.c b/src/output/hex.c
index a499e354e6aa5daaa554125fa1cc2e1e2d65c6c3..52c33a10cf2727720f613928d9edee6474b22c42 100644 (file)
--- a/src/output/hex.c
+++ b/src/output/hex.c
@@ -20,7 +20,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <glib.h>
 #include <stdlib.h>
 #include <string.h>
 #include <glib.h>

-#include "libsigrok.h"
+#include <libsigrok/libsigrok.h>

 #include "libsigrok-internal.h"
 
 #define LOG_PREFIX "output/hex"
 #include "libsigrok-internal.h"
 
 #define LOG_PREFIX "output/hex"

diff --git a/src/output/ols.c b/src/output/ols.c
index 1202a93ec74cac8ad37f1cdab3138ff859cf620d..55a8dec2650e5843b14fb8ba9444abfca8f32f0a 100644 (file)
--- a/src/output/ols.c
+++ b/src/output/ols.c
@@ -28,7 +28,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <glib.h>
 #include <stdlib.h>
 #include <string.h>
 #include <glib.h>

-#include "libsigrok.h"
+#include <libsigrok/libsigrok.h>

 #include "libsigrok-internal.h"
 
 #define LOG_PREFIX "output/ols"
 #include "libsigrok-internal.h"
 
 #define LOG_PREFIX "output/ols"

diff --git a/src/output/output.c b/src/output/output.c
index d06002e3307ca687511352e657e6855cf05c4c90..0a9e7f880689bee89308cd9e30dd4e8b9075fce7 100644 (file)
--- a/src/output/output.c
+++ b/src/output/output.c
@@ -18,7 +18,7 @@
  */
 
 #include <string.h>
  */
 
 #include <string.h>

-#include "libsigrok.h"
+#include <libsigrok/libsigrok.h>

 #include "libsigrok-internal.h"
 
 /** @cond PRIVATE */
 #include "libsigrok-internal.h"
 
 /** @cond PRIVATE */

diff --git a/src/output/srzip.c b/src/output/srzip.c
index dd4933345062214b9a87ca5bac7cfefb1b437dd5..ae066cde228b4f66a240458cf0f803281b0e6db4 100644 (file)
--- a/src/output/srzip.c
+++ b/src/output/srzip.c
@@ -24,7 +24,7 @@
 #include <glib.h>
 #include <glib/gstdio.h>
 #include <zip.h>
 #include <glib.h>
 #include <glib/gstdio.h>
 #include <zip.h>

-#include "libsigrok.h"
+#include <libsigrok/libsigrok.h>

 #include "libsigrok-internal.h"
 
 #define LOG_PREFIX "output/srzip"
 #include "libsigrok-internal.h"
 
 #define LOG_PREFIX "output/srzip"

diff --git a/src/output/vcd.c b/src/output/vcd.c
index 7403d575600862a7b180ec25dc3548997113ccdf..8dd503a273ea42649458284a0c22a8c3d177e221 100644 (file)
--- a/src/output/vcd.c
+++ b/src/output/vcd.c
@@ -23,7 +23,7 @@
 #include <string.h>
 #include <glib.h>
 #include "config.h" /* Needed for PACKAGE and others. */
 #include <string.h>
 #include <glib.h>
 #include "config.h" /* Needed for PACKAGE and others. */

-#include "libsigrok.h"
+#include <libsigrok/libsigrok.h>

 #include "libsigrok-internal.h"
 
 #define LOG_PREFIX "output/vcd"
 #include "libsigrok-internal.h"
 
 #define LOG_PREFIX "output/vcd"

diff --git a/src/output/wav.c b/src/output/wav.c
index a16f45eaca320115bc576673d6317360843e7e3d..c23602354d969abc078e52f1cf39c0bf63fd4b61 100644 (file)
--- a/src/output/wav.c
+++ b/src/output/wav.c
@@ -18,7 +18,7 @@
  */
 
 #include <string.h>
  */
 
 #include <string.h>

-#include "libsigrok.h"
+#include <libsigrok/libsigrok.h>

 #include "libsigrok-internal.h"
 
 #define LOG_PREFIX "output/wav"
 #include "libsigrok-internal.h"
 
 #define LOG_PREFIX "output/wav"

diff --git a/src/scpi/scpi.c b/src/scpi/scpi.c
index c3ef6ff74c4b9527f7080beca92f5cc8dcddabe6..baf6e79f5445fe6b6e7e342c6bc750f8a597a823 100644 (file)
--- a/src/scpi/scpi.c
+++ b/src/scpi/scpi.c
@@ -19,7 +19,7 @@
 
 #include <glib.h>
 #include <string.h>
 
 #include <glib.h>
 #include <string.h>

-#include "libsigrok.h"
+#include <libsigrok/libsigrok.h>

 #include "libsigrok-internal.h"
 
 #define LOG_PREFIX "scpi"
 #include "libsigrok-internal.h"
 
 #define LOG_PREFIX "scpi"

diff --git a/src/scpi/scpi_libgpib.c b/src/scpi/scpi_libgpib.c
index cd098e8965ddaa531937bddf6e0192db187d7a99..62d99c0a371851135eec88c799225b42d164c9f1 100644 (file)
--- a/src/scpi/scpi_libgpib.c
+++ b/src/scpi/scpi_libgpib.c
@@ -19,7 +19,7 @@
 
 #include <gpib/ib.h>
 #include <string.h>
 
 #include <gpib/ib.h>
 #include <string.h>

-#include "libsigrok.h"
+#include <libsigrok/libsigrok.h>

 #include "libsigrok-internal.h"
 
 #define LOG_PREFIX "scpi_gpib"
 #include "libsigrok-internal.h"
 
 #define LOG_PREFIX "scpi_gpib"

diff --git a/src/scpi/scpi_serial.c b/src/scpi/scpi_serial.c
index 68a684c2d40fd4758c34f5a6d4b93d29ef76a836..fae623ba646ad68170fd3257e4d6507cd0a14a93 100644 (file)
--- a/src/scpi/scpi_serial.c
+++ b/src/scpi/scpi_serial.c
@@ -21,7 +21,7 @@
 #include <glib.h>
 #include <stdlib.h>
 #include <string.h>
 #include <glib.h>
 #include <stdlib.h>
 #include <string.h>

-#include "libsigrok.h"
+#include <libsigrok/libsigrok.h>

 #include "libsigrok-internal.h"
 
 #define LOG_PREFIX "scpi_serial"
 #include "libsigrok-internal.h"
 
 #define LOG_PREFIX "scpi_serial"

diff --git a/src/scpi/scpi_tcp.c b/src/scpi/scpi_tcp.c
index 7b3c9155d2026e99472365215f8cf9da1510312d..7e891dbc9ff75ed2c20f7137e21cd6179f2b64c9 100644 (file)
--- a/src/scpi/scpi_tcp.c
+++ b/src/scpi/scpi_tcp.c
@@ -32,7 +32,7 @@
 #include <netdb.h>
 #endif
 #include <errno.h>
 #include <netdb.h>
 #endif
 #include <errno.h>

-#include "libsigrok.h"
+#include <libsigrok/libsigrok.h>

 #include "libsigrok-internal.h"
 
 #define LOG_PREFIX "scpi_tcp"
 #include "libsigrok-internal.h"
 
 #define LOG_PREFIX "scpi_tcp"

diff --git a/src/scpi/scpi_usbtmc_libusb.c b/src/scpi/scpi_usbtmc_libusb.c
index c143e599936654802f34f43793764ed27428b354..351f815816876138df4c058042f9b04d031888c0 100644 (file)
--- a/src/scpi/scpi_usbtmc_libusb.c
+++ b/src/scpi/scpi_usbtmc_libusb.c
@@ -18,7 +18,7 @@
  */
 
 #include <string.h>
  */
 
 #include <string.h>

-#include "libsigrok.h"
+#include <libsigrok/libsigrok.h>

 #include "libsigrok-internal.h"
 
 #define LOG_PREFIX "scpi_usbtmc"
 #include "libsigrok-internal.h"
 
 #define LOG_PREFIX "scpi_usbtmc"

diff --git a/src/scpi/scpi_visa.c b/src/scpi/scpi_visa.c
index 34ac9455d09038e97f21570df16634d655f5ac0b..4b9056665b1579f0d5109a322b71534fd6ccf60b 100644 (file)
--- a/src/scpi/scpi_visa.c
+++ b/src/scpi/scpi_visa.c
@@ -19,7 +19,7 @@
 
 #include <visa.h>
 #include <string.h>
 
 #include <visa.h>
 #include <string.h>

-#include "libsigrok.h"
+#include <libsigrok/libsigrok.h>

 #include "libsigrok-internal.h"
 
 #define LOG_PREFIX "scpi_visa"
 #include "libsigrok-internal.h"
 
 #define LOG_PREFIX "scpi_visa"

diff --git a/src/scpi/scpi_vxi.c b/src/scpi/scpi_vxi.c
index e7e48d62776e8974e94abccff8fd469729fd1b30..2526b487fbf932bf27b9f3377c4f4df142c77a21 100644 (file)
--- a/src/scpi/scpi_vxi.c
+++ b/src/scpi/scpi_vxi.c
@@ -23,7 +23,7 @@
 #include <rpc/rpc.h>
 #include <string.h>
 #include "vxi.h"
 #include <rpc/rpc.h>
 #include <string.h>
 #include "vxi.h"

-#include "libsigrok.h"
+#include <libsigrok/libsigrok.h>

 #include "libsigrok-internal.h"
 
 #define LOG_PREFIX "scpi_vxi"
 #include "libsigrok-internal.h"
 
 #define LOG_PREFIX "scpi_vxi"

diff --git a/src/serial.c b/src/serial.c
index 959413b650ffcdce338ec2c13082afeae924033c..d3cacba932c53aad89c4fdacdb782bce1c61f04f 100644 (file)
--- a/src/serial.c
+++ b/src/serial.c
@@ -25,7 +25,7 @@
 #include <glib.h>
 #include <glib/gstdio.h>
 #include <libserialport.h>
 #include <glib.h>
 #include <glib/gstdio.h>
 #include <libserialport.h>

-#include "libsigrok.h"
+#include <libsigrok/libsigrok.h>

 #include "libsigrok-internal.h"
 
 /** @cond PRIVATE */
 #include "libsigrok-internal.h"
 
 /** @cond PRIVATE */

diff --git a/src/session.c b/src/session.c
index a3f6a86d3ef8226659f67f5fc222ed44726bf14c..2ab3f7eb83c0c68f48d6a36314864082f32062e5 100644 (file)
--- a/src/session.c
+++ b/src/session.c
@@ -22,7 +22,7 @@
 #include <unistd.h>
 #include <string.h>
 #include <glib.h>
 #include <unistd.h>
 #include <string.h>
 #include <glib.h>

-#include "libsigrok.h"
+#include <libsigrok/libsigrok.h>

 #include "libsigrok-internal.h"
 
 /** @cond PRIVATE */
 #include "libsigrok-internal.h"
 
 /** @cond PRIVATE */

diff --git a/src/session_driver.c b/src/session_driver.c
index 91c05404316620fbeae853ba983893922b2d160c..72011d2f3775243a1a7b48b7584a506f4fff5e0b 100644 (file)
--- a/src/session_driver.c
+++ b/src/session_driver.c
@@ -23,7 +23,7 @@
 #include <unistd.h>
 #include <sys/time.h>
 #include <zip.h>
 #include <unistd.h>
 #include <sys/time.h>
 #include <zip.h>

-#include "libsigrok.h"
+#include <libsigrok/libsigrok.h>

 #include "libsigrok-internal.h"
 
 #define LOG_PREFIX "virtual-session"
 #include "libsigrok-internal.h"
 
 #define LOG_PREFIX "virtual-session"

diff --git a/src/session_file.c b/src/session_file.c
index 9a1e316e8fd0411158215d011d9ed91b8d7fc00d..e0c544bfc42e579f5f78bc5b150789fc55035e04 100644 (file)
--- a/src/session_file.c
+++ b/src/session_file.c
@@ -27,7 +27,7 @@
 #include <glib.h>
 #include <glib/gstdio.h>
 #include "config.h" /* Needed for PACKAGE_VERSION and others. */
 #include <glib.h>
 #include <glib/gstdio.h>
 #include "config.h" /* Needed for PACKAGE_VERSION and others. */

-#include "libsigrok.h"
+#include <libsigrok/libsigrok.h>

 #include "libsigrok-internal.h"
 
 /** @cond PRIVATE */
 #include "libsigrok-internal.h"
 
 /** @cond PRIVATE */

diff --git a/src/soft-trigger.c b/src/soft-trigger.c
index 9c3963d3acf651baa3f19f9076c23bb5fb070841..116e7b34f3086db0d82d9413c802aaceb58a0e89 100644 (file)
--- a/src/soft-trigger.c
+++ b/src/soft-trigger.c
@@ -18,7 +18,7 @@
  */
 
 #include <string.h>
  */
 
 #include <string.h>

-#include "libsigrok.h"
+#include <libsigrok/libsigrok.h>

 #include "libsigrok-internal.h"
 
 /* @cond PRIVATE */
 #include "libsigrok-internal.h"
 
 /* @cond PRIVATE */

diff --git a/src/std.c b/src/std.c
index 5b97f66a857696f09998b30732ec6956f3649c5f..b9757381291236083ba6acfd8c75ad3d556b47c1 100644 (file)
--- a/src/std.c
+++ b/src/std.c
@@ -24,7 +24,7 @@
   */
 
 #include <glib.h>
   */
 
 #include <glib.h>

-#include "libsigrok.h"
+#include <libsigrok/libsigrok.h>

 #include "libsigrok-internal.h"
 
 #define LOG_PREFIX "std"
 #include "libsigrok-internal.h"
 
 #define LOG_PREFIX "std"

diff --git a/src/strutil.c b/src/strutil.c
index ae2b7dd3cd55bb20398dc30584186b857c1522da..bb5913f392ca434aa15407f436f74746815201d0 100644 (file)
--- a/src/strutil.c
+++ b/src/strutil.c
@@ -23,7 +23,7 @@
 #include <string.h>
 #include <strings.h>
 #include <errno.h>
 #include <string.h>
 #include <strings.h>
 #include <errno.h>

-#include "libsigrok.h"
+#include <libsigrok/libsigrok.h>

 #include "libsigrok-internal.h"
 
 /** @cond PRIVATE */
 #include "libsigrok-internal.h"
 
 /** @cond PRIVATE */

diff --git a/src/transform/invert.c b/src/transform/invert.c
index 9f4dcea87a58421f1ce87d0f4fa153f5aba189d8..5a64afac5d06324aa42af396cea0352a0c4095c7 100644 (file)
--- a/src/transform/invert.c
+++ b/src/transform/invert.c
@@ -19,7 +19,7 @@
  */
 
 #include <string.h>
  */
 
 #include <string.h>

-#include "libsigrok.h"
+#include <libsigrok/libsigrok.h>

 #include "libsigrok-internal.h"
 
 #define LOG_PREFIX "transform/invert"
 #include "libsigrok-internal.h"
 
 #define LOG_PREFIX "transform/invert"

diff --git a/src/transform/nop.c b/src/transform/nop.c
index 8de2f2d743019adc179a9aee11f71edca1e3998b..56251bd1caba5d33fbe7cf9462b3ff0d10b8d1d4 100644 (file)
--- a/src/transform/nop.c
+++ b/src/transform/nop.c
@@ -19,7 +19,7 @@
  */
 
 #include <string.h>
  */
 
 #include <string.h>

-#include "libsigrok.h"
+#include <libsigrok/libsigrok.h>

 #include "libsigrok-internal.h"
 
 #define LOG_PREFIX "transform/nop"
 #include "libsigrok-internal.h"
 
 #define LOG_PREFIX "transform/nop"

diff --git a/src/transform/scale.c b/src/transform/scale.c
index 6d3769b35c604cdb7ec4610309d6ba248e08c8f9..5b9c99c5bda19d1e9ad6356699e9d4e81299aee4 100644 (file)
--- a/src/transform/scale.c
+++ b/src/transform/scale.c
@@ -19,7 +19,7 @@
  */
 
 #include <string.h>
  */
 
 #include <string.h>

-#include "libsigrok.h"
+#include <libsigrok/libsigrok.h>

 #include "libsigrok-internal.h"
 
 #define LOG_PREFIX "transform/scale"
 #include "libsigrok-internal.h"
 
 #define LOG_PREFIX "transform/scale"

diff --git a/src/transform/transform.c b/src/transform/transform.c
index 9e585a09a2619cdb0f251c3955002b5582f68ef6..b518088bd8e625f438f1f32d02fd576209651494 100644 (file)
--- a/src/transform/transform.c
+++ b/src/transform/transform.c
@@ -19,7 +19,7 @@
  */
 
 #include <string.h>
  */
 
 #include <string.h>

-#include "libsigrok.h"
+#include <libsigrok/libsigrok.h>

 #include "libsigrok-internal.h"
 
 /** @cond PRIVATE */
 #include "libsigrok-internal.h"
 
 /** @cond PRIVATE */

diff --git a/src/trigger.c b/src/trigger.c
index 974b431cd0b9e155c005333306b807e83d03fb3a..34474982b678de0bc5144a5553f7a0b51a3c65ed 100644 (file)
--- a/src/trigger.c
+++ b/src/trigger.c
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 

-#include "libsigrok.h"
+#include <libsigrok/libsigrok.h>

 #include "libsigrok-internal.h"
 
 /* * @cond PRIVATE */
 #include "libsigrok-internal.h"
 
 /* * @cond PRIVATE */

diff --git a/src/usb.c b/src/usb.c
index b0ea618cd573019d4f6f4094e09a142f4eb97e04..7fe1eff6e5b0bdba7608127ecbd065d39dcd6bc5 100644 (file)
--- a/src/usb.c
+++ b/src/usb.c
@@ -23,7 +23,7 @@
 #include <memory.h>
 #include <glib.h>
 #include <libusb.h>
 #include <memory.h>
 #include <glib.h>
 #include <libusb.h>

-#include "libsigrok.h"
+#include <libsigrok/libsigrok.h>

 #include "libsigrok-internal.h"
 
 /* SR_CONF_CONN takes one of these: */
 #include "libsigrok-internal.h"
 
 /* SR_CONF_CONN takes one of these: */

diff --git a/src/version.c b/src/version.c
index 3da0c17318e1895b18cde5c903644edf01676914..10bd726d0c1d6a38d81ec133fce060c56c732f01 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -18,7 +18,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 

-#include "libsigrok.h"
+#include <libsigrok/libsigrok.h>

 
 /**
  * @file
 
 /**
  * @file