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

diff --git a/Makefile.am b/Makefile.am
index 3e7ef27eb..69cdeb714 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 \
@@ -2352,6 +2353,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 +2414,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 +2465,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