chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
hwdb: ID_PRODUCT_FROM_DATABASE --> ID_MODEL_FROM_DATABASE
[elogind.git]
/
Makefile.am
diff --git
a/Makefile.am
b/Makefile.am
index d9cc5f0f96e9f53b8e558ea17b5cad06bc9476ba..d81a3054418ea6cb01f0123e98d49e291abf3611 100644
(file)
--- a/
Makefile.am
+++ b/
Makefile.am
@@
-793,7
+793,8
@@
libsystemd_acl_la_CFLAGS = \
$(ACL_CFLAGS)
libsystemd_acl_la_LIBADD = \
$(ACL_CFLAGS)
libsystemd_acl_la_LIBADD = \
- $(ACL_LIBS)
+ $(ACL_LIBS) \
+ libsystemd-shared.la
endif
# ------------------------------------------------------------------------------
endif
# ------------------------------------------------------------------------------
@@
-1668,7
+1669,8
@@
libsystemd_bus_la_SOURCES = \
src/libsystemd-bus/bus-type.h
libsystemd_bus_la_LIBADD = \
src/libsystemd-bus/bus-type.h
libsystemd_bus_la_LIBADD = \
- libsystemd-id128-internal.la
+ libsystemd-id128-internal.la \
+ libsystemd-shared.la
noinst_LTLIBRARIES += \
libsystemd-bus.la
noinst_LTLIBRARIES += \
libsystemd-bus.la
@@
-1831,9
+1833,9
@@
dist_udevrules_DATA += \
rules/95-udev-late.rules
dist_udevhwdb_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-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 \
hwdb/20-usb-classes.hwdb \
hwdb/20-bluetooth-vendor-product.hwdb \
hwdb/20-acpi-vendor.hwdb \
@@
-2502,6
+2504,11
@@
journalctl_LDADD = \
libsystemd-id128-internal.la \
libsystemd-logs.la
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 \
if HAVE_QRENCODE
journalctl_SOURCES += \
src/journal/journal-qrcode.c \