chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
udev: free rule structure on error
[elogind.git]
/
Makefile.am
diff --git
a/Makefile.am
b/Makefile.am
index 32f08edb0d1aef6bf9bebd2798e75d36af4e56bb..3ccd0fc1774effa031a5fbf23986773b261cf3d9 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=
0
+LIBUDEV_REVISION=
2
LIBUDEV_AGE=1
LIBGUDEV_CURRENT=1
LIBUDEV_AGE=1
LIBGUDEV_CURRENT=1
@@
-35,20
+35,20
@@
LIBGUDEV_REVISION=2
LIBGUDEV_AGE=1
LIBSYSTEMD_LOGIN_CURRENT=3
LIBGUDEV_AGE=1
LIBSYSTEMD_LOGIN_CURRENT=3
-LIBSYSTEMD_LOGIN_REVISION=
3
+LIBSYSTEMD_LOGIN_REVISION=
5
LIBSYSTEMD_LOGIN_AGE=3
LIBSYSTEMD_DAEMON_CURRENT=0
LIBSYSTEMD_LOGIN_AGE=3
LIBSYSTEMD_DAEMON_CURRENT=0
-LIBSYSTEMD_DAEMON_REVISION=
4
+LIBSYSTEMD_DAEMON_REVISION=
5
LIBSYSTEMD_DAEMON_AGE=0
LIBSYSTEMD_ID128_CURRENT=0
LIBSYSTEMD_DAEMON_AGE=0
LIBSYSTEMD_ID128_CURRENT=0
-LIBSYSTEMD_ID128_REVISION=
9
+LIBSYSTEMD_ID128_REVISION=
11
LIBSYSTEMD_ID128_AGE=0
LIBSYSTEMD_ID128_AGE=0
-LIBSYSTEMD_JOURNAL_CURRENT=
4
+LIBSYSTEMD_JOURNAL_CURRENT=
5
LIBSYSTEMD_JOURNAL_REVISION=1
LIBSYSTEMD_JOURNAL_REVISION=1
-LIBSYSTEMD_JOURNAL_AGE=
4
+LIBSYSTEMD_JOURNAL_AGE=
5
# Dirs of external packages
dbuspolicydir=@dbuspolicydir@
# Dirs of external packages
dbuspolicydir=@dbuspolicydir@
@@
-704,7
+704,8
@@
XML_DIRECTIVE_FILES = \
man/systemd.exec.xml \
man/systemd.kill.xml \
man/systemd.device.xml \
man/systemd.exec.xml \
man/systemd.kill.xml \
man/systemd.device.xml \
- man/systemd.conf.xml
+ man/systemd.conf.xml \
+ man/systemd.journal-fields.xml
man/systemd.directives.xml: make-directive-index.py $(XML_DIRECTIVE_FILES)
$(AM_V_at)$(MKDIR_P) $(dir $@)
man/systemd.directives.xml: make-directive-index.py $(XML_DIRECTIVE_FILES)
$(AM_V_at)$(MKDIR_P) $(dir $@)
@@
-908,6
+909,8
@@
noinst_LTLIBRARIES += \
libsystemd_core_la_SOURCES = \
src/core/unit.c \
src/core/unit.h \
libsystemd_core_la_SOURCES = \
src/core/unit.c \
src/core/unit.h \
+ src/core/unit-printf.c \
+ src/core/unit-printf.h \
src/core/job.c \
src/core/job.h \
src/core/manager.c \
src/core/job.c \
src/core/job.h \
src/core/manager.c \
@@
-976,6
+979,8
@@
libsystemd_core_la_SOURCES = \
src/core/dbus-path.h \
src/core/cgroup.c \
src/core/cgroup.h \
src/core/dbus-path.h \
src/core/cgroup.c \
src/core/cgroup.h \
+ src/core/selinux-access.c \
+ src/core/selinux-access.h \
src/core/selinux-setup.c \
src/core/selinux-setup.h \
src/core/ima-setup.c \
src/core/selinux-setup.c \
src/core/selinux-setup.h \
src/core/ima-setup.c \
@@
-1035,6
+1040,7
@@
libsystemd_core_la_LIBADD = \
libsystemd-label.la \
libsystemd-shared.la \
libsystemd-dbus.la \
libsystemd-label.la \
libsystemd-shared.la \
libsystemd-dbus.la \
+ libsystemd-audit.la \
libsystemd-id128-internal.la \
libudev.la \
$(LIBWRAP_LIBS) \
libsystemd-id128-internal.la \
libudev.la \
$(LIBWRAP_LIBS) \
@@
-1736,6
+1742,7
@@
dist_udevrules_DATA += \
rules/60-persistent-input.rules \
rules/60-persistent-alsa.rules \
rules/60-persistent-storage.rules \
rules/60-persistent-input.rules \
rules/60-persistent-alsa.rules \
rules/60-persistent-storage.rules \
+ rules/64-btrfs.rules \
rules/75-net-description.rules \
rules/75-tty-description.rules \
rules/78-sound-card.rules \
rules/75-net-description.rules \
rules/75-tty-description.rules \
rules/78-sound-card.rules \
@@
-1796,6
+1803,7
@@
libudev_core_la_SOURCES = \
src/udev/udev-ctrl.c \
src/udev/udev-builtin.c \
src/udev/udev-builtin-blkid.c \
src/udev/udev-ctrl.c \
src/udev/udev-builtin.c \
src/udev/udev-builtin-blkid.c \
+ src/udev/udev-builtin-btrfs.c \
src/udev/udev-builtin-firmware.c \
src/udev/udev-builtin-hwdb.c \
src/udev/udev-builtin-input_id.c \
src/udev/udev-builtin-firmware.c \
src/udev/udev-builtin-hwdb.c \
src/udev/udev-builtin-input_id.c \
@@
-2465,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 \
@@
-2569,13
+2584,15
@@
noinst_PROGRAMS += \
test-journal-send \
test-journal-match \
test-journal-stream \
test-journal-send \
test-journal-match \
test-journal-stream \
- test-journal-verify
+ test-journal-verify \
+ test-mmap-cache
TESTS += \
test-journal \
test-journal-match \
test-journal-stream \
TESTS += \
test-journal \
test-journal-match \
test-journal-stream \
- test-journal-verify
+ test-journal-verify \
+ test-mmap-cache
pkginclude_HEADERS += \
src/systemd/sd-journal.h \
pkginclude_HEADERS += \
src/systemd/sd-journal.h \
@@
-3344,8
+3361,7
@@
systemd_multi_seat_x_SOURCES = \
systemd_multi_seat_x_LDADD = \
libsystemd-label.la \
systemd_multi_seat_x_LDADD = \
libsystemd-label.la \
- libsystemd-shared.la \
- libudev.la
+ libsystemd-shared.la
rootlibexec_PROGRAMS += \
systemd-multi-seat-x
rootlibexec_PROGRAMS += \
systemd-multi-seat-x