journald: split console transport stuff into its own file

[elogind.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 3eeb842afe6edc39135c2a4bfe458f4be6a9f47f..dfcb960b0754d9c48e4840e0a3ff142656dfd341 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -2309,6 +2309,14 @@ EXTRA_DIST += \
 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/journald-stream.c \
+       src/journal/journald-stream.h \
+       src/journal/journald-console.c \
+       src/journal/journald-console.h \
        src/journal/journal-rate-limit.c \
        src/journal/journal-rate-limit.h \
        src/journal/journal-internal.h
@@ -2322,7 +2330,8 @@ systemd_journald_LDADD = \
        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 += \
@@ -2353,6 +2362,18 @@ journalctl_LDADD = \
        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
 
@@ -2402,8 +2423,6 @@ libsystemd_journal_la_SOURCES = \
        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 \
@@ -2455,6 +2474,8 @@ endif
 
 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
 
@@ -3021,8 +3042,8 @@ dbusinterface_DATA += \
 
 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 )