chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
journald: splitt of syslog protocol support into its own file
[elogind.git]
/
Makefile.am
diff --git
a/Makefile.am
b/Makefile.am
index 895dcfa334f16b8da24c91c8f787d6674b6295df..d98657870520078dbe87b981f1bce1490db2d932 100644
(file)
--- a/
Makefile.am
+++ b/
Makefile.am
@@
-2182,6
+2182,7
@@
dist_udevkeymap_DATA = \
keymaps/module-sony \
keymaps/module-sony-old \
keymaps/module-sony-vgn \
keymaps/module-sony \
keymaps/module-sony-old \
keymaps/module-sony-vgn \
+ keymaps/module-sony-vpc \
keymaps/olpc-xo \
keymaps/onkyo \
keymaps/oqo-model2 \
keymaps/olpc-xo \
keymaps/onkyo \
keymaps/oqo-model2 \
@@
-2308,6
+2309,10
@@
EXTRA_DIST += \
systemd_journald_SOURCES = \
src/journal/journald.c \
src/journal/journald.h \
systemd_journald_SOURCES = \
src/journal/journald.c \
src/journal/journald.h \
+ src/journal/journald-kmsg.c \
+ src/journal/journald-kmsg.h \
+ src/journal/journald-syslog.c \
+ src/journal/journald-syslog.h \
src/journal/journal-rate-limit.c \
src/journal/journal-rate-limit.h \
src/journal/journal-internal.h
src/journal/journal-rate-limit.c \
src/journal/journal-rate-limit.h \
src/journal/journal-internal.h
@@
-2321,7
+2326,8
@@
systemd_journald_LDADD = \
libsystemd-audit.la \
libsystemd-daemon.la \
libsystemd-id128-internal.la \
libsystemd-audit.la \
libsystemd-daemon.la \
libsystemd-id128-internal.la \
- libsystemd-journal-internal.la
+ libsystemd-journal-internal.la \
+ libudev.la
if ENABLE_LOGIND
systemd_journald_LDADD += \
if ENABLE_LOGIND
systemd_journald_LDADD += \
@@
-2352,6
+2358,18
@@
journalctl_LDADD = \
libsystemd-id128-internal.la \
libsystemd-logs.la
libsystemd-id128-internal.la \
libsystemd-logs.la
+if HAVE_QRENCODE
+journalctl_SOURCES += \
+ src/journal/journal-qrcode.c \
+ src/journal/journal-qrcode.h
+
+journalctl_CFLAGS += \
+ $(QRENCODE_CFLAGS)
+
+journalctl_LDADD += \
+ $(QRENCODE_LIBS)
+endif
+
test_journal_SOURCES = \
src/journal/test-journal.c
test_journal_SOURCES = \
src/journal/test-journal.c
@@
-2401,12
+2419,9
@@
libsystemd_journal_la_SOURCES = \
src/journal/journal-vacuum.h \
src/journal/journal-verify.c \
src/journal/journal-verify.h \
src/journal/journal-vacuum.h \
src/journal/journal-verify.c \
src/journal/journal-verify.h \
- src/journal/journal-authenticate.c \
- src/journal/journal-authenticate.h \
src/journal/lookup3.c \
src/journal/lookup3.h \
src/journal/journal-send.c \
src/journal/lookup3.c \
src/journal/lookup3.h \
src/journal/journal-send.c \
- src/journal/journal-send.h \
src/journal/sparse-endian.h \
src/journal/journal-def.h \
src/journal/compress.h \
src/journal/sparse-endian.h \
src/journal/journal-def.h \
src/journal/compress.h \
@@
-2455,6
+2470,8
@@
endif
if HAVE_GCRYPT
libsystemd_journal_la_SOURCES += \
if HAVE_GCRYPT
libsystemd_journal_la_SOURCES += \
+ src/journal/journal-authenticate.c \
+ src/journal/journal-authenticate.h \
src/journal/fsprg.c \
src/journal/fsprg.h
src/journal/fsprg.c \
src/journal/fsprg.h
@@
-3021,8
+3038,8
@@
dbusinterface_DATA += \
timedated-install-data-hook:
$(MKDIR_P) -m 0755 \
timedated-install-data-hook:
$(MKDIR_P) -m 0755 \
- $(DESTDIR)$(prefix)/lib/ntp-units.d \
- $(DESTDIR)$(sysconfdir)/ntp-units.d
+ $(DESTDIR)$(prefix)/lib/
systemd/
ntp-units.d \
+ $(DESTDIR)$(sysconfdir)/
systemd/
ntp-units.d
( cd $(DESTDIR)$(systemunitdir) && \
rm -f dbus-org.freedesktop.timedate1.service && \
$(LN_S) systemd-timedated.service dbus-org.freedesktop.timedate1.service )
( cd $(DESTDIR)$(systemunitdir) && \
rm -f dbus-org.freedesktop.timedate1.service && \
$(LN_S) systemd-timedated.service dbus-org.freedesktop.timedate1.service )