4 files changed, 34 insertions, 13 deletions
diff --git a/src/systemd-nspawn/.gitignore b/src/systemd-nspawn/.gitignore
index 85c81fff24..b1ba4fd9af 100644
--- a/src/systemd-nspawn/.gitignore
+++ b/src/systemd-nspawn/.gitignore
@@ -1 +1,5 @@
 /nspawn-gperf.c
+/loopback-setup.c
+/loopback-setup.h
+/mount-setup.c
+/mount-setup.h
diff --git a/src/systemd-nspawn/Makefile b/src/systemd-nspawn/Makefile
index 742d8ad82e..12b002c868 100644
--- a/src/systemd-nspawn/Makefile
+++ b/src/systemd-nspawn/Makefile
@@ -52,18 +52,35 @@ nodist_systemd_nspawn_SOURCES = \
 gperf_gperf_sources += \
 	src/nspawn/nspawn-gperf.gperf
 
-systemd_nspawn_CFLAGS = \
-	$(AM_CFLAGS) \
-	$(BLKID_CFLAGS) \
-	$(SECCOMP_CFLAGS)
-
-systemd_nspawn_LDADD = \
-	libshared.la \
-	$(BLKID_LIBS)
-
+std.out_files = systemd-nspawn
+CPPFLAGS += $(libbasic.CPPFLAGS) $(libshared.CPPFLAGS) $(libsystemd.CPPFLAGS) $(libudev.CPPFLAGS) $(libblkid.CPPFLAGS)
+CPPFLAGS += -I$(topsrcdir)/src/libsystemd/src/sd-netlink -I$(topsrcdir)/src/libsystemd/src/sd-bus -I$(topsrcdir)/src/udev -I$(topsrcdir)/src/libudev/src
+CPPFLAGS += $(libblkid.CPPFLAGS) $(libseccomp.CPPFLAGS)
+ifneq ($(HAVE_LIBIPTC),)
+CPPFLAGS += $(libfirewall.CPPFLAGS)
+endif
+$(outdir)/systemd-nspawn: \
+	$(outdir)/nspawn.o \
+	$(outdir)/nspawn-settings.o \
+	$(outdir)/nspawn-mount.o \
+	$(outdir)/nspawn-network.o \
+	$(outdir)/nspawn-expose-ports.o \
+	$(outdir)/nspawn-cgroup.o \
+	$(outdir)/nspawn-register.o \
+	$(outdir)/nspawn-setuid.o \
+	$(outdir)/nspawn-stub-pid1.o \
+	$(outdir)/mount-setup.o \
+	$(outdir)/loopback-setup.o \
+	$(libshared.DEPENDS) $(libblkid.DEPENDS)
 ifneq ($(HAVE_LIBIPTC),)
-systemd_nspawn_LDADD += \
-	libfirewall.la
+$(outdir)/systemd-nspawn: $(libfirewall.DEPENDS)
 endif
 
+$(outdir)/mount-setup.c: $(topsrcdir)/src/libcore/mount-setup.c; $(CP) $< $@
+$(outdir)/mount-setup.h: $(topsrcdir)/src/libcore/mount-setup.h; $(CP) $< $@
+$(outdir)/loopback-setup.c: $(topsrcdir)/src/libcore/loopback-setup.c; $(CP) $< $@
+$(outdir)/loopback-setup.h: $(topsrcdir)/src/libcore/loopback-setup.h; $(CP) $< $@
+
+$(outdir)/nspawn.o: $(outdir)/loopback-setup.h
+
 include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/systemd-nspawn/nspawn-expose-ports.c b/src/systemd-nspawn/nspawn-expose-ports.c
index 8122a14f7b..d82e495fa8 100644
--- a/src/systemd-nspawn/nspawn-expose-ports.c
+++ b/src/systemd-nspawn/nspawn-expose-ports.c
@@ -21,7 +21,7 @@
 
 #include "alloc-util.h"
 #include "fd-util.h"
-#include "firewall-util.h"
+#include <firewall-util.h>
 #include "in-addr-util.h"
 #include "local-addresses.h"
 #include "netlink-util.h"
diff --git a/src/systemd-nspawn/nspawn-network.c b/src/systemd-nspawn/nspawn-network.c
index d03fd001a7..769f865195 100644
--- a/src/systemd-nspawn/nspawn-network.c
+++ b/src/systemd-nspawn/nspawn-network.c
@@ -20,7 +20,7 @@
 #include <linux/veth.h>
 #include <net/if.h>
 
-#include "libudev.h"
+#include <libudev.h>
 #include <systemd/sd-id128.h>
 #include <systemd/sd-netlink.h>