8 files changed, 48 insertions, 12 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 e6b1e8e765..e485cac514 100644
--- a/src/systemd-nspawn/Makefile
+++ b/src/systemd-nspawn/Makefile
@@ -20,6 +20,9 @@
 #
 #  You should have received a copy of the GNU Lesser General Public License
 #  along with systemd; If not, see <http://www.gnu.org/licenses/>.
+include $(dir $(lastword $(MAKEFILE_LIST)))/../../config.mk
+include $(topsrcdir)/automake.head.mk
+
 systemd_nspawn_SOURCES = \
 	src/nspawn/nspawn.c \
 	src/nspawn/nspawn-settings.c \
@@ -43,6 +46,36 @@ systemd_nspawn_SOURCES = \
 	src/core/loopback-setup.c \
 	src/core/loopback-setup.h
 
+am_out_files = systemd-nspawn
+CPPFLAGS += -I$(topsrcdir)/src/libbasic
+CPPFLAGS += -I$(topoutdir)/src/libbasic
+CPPFLAGS += -I$(topsrcdir)/src/libshared
+CPPFLAGS += -I$(topoutdir)/src/libshared
+CPPFLAGS += -I$(topsrcdir)/src/libsystemd/include
+CPPFLAGS += -I$(topoutdir)/src/libsystemd/include
+CPPFLAGS += -I$(topsrcdir)/src/libudev/include
+CPPFLAGS += -I$(topoutdir)/src/libudev/include
+$(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 \
+	$(topsrcdir)/libshared/libshared.la $(BLKID_LIBS)
+
+$(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
+
 nodist_systemd_nspawn_SOURCES = \
 	src/nspawn/nspawn-gperf.c
 
@@ -63,3 +96,4 @@ systemd_nspawn_LDADD += \
 	libfirewall.la
 endif
 
+include $(topsrcdir)/automake.tail.mk
diff --git a/src/systemd-nspawn/nspawn-expose-ports.c b/src/systemd-nspawn/nspawn-expose-ports.c
index 86124b8779..8122a14f7b 100644
--- a/src/systemd-nspawn/nspawn-expose-ports.c
+++ b/src/systemd-nspawn/nspawn-expose-ports.c
@@ -17,7 +17,7 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "sd-netlink.h"
+#include <systemd/sd-netlink.h>
 
 #include "alloc-util.h"
 #include "fd-util.h"
diff --git a/src/systemd-nspawn/nspawn-expose-ports.h b/src/systemd-nspawn/nspawn-expose-ports.h
index 741ad9765c..0e9f8f7e88 100644
--- a/src/systemd-nspawn/nspawn-expose-ports.h
+++ b/src/systemd-nspawn/nspawn-expose-ports.h
@@ -21,8 +21,8 @@
 
 #include <inttypes.h>
 
-#include "sd-event.h"
-#include "sd-netlink.h"
+#include <systemd/sd-event.h>
+#include <systemd/sd-netlink.h>
 
 #include "in-addr-util.h"
 #include "list.h"
diff --git a/src/systemd-nspawn/nspawn-network.c b/src/systemd-nspawn/nspawn-network.c
index fcb1efaa74..970eba3ae1 100644
--- a/src/systemd-nspawn/nspawn-network.c
+++ b/src/systemd-nspawn/nspawn-network.c
@@ -20,13 +20,12 @@
 #include <linux/veth.h>
 #include <net/if.h>
 
-#include "libudev.h"
-#include "sd-id128.h"
-#include "sd-netlink.h"
+#include <libudev.h>
+#include <systemd/sd-id128.h>
+#include <systemd/sd-netlink.h>
 
 #include "alloc-util.h"
 #include "ether-addr-util.h"
-#include "netlink-util.h"
 #include "nspawn-network.h"
 #include "siphash24.h"
 #include "string-util.h"
diff --git a/src/systemd-nspawn/nspawn-register.c b/src/systemd-nspawn/nspawn-register.c
index 760861089d..3b0d778f43 100644
--- a/src/systemd-nspawn/nspawn-register.c
+++ b/src/systemd-nspawn/nspawn-register.c
@@ -17,7 +17,7 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "sd-bus.h"
+#include <systemd/sd-bus.h>
 
 #include "bus-error.h"
 #include "bus-util.h"
diff --git a/src/systemd-nspawn/nspawn-register.h b/src/systemd-nspawn/nspawn-register.h
index 304c5a485b..c7a50f7477 100644
--- a/src/systemd-nspawn/nspawn-register.h
+++ b/src/systemd-nspawn/nspawn-register.h
@@ -21,7 +21,7 @@
 
 #include <sys/types.h>
 
-#include "sd-id128.h"
+#include <systemd/sd-id128.h>
 
 #include "nspawn-mount.h"
 
diff --git a/src/systemd-nspawn/nspawn.c b/src/systemd-nspawn/nspawn.c
index ef348c335b..1de527b57b 100644
--- a/src/systemd-nspawn/nspawn.c
+++ b/src/systemd-nspawn/nspawn.c
@@ -41,8 +41,8 @@
 #include <sys/types.h>
 #include <unistd.h>
 
-#include "sd-daemon.h"
-#include "sd-id128.h"
+#include <systemd/sd-daemon.h>
+#include <systemd/sd-id128.h>
 
 #include "alloc-util.h"
 #include "barrier.h"
@@ -69,7 +69,6 @@
 #include "missing.h"
 #include "mkdir.h"
 #include "mount-util.h"
-#include "netlink-util.h"
 #include "nspawn-cgroup.h"
 #include "nspawn-expose-ports.h"
 #include "nspawn-mount.h"