X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=Makefile.am;h=d6bc5a4faeb4e5585165920704cefbe162b7d7ab;hb=9d9951a460a90ef0e1e0384742cefdcf85193f8c;hp=6cc83162dd77fb08022f92134a6e6b1b746bfcf4;hpb=e48fdd84432bbf9c2ecc339183258c7c33116032;p=elogind.git diff --git a/Makefile.am b/Makefile.am index 6cc83162d..d6bc5a4fa 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1839,7 +1839,8 @@ systemgenerator_PROGRAMS += \ systemd-gpt-auto-generator systemd_gpt_auto_generator_SOURCES = \ - src/gpt-auto-generator/gpt-auto-generator.c + src/gpt-auto-generator/gpt-auto-generator.c \ + src/shared/blkid-util.h systemd_gpt_auto_generator_LDADD = \ libsystemd-label.la \ @@ -1964,14 +1965,16 @@ systemd_nspawn_SOURCES = \ systemd_nspawn_CFLAGS = \ $(AM_CFLAGS) \ - $(SECCOMP_CFLAGS) + $(SECCOMP_CFLAGS) \ + $(BLKID_CFLAGS) systemd_nspawn_LDADD = \ libsystemd-label.la \ libsystemd-capability.la \ libsystemd-internal.la \ libudev-internal.la \ - libsystemd-shared.la + libsystemd-shared.la \ + $(BLKID_LIBS) if HAVE_SECCOMP systemd_nspawn_LDADD += \ @@ -2572,7 +2575,6 @@ dist_network_DATA = \ network/80-container-host0.network dist_udevrules_DATA += \ - rules/99-systemd.rules \ rules/42-usb-hid-pm.rules \ rules/50-udev-default.rules \ rules/60-drm.rules \ @@ -2589,6 +2591,9 @@ dist_udevrules_DATA += \ rules/80-net-setup-link.rules \ rules/95-udev-late.rules +nodist_udevrules_DATA += \ + rules/99-systemd.rules + dist_udevhwdb_DATA = \ hwdb/20-pci-vendor-model.hwdb \ hwdb/20-pci-classes.hwdb \