diff options
| author | Simon McVittie <smcv@collabora.com> | 2018-01-29 09:43:56 +0000 |
|---|---|---|
| committer | Simon McVittie <smcv@collabora.com> | 2018-01-29 09:43:56 +0000 |
| commit | 28098f2c7c23bdef9247c5dfbb8437ca3f03dac4 (patch) | |
| tree | f87cbac1f0a97c848f0450b6131350f273c98aa4 /Makefile.am | |
| parent | 8d0bc022242a89b1d31b2be0aa9e4d570179e3cc (diff) | |
Integrate dbus-gmain
Signed-off-by: Simon McVittie <smcv@collabora.com>
Diffstat (limited to 'Makefile.am')
| -rw-r--r-- | Makefile.am | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/Makefile.am b/Makefile.am index d7d8575..13ad510 100644 --- a/Makefile.am +++ b/Makefile.am @@ -5,6 +5,7 @@ installed_test_testdir = ${installed_testdir}/test installed_test_metadir = ${datadir}/installed-tests/${PACKAGE_TARNAME} ACLOCAL_AMFLAGS = -I m4 +SUBDIRS = dbus-gmain . CLEANFILES = \ test/test-service.log \ @@ -42,7 +43,7 @@ AM_CPPFLAGS = \ -include config.h \ -I$(top_srcdir)/include \ $(DBUS_CFLAGS) \ - $(DBUS_GLIB_CFLAGS) \ + $(GLIB_CFLAGS) \ $(PYTHON_CPPFLAGS) \ $(NULL) AM_CFLAGS = \ @@ -123,15 +124,18 @@ _dbus_bindings_la_SOURCES = \ dbus_bindings/validation.c \ $(NULL) +dbus-gmain/libdbus-gmain.la: + $(MAKE) -C dbus-gmain + _dbus_glib_bindings_la_LDFLAGS = \ $(pymod_ldflags) \ -export-symbols-regex \(PyInit__\|init_\)dbus_glib_bindings \ $(AM_LDFLAGS) \ $(NULL) _dbus_glib_bindings_la_LIBADD = \ + dbus-gmain/libdbus-gmain.la \ $(pymod_libadd) \ $(DBUS_LIBS) \ - $(DBUS_GLIB_LIBS) \ $(NULL) _dbus_glib_bindings_la_SOURCES = \ dbus_glib_bindings/module.c \ |