Rename libsigrokxx to the more common libsigrokcxx.

diff --git a/Makefile.am b/Makefile.am
index 664a58f527089a6bc5aa4bb976d95dc132971fd5..aff066919abae93299b98cd80529cfd9bc4b61c2 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -436,19 +436,19 @@ CLEAN_EXTRA =
 
 if BINDINGS_CXX
 
-lib_LTLIBRARIES += bindings/cxx/libsigrokxx.la
+lib_LTLIBRARIES += bindings/cxx/libsigrokcxx.la
 
-bindings_cxx_libsigrokxx_la_SOURCES = bindings/cxx/classes.cpp
+bindings_cxx_libsigrokcxx_la_SOURCES = bindings/cxx/classes.cpp
 
-bindings_cxx_libsigrokxx_la_LIBADD = libsigrok.la $(glibmm_LIBS)
+bindings_cxx_libsigrokcxx_la_LIBADD = libsigrok.la $(glibmm_LIBS)
 
-bindings_cxx_libsigrokxx_la_LDFLAGS = $(SR_LIB_LDFLAGS)
+bindings_cxx_libsigrokcxx_la_LDFLAGS = $(SR_LIB_LDFLAGS)
 
 library_include_HEADERS += \
        bindings/cxx/include/libsigrok/libsigrok.hpp \
        bindings/cxx/include/libsigrok/enums.hpp
 
-pkgconfig_DATA += bindings/cxx/libsigrokxx.pc
+pkgconfig_DATA += bindings/cxx/libsigrokcxx.pc
 
 doxy/xml/index.xml: include/libsigrok/libsigrok.h
        $(AM_V_GEN)cd $(srcdir) && BUILDDIR=$(abs_builddir)/ doxygen Doxyfile 2>/dev/null
@@ -497,7 +497,7 @@ python-quietclean:
        $(AM_V_at)cd $(PDIR) && $(PYTHON) $(abs_srcdir)/$(PDIR)/setup.py --quiet clean --all 3>&1 1>&2 2>&3 \
                | grep -v "can.t clean it"; true
 
-$(PDIR)/timestamp: bindings/cxx/libsigrokxx.la $(PDIR)/sigrok/core/classes.i \
+$(PDIR)/timestamp: bindings/cxx/libsigrokcxx.la $(PDIR)/sigrok/core/classes.i \
                bindings/swig/classes.i $(PDOC) $(library_include_HEADERS)
        $(AM_V_at)$(MAKE) python-quietclean
        $(AM_V_GEN)cd $(PDIR) && $(PYTHON) $(abs_srcdir)/$(PDIR)/setup.py --quiet build 3>&1 1>&2 2>&3 \
@@ -552,10 +552,10 @@ $(JJAR): $(JCXX)
        $(AM_V_GEN)$(JAVAC) -sourcepath $(JDIR) -d $(JDIR) $(JSRC)
        $(AM_V_at)jar cf $(JJAR) -C $(JDIR) $(JPKG)
 
-$(JLIB): $(JCXX) bindings/cxx/libsigrokxx.la $(library_include_HEADERS)
+$(JLIB): $(JCXX) bindings/cxx/libsigrokcxx.la $(library_include_HEADERS)
        $(AM_V_GEN)$(CXXCOMPILE) -L.libs -Lbindings/cxx/.libs \
                -fno-strict-aliasing -fPIC -shared $(JCLS)/classes_wrap.cxx \
-               -lsigrokxx -o $(JLIB)
+               -lsigrokcxx -o $(JLIB)
 
 java-install:
        $(INSTALL) -d $(libdir)/jni

diff --git a/README b/README
index d5fb883236a99a6006b08b1e1783590c084e2599..574b91aa4c98cf6a9bd74ca874d261e971cf29a1 100644 (file)
--- a/README
+++ b/README
@@ -61,7 +61,7 @@ Requirements for the C++ bindings:
 
 Requirements for the Python bindings:
 
- - libsigrokxx >= 0.3.0 (the libsigrok C++ bindings, see above)
+ - libsigrokcxx >= 0.3.0 (the libsigrok C++ bindings, see above)
  - Python >= 2.7 or Python >= 3 (including development files!)
  - Python setuptools (for Python 2 or 3)
  - pygobject >= 3.0.0 (for Python 2 or 3), a.k.a python-gi
@@ -73,7 +73,7 @@ Requirements for the Python bindings:
 
 Requirements for the Java bindings:
 
- - libsigrokxx >= 0.3.0 (the libsigrok C++ bindings, see above)
+ - libsigrokcxx >= 0.3.0 (the libsigrok C++ bindings, see above)
  - SWIG >= 2.0.0
  - Java JDK (for JNI includes and the javac/jar binaries)
  - doxygen (optional, only needed for the Java API docs)

diff --git a/bindings/cxx/Doxyfile b/bindings/cxx/Doxyfile
index ed7bf5b78a536ada179fbf413551a0701d1907d2..b4fd9a1ffa1f2e1d0eeff3f041fe286669dd48f4 100644 (file)
--- a/bindings/cxx/Doxyfile
+++ b/bindings/cxx/Doxyfile
@@ -32,7 +32,7 @@ DOXYFILE_ENCODING      = UTF-8
 # title of most generated pages and in a few other places.
 # The default value is: My Project.
 
-PROJECT_NAME           = "sigrok++"
+PROJECT_NAME           = "libsigrokcxx"
 
 # The PROJECT_NUMBER tag can be used to enter a project or revision number. This
 # could be handy for archiving the generated documentation or if some version

diff --git a/bindings/cxx/include/libsigrok/libsigrok.hpp b/bindings/cxx/include/libsigrok/libsigrok.hpp
index d287504d6d3a16fc300627faecac99d785e7d1da..5b53da94e548ce3b89814dc915b3d11039dccee4 100644 (file)
--- a/bindings/cxx/include/libsigrok/libsigrok.hpp
+++ b/bindings/cxx/include/libsigrok/libsigrok.hpp
@@ -24,8 +24,8 @@
 Introduction
 ------------
 
-The sigrok++ API provides an object-oriented C++ interface to the functionality
-in libsigrok, including automatic memory and resource management.
+The libsigrokcxx API provides an object-oriented C++ interface to the
+functionality in libsigrok, including automatic memory and resource management.
 
 It is built on top of the public libsigrok C API, and is designed to be used as
 a standalone alternative API. Programs should not mix usage of the C and C++
@@ -45,10 +45,10 @@ use. The C++ interface code also keeps track of internal dependencies between
 libsigrok resources, and ensures that objects are not prematurely deleted when
 their resources are in use by other objects.
 
-This means that management of sigrok++ objects and their underlying libsigrok
-resources can be treated as fully automatic. As long as all shared pointers to
-objects are deleted or reassigned when no longer in use, all underlying
-resources will be released at the right time.
+This means that management of libsigrokcxx objects and their underlying
+libsigrok resources can be treated as fully automatic. As long as all shared
+pointers to objects are deleted or reassigned when no longer in use, all
+underlying resources will be released at the right time.
 
 Getting started
 ---------------

diff --git a/bindings/cxx/libsigrokcxx.pc.in b/bindings/cxx/libsigrokcxx.pc.in
new file mode 100644 (file)
index 0000000..432de77
--- /dev/null
+++ b/bindings/cxx/libsigrokcxx.pc.in
@@ -0,0 +1,15 @@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@
+
+Name: libsigrokcxx
+Description: C++ bindings for libsigrok
+URL: http://www.sigrok.org
+Requires: libsigrok glibmm-2.4
+Requires.private: @SR_PKGLIBS@
+Version: @VERSION@
+Libs: -L${libdir} -lsigrokcxx
+Libs.private: -lm
+Cflags: -I${includedir}
+

diff --git a/bindings/cxx/libsigrokxx.pc.in b/bindings/cxx/libsigrokxx.pc.in
deleted file mode 100644 (file)
index ab4c378..0000000
--- a/bindings/cxx/libsigrokxx.pc.in
+++ /dev/null
@@ -1,15 +0,0 @@
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-libdir=@libdir@
-includedir=@includedir@
-
-Name: libsigrokxx
-Description: C++ bindings for libsigrok
-URL: http://www.sigrok.org
-Requires: libsigrok glibmm-2.4
-Requires.private: @SR_PKGLIBS@
-Version: @VERSION@
-Libs: -L${libdir} -lsigrokxx
-Libs.private: -lm
-Cflags: -I${includedir}
-

diff --git a/bindings/java/org/sigrok/core/classes/classes.i b/bindings/java/org/sigrok/core/classes/classes.i
index 867e8fcaaae53d20a9db466f1eaa89990fcdacf9..9979a61828c680be0091e5082003c71fe0738f8d 100644 (file)
--- a/bindings/java/org/sigrok/core/classes/classes.i
+++ b/bindings/java/org/sigrok/core/classes/classes.i
@@ -16,7 +16,7 @@
  * ------------
  * 
  * The sigrok-java API provides an object-oriented Java interface to the
- * functionality in libsigrok. It is built on top of the sigrok++ C++ API.
+ * functionality in libsigrok. It is built on top of the libsigrokcxx C++ API.
  * 
  * Getting started
  * ---------------

diff --git a/bindings/python/setup.py b/bindings/python/setup.py
index 9b5e998417c7222d19542494ef45025477695871..0002c1d4497d9fccc9efe3555b74316e8572bac9 100644 (file)
--- a/bindings/python/setup.py
+++ b/bindings/python/setup.py
@@ -39,7 +39,7 @@ includes += ['../..', '../../include/libsigrok', '../cxx/include/libsigrok']
 includes += [i[2:] for i in sr_includes]
 includes += [np.get_include(), ]
 libdirs = ['../../.libs', '../cxx/.libs'] + [l[2:] for l in sr_lib_dirs]
-libs = [l[2:] for l in sr_libs] + ['sigrokxx']
+libs = [l[2:] for l in sr_libs] + ['sigrokcxx']
 
 def vpath(file):
     vfile = os.path.join(srcdir, file)

diff --git a/bindings/python/sigrok/core/classes.i b/bindings/python/sigrok/core/classes.i
index 7d4304fca13e9644a2117d74571576fd24cd2495..277a021a82fe840ebd98e90261da1fe2b9fa29d0 100644 (file)
--- a/bindings/python/sigrok/core/classes.i
+++ b/bindings/python/sigrok/core/classes.i
@@ -24,7 +24,7 @@ Introduction
 ------------
 
 The pysigrok API provides an object-oriented Python interface to the
-functionality in libsigrok. It is built on top of the sigrok++ C++ API.
+functionality in libsigrok. It is built on top of the libsigrokcxx C++ API.
 
 Getting started
 ---------------

diff --git a/configure.ac b/configure.ac
index 396e3ec21345c10b6bb424e7ea8492332e397b75..5f9cf6521953c79247d1bc2ba102ba10aedce9fc 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -537,7 +537,7 @@ AC_SUBST(SR_PACKAGE_VERSION_MICRO)
 AC_SUBST(SR_PACKAGE_VERSION)
 
 AC_CONFIG_FILES([Makefile include/libsigrok/version.h libsigrok.pc
-       bindings/cxx/libsigrokxx.pc])
+       bindings/cxx/libsigrokcxx.pc])
 
 AC_OUTPUT