diff options
| author | Simon McVittie <smcv@debian.org> | 2016-03-05 15:50:33 +0000 |
|---|---|---|
| committer | Simon McVittie <smcv@debian.org> | 2016-03-05 15:50:33 +0000 |
| commit | c729593c36c745f99daa02abb955a19737bf37cb (patch) | |
| tree | 11812d0b6a92820c5f7f5a7531811f67c1b0ebfb | |
| parent | 01ecf02c749f7bddb15f57aae26e9e064db0240f (diff) | |
| download | dbus-python-c729593c36c745f99daa02abb955a19737bf37cb.tar.gz | |
Move dbus-python.h to a dbus subdirectory
This means we can consistently #include <dbus/dbus-python.h>,
either in-tree or out-of-tree.
Signed-off-by: Simon McVittie <smcv@debian.org>
| -rw-r--r-- | Makefile.am | 5 | ||||
| -rw-r--r-- | _dbus_bindings/dbus_bindings-internal.h | 2 | ||||
| -rw-r--r-- | _dbus_glib_bindings/module.c | 2 | ||||
| -rw-r--r-- | include/dbus/dbus-python.h (renamed from include/dbus-python.h) | 0 | ||||
| -rw-r--r-- | test/dbus_py_test.c | 2 |
5 files changed, 6 insertions, 5 deletions
diff --git a/Makefile.am b/Makefile.am index 3a821fa..bdfa56a 100644 --- a/Makefile.am +++ b/Makefile.am @@ -141,8 +141,9 @@ dbus_py_test_la_LDFLAGS = \ $(NULL) dbus_py_test_la_LIBADD = $(DBUS_LIBS) dbus_py_test_la_SOURCES = \ + include/dbus/dbus-python.h \ test/dbus_py_test.c \ - $(top_srcdir)/include/dbus-python.h + $(NULL) # === dbus package === @@ -181,7 +182,7 @@ pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = dbus-python.pc dbusincludedir = $(includedir)/dbus-1.0/dbus -dbusinclude_HEADERS = include/dbus-python.h +dbusinclude_HEADERS = include/dbus/dbus-python.h # === Tests === diff --git a/_dbus_bindings/dbus_bindings-internal.h b/_dbus_bindings/dbus_bindings-internal.h index b22f586..06ed835 100644 --- a/_dbus_bindings/dbus_bindings-internal.h +++ b/_dbus_bindings/dbus_bindings-internal.h @@ -31,7 +31,7 @@ #include <Python.h> #define INSIDE_DBUS_PYTHON_BINDINGS -#include "dbus-python.h" +#include "dbus/dbus-python.h" #if defined(__GNUC__) # if __GNUC__ >= 3 diff --git a/_dbus_glib_bindings/module.c b/_dbus_glib_bindings/module.c index 03550cb..1da1ddb 100644 --- a/_dbus_glib_bindings/module.c +++ b/_dbus_glib_bindings/module.c @@ -24,7 +24,7 @@ */ #include <Python.h> -#include "dbus-python.h" +#include <dbus/dbus-python.h> #include <dbus/dbus-glib.h> #include <dbus/dbus-glib-lowlevel.h> diff --git a/include/dbus-python.h b/include/dbus/dbus-python.h index d247081..d247081 100644 --- a/include/dbus-python.h +++ b/include/dbus/dbus-python.h diff --git a/test/dbus_py_test.c b/test/dbus_py_test.c index ea892ab..bd2399d 100644 --- a/test/dbus_py_test.c +++ b/test/dbus_py_test.c @@ -24,7 +24,7 @@ */ #include <Python.h> -#include "dbus-python.h" +#include <dbus/dbus-python.h> #ifdef PY3 PyMODINIT_FUNC PyInit_dbus_py_test(void); |