From 0ff87b898afb47596de94d9767cf4cb19d2d69e0 Mon Sep 17 00:00:00 2001
From: Luke Shumaker <lukeshu@sbcglobal.net>
Date: Wed, 1 Jun 2016 18:52:36 -0400
Subject: revert some changes

---
 src/systemd-nspawn/Makefile              | 16 +++++++++++++++-
 src/systemd-nspawn/nspawn-expose-ports.c |  2 +-
 src/systemd-nspawn/nspawn-network.c      |  2 +-
 3 files changed, 17 insertions(+), 3 deletions(-)

(limited to 'src/systemd-nspawn')

diff --git a/src/systemd-nspawn/Makefile b/src/systemd-nspawn/Makefile
index a8cd4f5d7e..93be30509f 100644
--- a/src/systemd-nspawn/Makefile
+++ b/src/systemd-nspawn/Makefile
@@ -52,6 +52,21 @@ 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)
+
+ifneq ($(HAVE_LIBIPTC),)
+systemd_nspawn_LDADD += \
+	libfirewall.la
+endif
+
+$(eval $(value automake2autothing))
 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
@@ -78,5 +93,4 @@ endif
 
 $(outdir)/nspawn.o: $(outdir)/loopback-setup.h
 
-$(eval $(value automake2autothing))
 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 d82e495fa8..8122a14f7b 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 769f865195..d03fd001a7 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>
 
-- 
cgit v1.2.3-54-g00ecf