chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
libsystemd-bus: add lightweight object vtable implementation for exposing objects...
[elogind.git]
/
Makefile.am
diff --git
a/Makefile.am
b/Makefile.am
index 0eee1d93f01001235793ed4f2fb6409a637e29e1..4c7646d84f4bfac80268346a1457d6d885e9e74a 100644
(file)
--- a/
Makefile.am
+++ b/
Makefile.am
@@
-34,16
+34,16
@@
SUBDIRS = . po
# Keep the test-suite.log
.PRECIOUS: $(TEST_SUITE_LOG) Makefile
# Keep the test-suite.log
.PRECIOUS: $(TEST_SUITE_LOG) Makefile
-LIBUDEV_CURRENT=
4
-LIBUDEV_REVISION=
8
-LIBUDEV_AGE=
3
+LIBUDEV_CURRENT=
5
+LIBUDEV_REVISION=
0
+LIBUDEV_AGE=
4
LIBGUDEV_CURRENT=1
LIBGUDEV_REVISION=3
LIBGUDEV_AGE=1
LIBSYSTEMD_LOGIN_CURRENT=9
LIBGUDEV_CURRENT=1
LIBGUDEV_REVISION=3
LIBGUDEV_AGE=1
LIBSYSTEMD_LOGIN_CURRENT=9
-LIBSYSTEMD_LOGIN_REVISION=
0
+LIBSYSTEMD_LOGIN_REVISION=
1
LIBSYSTEMD_LOGIN_AGE=9
LIBSYSTEMD_DAEMON_CURRENT=0
LIBSYSTEMD_LOGIN_AGE=9
LIBSYSTEMD_DAEMON_CURRENT=0
@@
-51,11
+51,11
@@
LIBSYSTEMD_DAEMON_REVISION=10
LIBSYSTEMD_DAEMON_AGE=0
LIBSYSTEMD_ID128_CURRENT=0
LIBSYSTEMD_DAEMON_AGE=0
LIBSYSTEMD_ID128_CURRENT=0
-LIBSYSTEMD_ID128_REVISION=2
5
+LIBSYSTEMD_ID128_REVISION=2
6
LIBSYSTEMD_ID128_AGE=0
LIBSYSTEMD_JOURNAL_CURRENT=11
LIBSYSTEMD_ID128_AGE=0
LIBSYSTEMD_JOURNAL_CURRENT=11
-LIBSYSTEMD_JOURNAL_REVISION=
2
+LIBSYSTEMD_JOURNAL_REVISION=
3
LIBSYSTEMD_JOURNAL_AGE=11
# Dirs of external packages
LIBSYSTEMD_JOURNAL_AGE=11
# Dirs of external packages
@@
-721,7
+721,9
@@
libsystemd_shared_la_SOURCES = \
src/shared/acpi-fpdt.c \
src/shared/boot-timestamps.h \
src/shared/boot-timestamps.c \
src/shared/acpi-fpdt.c \
src/shared/boot-timestamps.h \
src/shared/boot-timestamps.c \
- src/shared/refcnt.h
+ src/shared/refcnt.h \
+ src/shared/mkdir.c \
+ src/shared/mkdir.h
#-------------------------------------------------------------------------------
noinst_LTLIBRARIES += \
#-------------------------------------------------------------------------------
noinst_LTLIBRARIES += \
@@
-765,15
+767,12
@@
noinst_LTLIBRARIES += \
libsystemd-label.la
libsystemd_label_la_SOURCES = \
libsystemd-label.la
libsystemd_label_la_SOURCES = \
- src/shared/cgroup-label.c \
src/shared/socket-label.c \
src/shared/label.c \
src/shared/label.h \
src/shared/selinux-util.c \
src/shared/selinux-util.h \
src/shared/socket-label.c \
src/shared/label.c \
src/shared/label.h \
src/shared/selinux-util.c \
src/shared/selinux-util.h \
- src/shared/mkdir.c \
src/shared/mkdir-label.c \
src/shared/mkdir-label.c \
- src/shared/mkdir.h \
src/shared/ask-password-api.c \
src/shared/ask-password-api.h \
src/shared/fileio-label.c \
src/shared/ask-password-api.c \
src/shared/ask-password-api.h \
src/shared/fileio-label.c \
@@
-1957,6
+1956,8
@@
libsystemd_bus_la_SOURCES = \
src/libsystemd-bus/bus-match.h \
src/libsystemd-bus/bus-bloom.c \
src/libsystemd-bus/bus-bloom.h \
src/libsystemd-bus/bus-match.h \
src/libsystemd-bus/bus-bloom.c \
src/libsystemd-bus/bus-bloom.h \
+ src/libsystemd-bus/bus-introspect.c \
+ src/libsystemd-bus/bus-introspect.h \
src/libsystemd-bus/kdbus.h \
src/libsystemd-bus/sd-memfd.c
src/libsystemd-bus/kdbus.h \
src/libsystemd-bus/sd-memfd.c
@@
-1982,7
+1983,9
@@
tests += \
test-bus-kernel-bloom \
test-bus-kernel-benchmark \
test-bus-memfd \
test-bus-kernel-bloom \
test-bus-kernel-benchmark \
test-bus-memfd \
- test-bus-zero-copy
+ test-bus-zero-copy \
+ test-bus-introspect \
+ test-bus-objects
noinst_PROGRAMS += \
busctl
noinst_PROGRAMS += \
busctl
@@
-2032,6
+2035,18
@@
test_bus_server_LDADD = \
libsystemd-bus.la \
libsystemd-id128-internal.la
libsystemd-bus.la \
libsystemd-id128-internal.la
+test_bus_objects_SOURCES = \
+ src/libsystemd-bus/test-bus-objects.c
+
+test_bus_objects_CFLAGS = \
+ $(AM_CFLAGS) \
+ -pthread
+
+test_bus_objects_LDADD = \
+ libsystemd-shared.la \
+ libsystemd-bus.la \
+ libsystemd-id128-internal.la
+
test_bus_match_SOURCES = \
src/libsystemd-bus/test-bus-match.c
test_bus_match_SOURCES = \
src/libsystemd-bus/test-bus-match.c
@@
-2096,6
+2111,16
@@
test_bus_zero_copy_LDADD = \
libsystemd-shared.la \
libsystemd-bus.la
libsystemd-shared.la \
libsystemd-bus.la
+test_bus_introspect_SOURCES = \
+ src/libsystemd-bus/test-bus-introspect.c
+
+test_bus_introspect_CFLAGS = \
+ $(AM_CFLAGS)
+
+test_bus_introspect_LDADD = \
+ libsystemd-shared.la \
+ libsystemd-bus.la
+
busctl_SOURCES = \
src/libsystemd-bus/busctl.c
busctl_SOURCES = \
src/libsystemd-bus/busctl.c
@@
-3761,15
+3786,8
@@
systemd_logind_LDADD = \
libsystemd-logind-core.la \
$(libsystemd_logind_core_la_LIBADD)
libsystemd-logind-core.la \
$(libsystemd_logind_core_la_LIBADD)
-if HAVE_ACL
-systemd_logind_SOURCES += \
- src/login/logind-acl.c
-
-systemd_logind_LDADD += \
- libsystemd-acl.la
-endif
-
libsystemd_logind_core_la_SOURCES = \
libsystemd_logind_core_la_SOURCES = \
+ src/login/logind-core.c \
src/login/logind-dbus.c \
src/login/logind-device.c \
src/login/logind-device.h \
src/login/logind-dbus.c \
src/login/logind-device.c \
src/login/logind-device.h \
@@
-3807,6
+3825,14
@@
libsystemd_logind_core_la_LIBADD = \
libsystemd-id128-internal.la \
libudev.la
libsystemd-id128-internal.la \
libudev.la
+if HAVE_ACL
+libsystemd_logind_core_la_SOURCES += \
+ src/login/logind-acl.c
+
+libsystemd_logind_core_la_LIBADD += \
+ libsystemd-acl.la
+endif
+
noinst_LTLIBRARIES += \
libsystemd-logind-core.la
noinst_LTLIBRARIES += \
libsystemd-logind-core.la