X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=Makefile.am;h=f9589748338a9f22a4adb077e8c9d3395557274e;hb=a7e3212d89d5aefee67de79c1e7eaccf2f5645ac;hp=969f85adfee82f86c9a9297406cf8e47fbda2005;hpb=e3017af97310da024ffb378ed155bc1676922ce7;p=elogind.git diff --git a/Makefile.am b/Makefile.am index 969f85adf..f95897483 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 # ------------------------------------------------------------------------------ @@ -1660,6 +1661,8 @@ libsystemd_bus_la_SOURCES = \ src/libsystemd-bus/bus-error.h \ src/libsystemd-bus/bus-internal.c \ src/libsystemd-bus/bus-internal.h \ + src/libsystemd-bus/bus-socket.c \ + src/libsystemd-bus/bus-socket.h \ src/libsystemd-bus/bus-message.c \ src/libsystemd-bus/bus-message.h \ src/libsystemd-bus/bus-signature.c \ @@ -1832,9 +1835,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 +2506,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 \