aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarc Schink <swo-dev@marcschink.de>2017-07-28 17:07:54 +0200
committerMarc Schink <swo-dev@marcschink.de>2017-08-01 20:37:43 +0200
commit7339714ddd1f4222f4dcb8f393c7a64f4073445e (patch)
tree744828880c293a082d00f66d4d0a78e1bf700425
parenta87e5ac40fc00033aaf57d9a4290c5aa192d83a9 (diff)
C++: Move public header into include/libswocxx
-rw-r--r--bindings/cxx/Makefile.am4
-rw-r--r--bindings/cxx/addressoffset.cpp2
-rw-r--r--bindings/cxx/context.cpp2
-rw-r--r--bindings/cxx/datavalue.cpp2
-rw-r--r--bindings/cxx/error.cpp2
-rw-r--r--bindings/cxx/eventcounter.cpp2
-rw-r--r--bindings/cxx/exceptiontrace.cpp2
-rw-r--r--bindings/cxx/extension.cpp2
-rw-r--r--bindings/cxx/globaltimestamp1.cpp2
-rw-r--r--bindings/cxx/globaltimestamp2.cpp2
-rw-r--r--bindings/cxx/hardware.cpp2
-rw-r--r--bindings/cxx/include/libswocxx/libswocxx.h (renamed from bindings/cxx/libswocxx.h)0
-rw-r--r--bindings/cxx/instrumentation.cpp2
-rw-r--r--bindings/cxx/localtimestamp.cpp2
-rw-r--r--bindings/cxx/overflow.cpp2
-rw-r--r--bindings/cxx/packet.cpp2
-rw-r--r--bindings/cxx/payloadpacket.cpp2
-rw-r--r--bindings/cxx/pcsample.cpp2
-rw-r--r--bindings/cxx/pcvalue.cpp2
-rw-r--r--bindings/cxx/sourcepacket.cpp2
-rw-r--r--bindings/cxx/synchronization.cpp2
-rw-r--r--bindings/cxx/unknown.cpp2
-rw-r--r--bindings/cxx/version.cpp2
-rw-r--r--bindings/python/Context.h2
-rw-r--r--bindings/python/Makefile.am2
-rw-r--r--bindings/python/setup.py.in2
-rw-r--r--bindings/python/swopy.i4
27 files changed, 28 insertions, 28 deletions
diff --git a/bindings/cxx/Makefile.am b/bindings/cxx/Makefile.am
index 8c4c590..8014a4a 100644
--- a/bindings/cxx/Makefile.am
+++ b/bindings/cxx/Makefile.am
@@ -42,10 +42,10 @@ libswocxx_la_SOURCES = \
unknown.cpp \
version.cpp
-libswocxx_la_CXXFLAGS = $(LIBSWO_CXXFLAGS) -I$(top_srcdir) \
+libswocxx_la_CXXFLAGS = $(LIBSWO_CXXFLAGS) -I$(top_srcdir)/bindings/cxx/include -I$(top_srcdir) \
-I$(top_builddir)/libswo
libswocxx_la_LDFLAGS = $(LIBSWO_LDFLAGS) -no-undefined
libswocxx_la_LIBADD = $(top_builddir)/libswo/libswo.la
library_includedir = $(includedir)/libswocxx
-library_include_HEADERS = libswocxx.h
+library_include_HEADERS = include/libswocxx/libswocxx.h
diff --git a/bindings/cxx/addressoffset.cpp b/bindings/cxx/addressoffset.cpp
index b75dffa..7e6474b 100644
--- a/bindings/cxx/addressoffset.cpp
+++ b/bindings/cxx/addressoffset.cpp
@@ -19,7 +19,7 @@
#include <sstream>
-#include "libswocxx.h"
+#include <libswocxx/libswocxx.h>
namespace libswo
{
diff --git a/bindings/cxx/context.cpp b/bindings/cxx/context.cpp
index e9e891b..319b4ea 100644
--- a/bindings/cxx/context.cpp
+++ b/bindings/cxx/context.cpp
@@ -19,7 +19,7 @@
#include <stdio.h>
-#include "libswocxx.h"
+#include <libswocxx/libswocxx.h>
namespace libswo
{
diff --git a/bindings/cxx/datavalue.cpp b/bindings/cxx/datavalue.cpp
index 0573516..5196321 100644
--- a/bindings/cxx/datavalue.cpp
+++ b/bindings/cxx/datavalue.cpp
@@ -19,7 +19,7 @@
#include <sstream>
-#include "libswocxx.h"
+#include <libswocxx/libswocxx.h>
namespace libswo
{
diff --git a/bindings/cxx/error.cpp b/bindings/cxx/error.cpp
index 5fec5ce..f7cf344 100644
--- a/bindings/cxx/error.cpp
+++ b/bindings/cxx/error.cpp
@@ -17,7 +17,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include "libswocxx.h"
+#include <libswocxx/libswocxx.h>
namespace libswo
{
diff --git a/bindings/cxx/eventcounter.cpp b/bindings/cxx/eventcounter.cpp
index 430a6c8..eb25e29 100644
--- a/bindings/cxx/eventcounter.cpp
+++ b/bindings/cxx/eventcounter.cpp
@@ -19,7 +19,7 @@
#include <sstream>
-#include "libswocxx.h"
+#include <libswocxx/libswocxx.h>
namespace libswo
{
diff --git a/bindings/cxx/exceptiontrace.cpp b/bindings/cxx/exceptiontrace.cpp
index 4e3327b..cf64855 100644
--- a/bindings/cxx/exceptiontrace.cpp
+++ b/bindings/cxx/exceptiontrace.cpp
@@ -19,7 +19,7 @@
#include <sstream>
-#include "libswocxx.h"
+#include <libswocxx/libswocxx.h>
namespace libswo
{
diff --git a/bindings/cxx/extension.cpp b/bindings/cxx/extension.cpp
index cee86af..b8123d7 100644
--- a/bindings/cxx/extension.cpp
+++ b/bindings/cxx/extension.cpp
@@ -19,7 +19,7 @@
#include <sstream>
-#include "libswocxx.h"
+#include <libswocxx/libswocxx.h>
namespace libswo
{
diff --git a/bindings/cxx/globaltimestamp1.cpp b/bindings/cxx/globaltimestamp1.cpp
index b6cab9a..32e0204 100644
--- a/bindings/cxx/globaltimestamp1.cpp
+++ b/bindings/cxx/globaltimestamp1.cpp
@@ -19,7 +19,7 @@
#include <sstream>
-#include "libswocxx.h"
+#include <libswocxx/libswocxx.h>
namespace libswo
{
diff --git a/bindings/cxx/globaltimestamp2.cpp b/bindings/cxx/globaltimestamp2.cpp
index e651642..da95577 100644
--- a/bindings/cxx/globaltimestamp2.cpp
+++ b/bindings/cxx/globaltimestamp2.cpp
@@ -19,7 +19,7 @@
#include <sstream>
-#include "libswocxx.h"
+#include <libswocxx/libswocxx.h>
namespace libswo
{
diff --git a/bindings/cxx/hardware.cpp b/bindings/cxx/hardware.cpp
index eea8816..3eca462 100644
--- a/bindings/cxx/hardware.cpp
+++ b/bindings/cxx/hardware.cpp
@@ -19,7 +19,7 @@
#include <sstream>
-#include "libswocxx.h"
+#include <libswocxx/libswocxx.h>
namespace libswo
{
diff --git a/bindings/cxx/libswocxx.h b/bindings/cxx/include/libswocxx/libswocxx.h
index cf36cff..cf36cff 100644
--- a/bindings/cxx/libswocxx.h
+++ b/bindings/cxx/include/libswocxx/libswocxx.h
diff --git a/bindings/cxx/instrumentation.cpp b/bindings/cxx/instrumentation.cpp
index 2b16947..b391e50 100644
--- a/bindings/cxx/instrumentation.cpp
+++ b/bindings/cxx/instrumentation.cpp
@@ -19,7 +19,7 @@
#include <sstream>
-#include "libswocxx.h"
+#include <libswocxx/libswocxx.h>
namespace libswo
{
diff --git a/bindings/cxx/localtimestamp.cpp b/bindings/cxx/localtimestamp.cpp
index 7a92de4..3d52cf6 100644
--- a/bindings/cxx/localtimestamp.cpp
+++ b/bindings/cxx/localtimestamp.cpp
@@ -19,7 +19,7 @@
#include <sstream>
-#include "libswocxx.h"
+#include <libswocxx/libswocxx.h>
namespace libswo
{
diff --git a/bindings/cxx/overflow.cpp b/bindings/cxx/overflow.cpp
index 49aafab..0b2b514 100644
--- a/bindings/cxx/overflow.cpp
+++ b/bindings/cxx/overflow.cpp
@@ -19,7 +19,7 @@
#include <sstream>
-#include "libswocxx.h"
+#include <libswocxx/libswocxx.h>
namespace libswo
{
diff --git a/bindings/cxx/packet.cpp b/bindings/cxx/packet.cpp
index 78d2b97..814377c 100644
--- a/bindings/cxx/packet.cpp
+++ b/bindings/cxx/packet.cpp
@@ -17,7 +17,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include "libswocxx.h"
+#include <libswocxx/libswocxx.h>
namespace libswo
{
diff --git a/bindings/cxx/payloadpacket.cpp b/bindings/cxx/payloadpacket.cpp
index 6208d51..4fa0878 100644
--- a/bindings/cxx/payloadpacket.cpp
+++ b/bindings/cxx/payloadpacket.cpp
@@ -17,7 +17,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include "libswocxx.h"
+#include <libswocxx/libswocxx.h>
namespace libswo
{
diff --git a/bindings/cxx/pcsample.cpp b/bindings/cxx/pcsample.cpp
index 6fbc357..e21cfaf 100644
--- a/bindings/cxx/pcsample.cpp
+++ b/bindings/cxx/pcsample.cpp
@@ -19,7 +19,7 @@
#include <sstream>
-#include "libswocxx.h"
+#include <libswocxx/libswocxx.h>
namespace libswo
{
diff --git a/bindings/cxx/pcvalue.cpp b/bindings/cxx/pcvalue.cpp
index c1de390..6f5cfd2 100644
--- a/bindings/cxx/pcvalue.cpp
+++ b/bindings/cxx/pcvalue.cpp
@@ -19,7 +19,7 @@
#include <sstream>
-#include "libswocxx.h"
+#include <libswocxx/libswocxx.h>
namespace libswo
{
diff --git a/bindings/cxx/sourcepacket.cpp b/bindings/cxx/sourcepacket.cpp
index 6396ba7..5ff50f4 100644
--- a/bindings/cxx/sourcepacket.cpp
+++ b/bindings/cxx/sourcepacket.cpp
@@ -17,7 +17,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include "libswocxx.h"
+#include <libswocxx/libswocxx.h>
namespace libswo
{
diff --git a/bindings/cxx/synchronization.cpp b/bindings/cxx/synchronization.cpp
index afac6cb..d1bca37 100644
--- a/bindings/cxx/synchronization.cpp
+++ b/bindings/cxx/synchronization.cpp
@@ -19,7 +19,7 @@
#include <sstream>
-#include "libswocxx.h"
+#include <libswocxx/libswocxx.h>
namespace libswo
{
diff --git a/bindings/cxx/unknown.cpp b/bindings/cxx/unknown.cpp
index b7e989d..fd997e7 100644
--- a/bindings/cxx/unknown.cpp
+++ b/bindings/cxx/unknown.cpp
@@ -19,7 +19,7 @@
#include <sstream>
-#include "libswocxx.h"
+#include <libswocxx/libswocxx.h>
namespace libswo
{
diff --git a/bindings/cxx/version.cpp b/bindings/cxx/version.cpp
index d446f39..08f5c8f 100644
--- a/bindings/cxx/version.cpp
+++ b/bindings/cxx/version.cpp
@@ -17,7 +17,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include "libswocxx.h"
+#include <libswocxx/libswocxx.h>
namespace libswo
{
diff --git a/bindings/python/Context.h b/bindings/python/Context.h
index a083d42..0714e9c 100644
--- a/bindings/python/Context.h
+++ b/bindings/python/Context.h
@@ -20,7 +20,7 @@
#ifndef LIBSWO_BINDINGS_PYTHON_CONTEXT_H
#define LIBSWO_BINDINGS_PYTHON_CONTEXT_H
-#include "libswocxx.h"
+#include <libswocxx/libswocxx.h>
class Context : public libswo::Context
{
diff --git a/bindings/python/Makefile.am b/bindings/python/Makefile.am
index 379247b..7aa683a 100644
--- a/bindings/python/Makefile.am
+++ b/bindings/python/Makefile.am
@@ -33,7 +33,7 @@ swopy:
# one of its source files has changed since the last invocation.
build-lock: setup.py $(srcdir)/swopy.i Context.h $(CXX_BUILDDIR)/libswocxx.la
$(SWIG) -python -c++ -Wall -outdir swopy -outcurrentdir \
- -I$(CXX_SRCDIR) $(srcdir)/swopy.i
+ -I$(CXX_SRCDIR)/include $(srcdir)/swopy.i
$(PYTHON) setup.py --quiet build
touch build-lock
diff --git a/bindings/python/setup.py.in b/bindings/python/setup.py.in
index f70c834..d470c2a 100644
--- a/bindings/python/setup.py.in
+++ b/bindings/python/setup.py.in
@@ -40,6 +40,6 @@ setup(
libraries = ['swocxx'],
include_dirs = [srcdir, join(builddir, 'libswo'),
join(srcdir, 'bindings/python'),
- join(srcdir, 'bindings/cxx')])
+ join(srcdir, 'bindings/cxx/include')])
]
)
diff --git a/bindings/python/swopy.i b/bindings/python/swopy.i
index e38cf76..6f31053 100644
--- a/bindings/python/swopy.i
+++ b/bindings/python/swopy.i
@@ -20,7 +20,7 @@
%module swopy
%{
-#include "libswocxx.h"
+#include <libswocxx/libswocxx.h>
%}
%include "stdint.i"
@@ -327,5 +327,5 @@ void Context::set_callback(PyObject *callback)
#define LIBSWO_API
#define LIBSWO_PRIV
-%include "libswocxx.h"
+%include <libswocxx/libswocxx.h>
%include "Context.h"