X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=Makefile.am;h=94ae549b8f90ed15c077b124ab025a6684889189;hp=65055b3fba7450842f1c47ccdaae42f38f2f7a0a;hb=9a9bb3ca1eddc8caa2d7aa3e6e27d270e296923f;hpb=e8bc0ea2b100158bf35c635039226235aa879068 diff --git a/Makefile.am b/Makefile.am index 65055b3fb..94ae549b8 100644 --- a/Makefile.am +++ b/Makefile.am @@ -801,6 +801,8 @@ libsystemd_shared_la_SOURCES = \ src/shared/hashmap.h \ src/shared/set.c \ src/shared/set.h \ + src/shared/fdset.c \ + src/shared/fdset.h \ src/shared/strv.c \ src/shared/strv.h \ src/shared/strbuf.c \ @@ -847,6 +849,8 @@ libsystemd_shared_la_SOURCES = \ src/shared/calendarspec.c \ src/shared/calendarspec.h +libsystemd_shared_la_LIBADD = libsystemd-daemon.la + #------------------------------------------------------------------------------- noinst_LTLIBRARIES += \ libsystemd-dbus.la @@ -1057,8 +1061,6 @@ libsystemd_core_la_SOURCES = \ src/core/mount-setup.h \ src/core/loopback-setup.h \ src/core/loopback-setup.c \ - src/core/fdset.c \ - src/core/fdset.h \ src/core/condition.c \ src/core/condition.h \ src/core/namespace.c \ @@ -1670,9 +1672,7 @@ systemd_nspawn_SOURCES = \ src/core/mount-setup.c \ src/core/mount-setup.h \ src/core/loopback-setup.c \ - src/core/loopback-setup.h \ - src/core/fdset.c \ - src/core/fdset.h + src/core/loopback-setup.h systemd_nspawn_LDADD = \ libsystemd-label.la \ @@ -1905,6 +1905,7 @@ dist_udevhwdb_DATA = \ hwdb/20-pci-classes.hwdb \ hwdb/20-usb-vendor-product.hwdb \ hwdb/20-usb-classes.hwdb \ + hwdb/20-bluetooth-vendor-product.hwdb \ hwdb/20-acpi-vendor.hwdb \ hwdb/20-OUI.hwdb @@ -3481,6 +3482,8 @@ systemd_logind_SOURCES = \ src/login/logind-device.h \ src/login/logind-button.c \ src/login/logind-button.h \ + src/login/logind-action.c \ + src/login/logind-action.h \ src/login/logind-seat.c \ src/login/logind-seat.h \ src/login/logind-session.c \