From: Uwe Hermann <redacted>
Date: Sun, 20 Jul 2014 10:03:29 +0000 (+0200)
Subject: Fix 'make check' invocation wrt new libsigrok.h location.
X-Git-Tag: libsigrok-0.4.0~1236
X-Git-Url: https://sigrok.org/gitweb/?p=libsigrok.git;a=commitdiff_plain;h=6592c3699509213395fa80af5b37f2e4db25ac38

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

diff --git a/Makefile.am b/Makefile.am
index f24f1f5a..ada3f1fa 100644
--- 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 940afebc..bb7dd848 100644
--- 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 d15daaa6..39b713bb 100644
--- 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 ff462603..0e2d6b64 100644
--- 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 9b40f1ef..aad2b04e 100644
--- 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 c4ce1436..9017e92d 100644
--- 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 497a24a6..05b65b76 100644
--- 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 ad67ef24..229392d0 100644
--- 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 37cf370f..694d5c28 100644
--- 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 ad0b3e1f..aca44deb 100644
--- 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 e2e607e3..8f8e3b02 100644
--- 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);