diff --git a/Makefile.am b/Makefile.am
index e1143f33..a7cb8244 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -445,8 +445,8 @@ bindings_cxx_libsigrokcxx_la_LIBADD = libsigrok.la $(glibmm_LIBS)
bindings_cxx_libsigrokcxx_la_LDFLAGS = $(SR_LIB_LDFLAGS)
library_include_HEADERS += \
- bindings/cxx/include/libsigrok/libsigrokcxx.hpp \
- bindings/cxx/include/libsigrok/enums.hpp
+ bindings/cxx/include/libsigrokcxx/libsigrokcxx.hpp \
+ bindings/cxx/include/libsigrokcxx/enums.hpp
pkgconfig_DATA += bindings/cxx/libsigrokcxx.pc
@@ -455,7 +455,7 @@ doxy/xml/index.xml: include/libsigrok/libsigrok.h
bindings/cxx/enums.cpp: bindings/cxx/enums.timestamp
-bindings/cxx/include/libsigrok/enums.hpp: bindings/cxx/enums.timestamp
+bindings/cxx/include/libsigrokcxx/enums.hpp: bindings/cxx/enums.timestamp
bindings/cxx/enums.timestamp: bindings/cxx/enums.py doxy/xml/index.xml \
bindings/cxx/ConfigKey_methods.cpp bindings/cxx/QuantityFlag_methods.cpp
@@ -469,7 +469,7 @@ cxx-clean:
rm -rf doxy/
rm -rf bindings/cxx/doxy/
rm -f bindings/cxx/enums.cpp
- rm -f bindings/cxx/include/libsigrok/enums.hpp
+ rm -f bindings/cxx/include/libsigrokcxx/enums.hpp
rm -f bindings/cxx/enums.timestamp
CLEAN_EXTRA += cxx-clean
@@ -478,7 +478,7 @@ endif
CPPXMLDOC = bindings/cxx/doxy/xml/index.xml
-$(CPPXMLDOC): bindings/cxx/include/libsigrok/libsigrokcxx.hpp \
+$(CPPXMLDOC): bindings/cxx/include/libsigrokcxx/libsigrokcxx.hpp \
bindings/cxx/enums.timestamp
$(AM_V_GEN)cd $(srcdir)/bindings/cxx && BUILDDIR=$(abs_builddir)/bindings/cxx/ doxygen Doxyfile 2>/dev/null
diff --git a/bindings/cxx/Doxyfile b/bindings/cxx/Doxyfile
index c56b336b..73e86538 100644
--- a/bindings/cxx/Doxyfile
+++ b/bindings/cxx/Doxyfile
@@ -743,7 +743,7 @@ WARN_LOGFILE =
# spaces.
# Note: If this tag is empty the current directory is searched.
-INPUT = include/libsigrok/libsigrokcxx.hpp
+INPUT = include/libsigrokcxx/libsigrokcxx.hpp
# This tag can be used to specify the character encoding of the source files
# that doxygen parses. Internally doxygen uses the UTF-8 encoding. Doxygen uses
diff --git a/bindings/cxx/classes.cpp b/bindings/cxx/classes.cpp
index 3298ce34..9dc003ac 100644
--- a/bindings/cxx/classes.cpp
+++ b/bindings/cxx/classes.cpp
@@ -17,7 +17,7 @@
* along with this program. If not, see .
*/
-#include "libsigrok/libsigrokcxx.hpp"
+#include "libsigrokcxx/libsigrokcxx.hpp"
#include
#include
diff --git a/bindings/cxx/enums.py b/bindings/cxx/enums.py
index bfc06b59..53bd000d 100644
--- a/bindings/cxx/enums.py
+++ b/bindings/cxx/enums.py
@@ -28,8 +28,8 @@ index_file = sys.argv[1]
dirname = os.path.dirname(os.path.realpath(__file__))
outdirname = "bindings/cxx"
-if not os.path.exists(os.path.join(outdirname, 'include/libsigrok')):
- os.makedirs(os.path.join(outdirname, 'include/libsigrok'))
+if not os.path.exists(os.path.join(outdirname, 'include/libsigrokcxx')):
+ os.makedirs(os.path.join(outdirname, 'include/libsigrokcxx'))
mapping = dict([
('sr_loglevel', ('LogLevel', 'Log verbosity level')),
@@ -65,7 +65,7 @@ for compound in index.findall('compound'):
if name in mapping:
classes[member] = mapping[name]
-header = open(os.path.join(outdirname, 'include/libsigrok/enums.hpp'), 'w')
+header = open(os.path.join(outdirname, 'include/libsigrokcxx/enums.hpp'), 'w')
code = open(os.path.join(outdirname, 'enums.cpp'), 'w')
swig = open(os.path.join(dirname, '../swig/enums.i'), 'w')
diff --git a/bindings/cxx/include/libsigrok/libsigrokcxx.hpp b/bindings/cxx/include/libsigrokcxx/libsigrokcxx.hpp
similarity index 100%
rename from bindings/cxx/include/libsigrok/libsigrokcxx.hpp
rename to bindings/cxx/include/libsigrokcxx/libsigrokcxx.hpp
diff --git a/bindings/python/setup.py b/bindings/python/setup.py
index 0002c1d4..b22a6e9b 100644
--- a/bindings/python/setup.py
+++ b/bindings/python/setup.py
@@ -35,7 +35,7 @@ sr_includes, sr_lib_dirs, sr_libs, (sr_version,) = [
includes = ['../../include', '../cxx/include']
includes += [os.path.join(srcdir, path) for path in includes]
-includes += ['../..', '../../include/libsigrok', '../cxx/include/libsigrok']
+includes += ['../..', '../../include/libsigrok', '../cxx/include/libsigrokcxx']
includes += [i[2:] for i in sr_includes]
includes += [np.get_include(), ]
libdirs = ['../../.libs', '../cxx/.libs'] + [l[2:] for l in sr_lib_dirs]
diff --git a/bindings/python/sigrok/core/classes.i b/bindings/python/sigrok/core/classes.i
index 75f20ea5..12b01a52 100644
--- a/bindings/python/sigrok/core/classes.i
+++ b/bindings/python/sigrok/core/classes.i
@@ -353,7 +353,7 @@ typedef guint pyg_flags_type;
%{
-#include "libsigrok/libsigrokcxx.hpp"
+#include "libsigrokcxx/libsigrokcxx.hpp"
/* Convert from a Python dict to a std::map */
std::map dict_to_map_string(PyObject *dict)
diff --git a/bindings/swig/classes.i b/bindings/swig/classes.i
index 55482555..cdb9f0e7 100644
--- a/bindings/swig/classes.i
+++ b/bindings/swig/classes.i
@@ -20,7 +20,7 @@
#pragma SWIG nowarn=325,401
%{
-#include "libsigrok/libsigrokcxx.hpp"
+#include "libsigrokcxx/libsigrokcxx.hpp"
using namespace std;
%}
@@ -271,10 +271,10 @@ typedef std::map
%attribute(sigrok::Analog, const sigrok::Unit *, unit, unit);
%attributevector(Analog, std::vector, mq_flags, mq_flags);
-%include "libsigrok/libsigrokcxx.hpp"
+%include "libsigrokcxx/libsigrokcxx.hpp"
%include "enums.i"
namespace sigrok {
-%include "libsigrok/enums.hpp"
+%include "libsigrokcxx/enums.hpp"
}
diff --git a/configure.ac b/configure.ac
index 5f9cf652..d2340bea 100644
--- a/configure.ac
+++ b/configure.ac
@@ -430,7 +430,7 @@ AC_CHECK_HEADERS([sys/mman.h sys/ioctl.h], [], [HW_BEAGLELOGIC="no"])
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/libsigrok -I${srcdir}/bindings/cxx/include $LIB_CFLAGS"
+CXXFLAGS="$CXXFLAGS -Iinclude/libsigrok -I${srcdir}/include -Ibindings/cxx -Ibindings/cxx/include/libsigrokcxx -I${srcdir}/bindings/cxx/include $LIB_CFLAGS"
# Find Java compiler and JNI includes for Java bindings.
AC_CHECK_PROG([HAVE_JAVAC], [javac], [yes], [no])