chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
comment out uncommitted test source code
[elogind.git]
/
Makefile.am
diff --git
a/Makefile.am
b/Makefile.am
index 1828d7f11e48bb554c18d36f1de176ed06e25c2b..82659274c954344303732f4bc9f01f3cbfcf963a 100644
(file)
--- a/
Makefile.am
+++ b/
Makefile.am
@@
-27,7
+27,7
@@
SUBDIRS = . po
.DELETE_ON_ERROR:
LIBUDEV_CURRENT=2
.DELETE_ON_ERROR:
LIBUDEV_CURRENT=2
-LIBUDEV_REVISION=
1
+LIBUDEV_REVISION=
2
LIBUDEV_AGE=1
LIBGUDEV_CURRENT=1
LIBUDEV_AGE=1
LIBGUDEV_CURRENT=1
@@
-35,7
+35,7
@@
LIBGUDEV_REVISION=2
LIBGUDEV_AGE=1
LIBSYSTEMD_LOGIN_CURRENT=3
LIBGUDEV_AGE=1
LIBSYSTEMD_LOGIN_CURRENT=3
-LIBSYSTEMD_LOGIN_REVISION=
4
+LIBSYSTEMD_LOGIN_REVISION=
5
LIBSYSTEMD_LOGIN_AGE=3
LIBSYSTEMD_DAEMON_CURRENT=0
LIBSYSTEMD_LOGIN_AGE=3
LIBSYSTEMD_DAEMON_CURRENT=0
@@
-43,11
+43,11
@@
LIBSYSTEMD_DAEMON_REVISION=5
LIBSYSTEMD_DAEMON_AGE=0
LIBSYSTEMD_ID128_CURRENT=0
LIBSYSTEMD_DAEMON_AGE=0
LIBSYSTEMD_ID128_CURRENT=0
-LIBSYSTEMD_ID128_REVISION=1
0
+LIBSYSTEMD_ID128_REVISION=1
1
LIBSYSTEMD_ID128_AGE=0
LIBSYSTEMD_JOURNAL_CURRENT=5
LIBSYSTEMD_ID128_AGE=0
LIBSYSTEMD_JOURNAL_CURRENT=5
-LIBSYSTEMD_JOURNAL_REVISION=
0
+LIBSYSTEMD_JOURNAL_REVISION=
1
LIBSYSTEMD_JOURNAL_AGE=5
# Dirs of external packages
LIBSYSTEMD_JOURNAL_AGE=5
# Dirs of external packages
@@
-2473,6
+2473,13
@@
test_journal_verify_LDADD = \
libsystemd-journal-internal.la \
libsystemd-id128-internal.la
libsystemd-journal-internal.la \
libsystemd-id128-internal.la
+test_mmap_cache_SOURCES = \
+ src/journal/test-mmap-cache.c
+
+test_mmap_cache_LDADD = \
+ libsystemd-shared.la \
+ libsystemd-journal-internal.la
+
libsystemd_journal_la_SOURCES = \
src/journal/sd-journal.c \
src/systemd/sd-journal.h \
libsystemd_journal_la_SOURCES = \
src/journal/sd-journal.c \
src/systemd/sd-journal.h \
@@
-2578,12
+2585,14
@@
noinst_PROGRAMS += \
test-journal-match \
test-journal-stream \
test-journal-verify
test-journal-match \
test-journal-stream \
test-journal-verify
+# test-mmap-cache
TESTS += \
test-journal \
test-journal-match \
test-journal-stream \
test-journal-verify
TESTS += \
test-journal \
test-journal-match \
test-journal-stream \
test-journal-verify
+# test-mmap-cache
pkginclude_HEADERS += \
src/systemd/sd-journal.h \
pkginclude_HEADERS += \
src/systemd/sd-journal.h \
@@
-3347,6
+3356,16
@@
logind-install-data-hook:
INSTALL_DATA_HOOKS += \
logind-install-data-hook
INSTALL_DATA_HOOKS += \
logind-install-data-hook
+systemd_multi_seat_x_SOURCES = \
+ src/login/multi-seat-x.c
+
+systemd_multi_seat_x_LDADD = \
+ libsystemd-label.la \
+ libsystemd-shared.la
+
+rootlibexec_PROGRAMS += \
+ systemd-multi-seat-x
+
dist_udevrules_DATA += \
src/login/70-uaccess.rules \
src/login/70-power-switch.rules
dist_udevrules_DATA += \
src/login/70-uaccess.rules \
src/login/70-power-switch.rules