Fix 'make check' invocation wrt new libsigrok.h location.

diff --git a/Makefile.am b/Makefile.am
index f24f1f5aa367389ad4908af1c4c975b770fe942d..ada3f1fa1b1a01b79cb800f9d7c69c1812c910dd 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -361,7 +361,7 @@ TESTS = tests/check_main
 check_PROGRAMS = ${TESTS}
 
 tests_check_main_SOURCES = \
-       libsigrok.h \
+       include/libsigrok/libsigrok.h \
        tests/lib.c \
        tests/lib.h \
        tests/check_main.c \

diff --git a/tests/check_core.c b/tests/check_core.c
index 940afebc90434d11b258e3cc384c3b20f9561e55..bb7dd8486c526423fcefd77e9ab1b51109e04f17 100644 (file)
--- a/tests/check_core.c
+++ b/tests/check_core.c
@@ -20,7 +20,7 @@
 
 #include <stdlib.h>
 #include <check.h>
-#include "../libsigrok.h"
+#include "../include/libsigrok/libsigrok.h"
 #include "lib.h"
 
 /*

diff --git a/tests/check_driver_all.c b/tests/check_driver_all.c
index d15daaa695f283dda3264708cf412eb05f8ad1e7..39b713bbb66be559f5c1975a05d80827fffd2c84 100644 (file)
--- a/tests/check_driver_all.c
+++ b/tests/check_driver_all.c
@@ -20,7 +20,7 @@
 
 #include <stdlib.h>
 #include <check.h>
-#include "../libsigrok.h"
+#include "../include/libsigrok/libsigrok.h"
 #include "lib.h"
 
 struct sr_context *sr_ctx;

diff --git a/tests/check_input_all.c b/tests/check_input_all.c
index ff46260368f35791e4764b3fb132800b26c590a7..0e2d6b6487f7cf4a490c8c87e28a903d4b76051e 100644 (file)
--- a/tests/check_input_all.c
+++ b/tests/check_input_all.c
@@ -20,7 +20,7 @@
 
 #include <stdlib.h>
 #include <check.h>
-#include "../libsigrok.h"
+#include "../include/libsigrok/libsigrok.h"
 #include "lib.h"
 
 /* Check whether at least one input module is available. */

diff --git a/tests/check_input_binary.c b/tests/check_input_binary.c
index 9b40f1ef3b28ac8c825509be4758cefa86f1fe90..aad2b04e5f9ddcad6e9a59bfc5e4dbed04669d15 100644 (file)
--- a/tests/check_input_binary.c
+++ b/tests/check_input_binary.c
@@ -20,7 +20,7 @@
 
 #include <check.h>
 #include <glib/gstdio.h>
-#include "../libsigrok.h"
+#include "../include/libsigrok/libsigrok.h"
 #include "lib.h"
 
 #define FILENAME               "foo.dat"

diff --git a/tests/check_main.c b/tests/check_main.c
index c4ce14363f3facee807cdf20fe643053a4002a54..9017e92d9ff38de350bc8c791e8aa846ce7eb944 100644 (file)
--- a/tests/check_main.c
+++ b/tests/check_main.c
@@ -20,7 +20,7 @@
 
 #include <stdlib.h>
 #include <check.h>
-#include "../libsigrok.h"
+#include "../include/libsigrok/libsigrok.h"
 #include "lib.h"
 
 int main(void)

diff --git a/tests/check_output_all.c b/tests/check_output_all.c
index 497a24a6d32298c2fda8857dfb2c351b705d0672..05b65b76e4c5c5898a5d01026d957ff346ed37a2 100644 (file)
--- a/tests/check_output_all.c
+++ b/tests/check_output_all.c
@@ -20,7 +20,7 @@
 
 #include <stdlib.h>
 #include <check.h>
-#include "../libsigrok.h"
+#include "../include/libsigrok/libsigrok.h"
 #include "lib.h"
 
 /* Check whether at least one output module is available. */

diff --git a/tests/check_strutil.c b/tests/check_strutil.c
index ad67ef24a2c52afe31512fa0bebd96eee45d427d..229392d0de92c3f9ed3a875941d27bdf315d0948 100644 (file)
--- a/tests/check_strutil.c
+++ b/tests/check_strutil.c
@@ -19,7 +19,7 @@
  */
 
 #include <check.h>
-#include "../libsigrok.h"
+#include "../include/libsigrok/libsigrok.h"
 #include "lib.h"
 
 struct sr_context *sr_ctx;

diff --git a/tests/check_version.c b/tests/check_version.c
index 37cf370f1e2ee05df3bca73655693597018eab00..694d5c28bc23df3f13db21e26488c5b1eda551f6 100644 (file)
--- a/tests/check_version.c
+++ b/tests/check_version.c
@@ -20,7 +20,7 @@
 
 #include <stdlib.h>
 #include <check.h>
-#include "../libsigrok.h"
+#include "../include/libsigrok/libsigrok.h"
 #include "lib.h"
 
 /*

diff --git a/tests/lib.c b/tests/lib.c
index ad0b3e1f38a2c75b9faa043385801e3ce4cc322c..aca44deb94da0041848909626ec2635cc97e1c4b 100644 (file)
--- a/tests/lib.c
+++ b/tests/lib.c
@@ -23,7 +23,7 @@
 #include <glib.h>
 #include <glib/gstdio.h>
 #include <check.h>
-#include "../libsigrok.h"
+#include "../include/libsigrok/libsigrok.h"
 #include "lib.h"
 
 /* Get a libsigrok driver by name. */

diff --git a/tests/lib.h b/tests/lib.h
index e2e607e3d3538de69f88cd9064fe7d61e0d47fd3..8f8e3b02d83a9abe3f4a171142527dd80424b379 100644 (file)
--- a/tests/lib.h
+++ b/tests/lib.h
@@ -21,7 +21,7 @@
 #ifndef LIBSIGROK_TESTS_LIB_H
 #define LIBSIGROK_TESTS_LIB_H
 
-#include "../libsigrok.h"
+#include "../include/libsigrok/libsigrok.h"
 
 struct sr_dev_driver *srtest_driver_get(const char *drivername);
 struct sr_input_format *srtest_input_get(const char *id);