X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=Makefile.am;h=dfcb960b0754d9c48e4840e0a3ff142656dfd341;hb=3b7124a8db56ed57525b9ecfd19cfdc8c9facba0;hp=3e7ef27ebd9768bcf2b6372c599a09ac0efbe4c9;hpb=f5028bfaf06b58a59d45fcd875dced1413703999;p=elogind.git

diff --git a/Makefile.am b/Makefile.am
index 3e7ef27eb..dfcb960b0 100644
--- 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-vpc \
 	keymaps/olpc-xo \
 	keymaps/onkyo \
 	keymaps/oqo-model2 \
@@ -2308,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
@@ -2321,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 += \
@@ -2352,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
 
@@ -2401,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 \
@@ -2454,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
 
@@ -3020,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 )