X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=Makefile.am;h=d81a3054418ea6cb01f0123e98d49e291abf3611;hb=1d09582ab9d8bc619de3a01f01d614eab44d31c0;hp=969f85adfee82f86c9a9297406cf8e47fbda2005;hpb=e3017af97310da024ffb378ed155bc1676922ce7;p=elogind.git

diff --git a/Makefile.am b/Makefile.am
index 969f85adf..d81a30544 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -793,7 +793,8 @@ libsystemd_acl_la_CFLAGS = \
 	$(ACL_CFLAGS)
 
 libsystemd_acl_la_LIBADD = \
-	$(ACL_LIBS)
+	$(ACL_LIBS) \
+	libsystemd-shared.la
 endif
 
 # ------------------------------------------------------------------------------
@@ -1832,9 +1833,9 @@ dist_udevrules_DATA += \
 	rules/95-udev-late.rules
 
 dist_udevhwdb_DATA = \
-	hwdb/20-pci-vendor-product.hwdb \
+	hwdb/20-pci-vendor-model.hwdb \
 	hwdb/20-pci-classes.hwdb \
-	hwdb/20-usb-vendor-product.hwdb \
+	hwdb/20-usb-vendor-model.hwdb \
 	hwdb/20-usb-classes.hwdb \
 	hwdb/20-bluetooth-vendor-product.hwdb \
 	hwdb/20-acpi-vendor.hwdb \
@@ -2503,6 +2504,11 @@ journalctl_LDADD = \
 	libsystemd-id128-internal.la \
 	libsystemd-logs.la
 
+if HAVE_ACL
+journalctl_LDADD += \
+	libsystemd-acl.la
+endif
+
 if HAVE_QRENCODE
 journalctl_SOURCES += \
 	src/journal/journal-qrcode.c \