chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
sd-bus: let sd_bus_call() use the synchronous kdbus method
[elogind.git]
/
Makefile.am
diff --git
a/Makefile.am
b/Makefile.am
index 4fc909787d66b3542aac925b2df827e6851a3e41..e6f411cfecb9b28336afa0a258aee7967a53c55f 100644
(file)
--- a/
Makefile.am
+++ b/
Makefile.am
@@
-59,9
+59,9
@@
LIBSYSTEMD_JOURNAL_CURRENT=11
LIBSYSTEMD_JOURNAL_REVISION=3
LIBSYSTEMD_JOURNAL_AGE=11
LIBSYSTEMD_JOURNAL_REVISION=3
LIBSYSTEMD_JOURNAL_AGE=11
-LIBSYSTEMD_
BUS_
CURRENT=0
-LIBSYSTEMD_
BUS_
REVISION=0
-LIBSYSTEMD_
BUS_
AGE=0
+LIBSYSTEMD_CURRENT=0
+LIBSYSTEMD_REVISION=0
+LIBSYSTEMD_AGE=0
# Dirs of external packages
dbuspolicydir=@dbuspolicydir@
# Dirs of external packages
dbuspolicydir=@dbuspolicydir@
@@
-1744,6
+1744,7
@@
systemd_gpt_auto_generator_CFLAGS = \
endif
# ------------------------------------------------------------------------------
endif
# ------------------------------------------------------------------------------
+if ENABLE_KDBUS
systemgenerator_PROGRAMS += \
systemd-dbus1-generator
systemgenerator_PROGRAMS += \
systemd-dbus1-generator
@@
-1763,6
+1764,7
@@
dbus1-generator-uninstall-hook:
INSTALL_EXEC_HOOKS += dbus1-generator-install-hook
UNINSTALL_EXEC_HOOKS += dbus1-generator-uninstall-hook
INSTALL_EXEC_HOOKS += dbus1-generator-install-hook
UNINSTALL_EXEC_HOOKS += dbus1-generator-uninstall-hook
+endif
# ------------------------------------------------------------------------------
systemd_rc_local_generator_SOURCES = \
# ------------------------------------------------------------------------------
systemd_rc_local_generator_SOURCES = \
@@
-2051,7
+2053,7
@@
libsystemd_la_CFLAGS = \
libsystemd_la_LDFLAGS = \
$(AM_LDFLAGS) \
libsystemd_la_LDFLAGS = \
$(AM_LDFLAGS) \
- -version-info $(LIBSYSTEMD_
BUS_CURRENT):$(LIBSYSTEMD_BUS_REVISION):$(LIBSYSTEMD_BUS
_AGE) \
+ -version-info $(LIBSYSTEMD_
CURRENT):$(LIBSYSTEMD_REVISION):$(LIBSYSTEMD
_AGE) \
-Wl,--version-script=$(top_srcdir)/src/libsystemd/libsystemd.sym
pkgconfiglib_DATA += \
-Wl,--version-script=$(top_srcdir)/src/libsystemd/libsystemd.sym
pkgconfiglib_DATA += \
@@
-2096,6
+2098,7
@@
tests += \
test-bus-marshal \
test-bus-signature \
test-bus-chat \
test-bus-marshal \
test-bus-signature \
test-bus-chat \
+ test-bus-cleanup \
test-bus-server \
test-bus-match \
test-bus-kernel \
test-bus-server \
test-bus-match \
test-bus-kernel \
@@
-2157,6
+2160,15
@@
test_bus_chat_LDADD = \
libsystemd-daemon-internal.la \
libsystemd-shared.la
libsystemd-daemon-internal.la \
libsystemd-shared.la
+test_bus_cleanup_SOURCES = \
+ src/libsystemd/test-bus-cleanup.c
+
+test_bus_cleanup_LDADD = \
+ libsystemd-internal.la \
+ libsystemd-id128-internal.la \
+ libsystemd-daemon-internal.la \
+ libsystemd-shared.la
+
test_bus_server_SOURCES = \
src/libsystemd/test-bus-server.c
test_bus_server_SOURCES = \
src/libsystemd/test-bus-server.c
@@
-4916,7
+4928,7
@@
valgrind-tests: $(TESTS)
if file $$f | grep -q shell; then \
echo -e "$${x}Skipping non-binary $$f"; else \
echo -e "$${x}Running $$f"; \
if file $$f | grep -q shell; then \
echo -e "$${x}Skipping non-binary $$f"; else \
echo -e "$${x}Running $$f"; \
- libtool --mode=execute valgrind -q --leak-check=full --max-stackframe=
419440
0 --error-exitcode=55 $(builddir)/$$f ; fi; \
+ libtool --mode=execute valgrind -q --leak-check=full --max-stackframe=
524288
0 --error-exitcode=55 $(builddir)/$$f ; fi; \
x="\n\n"; \
done
x="\n\n"; \
done