From 658d4fefc78a50ad825f95f55f640a2a97134f80 Mon Sep 17 00:00:00 2001
From: Luke Shumaker <lukeshu@sbcglobal.net>
Date: Fri, 27 May 2016 15:32:35 -0400
Subject: stuff

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

(limited to 'src/systemd-nspawn')

diff --git a/src/systemd-nspawn/Makefile b/src/systemd-nspawn/Makefile
index e485cac514..9adc4a0dea 100644
--- a/src/systemd-nspawn/Makefile
+++ b/src/systemd-nspawn/Makefile
@@ -46,15 +46,19 @@ systemd_nspawn_SOURCES = \
 	src/core/loopback-setup.c \
 	src/core/loopback-setup.h
 
+nodist_systemd_nspawn_SOURCES = \
+	src/nspawn/nspawn-gperf.c
+
+gperf_gperf_sources += \
+	src/nspawn/nspawn-gperf.gperf
+
 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
+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 \
@@ -67,7 +71,10 @@ $(outdir)/systemd-nspawn: \
 	$(outdir)/nspawn-stub-pid1.o \
 	$(outdir)/mount-setup.o \
 	$(outdir)/loopback-setup.o \
-	$(topsrcdir)/libshared/libshared.la $(BLKID_LIBS)
+	$(libshared.DEPENDS) $(libblkid.DEPENDS)
+ifneq ($(HAVE_LIBIPTC),)
+$(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) $< $@
@@ -76,24 +83,4 @@ $(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
-
-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
-
 include $(topsrcdir)/automake.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"
-- 
cgit v1.2.3-54-g00ecf