1 files changed, 11 insertions, 3 deletions
diff --git a/src/grp-udev/libudev-core/Makefile b/src/grp-udev/libudev-core/Makefile
index 14d4e827a0..54a61b24ce 100644
--- a/src/grp-udev/libudev-core/Makefile
+++ b/src/grp-udev/libudev-core/Makefile
@@ -26,7 +26,7 @@ include $(topsrcdir)/build-aux/Makefile.head.mk
 noinst_LTLIBRARIES += \
 	libudev-core.la
 
-$(outdir)/keyboard-keys-list.txt:
+$(outdir)/keyboard-keys-list.txt: | $(outdir)/$(DEPDIR)
 	$(AM_V_GEN)$(CPP) $(sd.ALL_CPPFLAGS) -dM -include linux/input.h - < /dev/null | $(AWK) '/^#define[ \t]+KEY_[^ ]+[ \t]+[0-9K]/ { if ($$2 != "KEY_MAX") { print $$2 } }' > $@
 
 $(outdir)/keyboard-keys-from-name.gperf: $(outdir)/keyboard-keys-list.txt
@@ -38,7 +38,7 @@ $(outdir)/keyboard-keys-from-name.h: $(outdir)/keyboard-keys-from-name.gperf
 gperf_txt_sources += \
 	src/udev/keyboard-keys-list.txt
 
-libudev_core_la_SOURCES = \
+_libudev_core_la_SOURCES = \
 	src/udev/udev.h \
 	src/udev/udev-event.c \
 	src/udev/udev-watch.c \
@@ -59,7 +59,7 @@ libudev_core_la_SOURCES = \
 	src/udev/net/ethtool-util.h \
 	src/udev/net/ethtool-util.c
 
-nodist_libudev_core_la_SOURCES = \
+_nodist_libudev_core_la_SOURCES = \
 	src/udev/keyboard-keys-from-name.h \
 	src/udev/net/link-config-gperf.c
 
@@ -71,6 +71,9 @@ libudev_core_la_CFLAGS = \
 	$(KMOD_CFLAGS)
 
 libudev_core_la_LIBADD = \
+	libsystemd-internal.la \
+	libsystemd-basic.la \
+	libsystemd-staging.la \
 	libsystemd-network.la \
 	libsystemd-shared.la \
 	$(BLKID_LIBS) \
@@ -94,6 +97,11 @@ libudev_core_la_SOURCES += \
 	src/systemd/sd-login.h
 endif # HAVE_ACL
 
+sd.libudev-core_SOURCES = $(patsubst src/udev/%,%,$(filter %.c,$(_libudev_core_la_SOURCES) $(_nodist_libudev_core_la_SOURCES)))
+$(outdir)/libudev-core.la: $(addprefix $(outdir)/,$(sd.libudev-core_SOURCES:.c=.lo))
+$(outdir)/udev-builtin-keyboard.lo: $(outdir)/keyboard-keys-from-name.h
+sd.CPPFLAGS += -DUDEVLIBEXECDIR=\"$(udevlibexecdir)\"
+
 nested.subdirs += net
 
 include $(topsrcdir)/build-aux/Makefile.tail.mk