X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=Makefile.am;h=d98657870520078dbe87b981f1bce1490db2d932;hb=35e2e347d38cc2f8bd7c38a0d8a5129f5fbb0ab9;hp=166c357db2db15e385f127dea1c2bd437fe95467;hpb=feb12d3ed2c7f9132c64773c7c41b9e3a608a814;p=elogind.git

diff --git a/Makefile.am b/Makefile.am
index 166c357db..d98657870 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -2309,6 +2309,10 @@ 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/journal-rate-limit.c \
 	src/journal/journal-rate-limit.h \
 	src/journal/journal-internal.h
@@ -2322,7 +2326,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 +2358,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
 
@@ -3021,8 +3038,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 )