summaryrefslogtreecommitdiff
path: root/src/systemd-nspawn
diff options
context:
space:
mode:
authorLuke Shumaker <lukeshu@sbcglobal.net>2016-06-01 19:00:45 -0400
committerLuke Shumaker <lukeshu@sbcglobal.net>2016-06-01 19:00:45 -0400
commit20ffc795870deefd38eaf89171a7b06abf71de31 (patch)
tree46bf9f1ae71a1e25b05d3956c192e9b1163e9fab /src/systemd-nspawn
parent0ff87b898afb47596de94d9767cf4cb19d2d69e0 (diff)
more stuff
Diffstat (limited to 'src/systemd-nspawn')
-rw-r--r--src/systemd-nspawn/Makefile33
1 files changed, 9 insertions, 24 deletions
diff --git a/src/systemd-nspawn/Makefile b/src/systemd-nspawn/Makefile
index 93be30509f..cca337be90 100644
--- a/src/systemd-nspawn/Makefile
+++ b/src/systemd-nspawn/Makefile
@@ -66,31 +66,16 @@ systemd_nspawn_LDADD += \
libfirewall.la
endif
+bin_PROGRAMS += systemd-nspawn
$(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
-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),)
-$(outdir)/systemd-nspawn: $(libfirewall.DEPENDS)
-endif
-$(outdir)/nspawn.o: $(outdir)/loopback-setup.h
+CPPFLAGS += $(libbasic.CPPFLAGS)
+CPPFLAGS += $(libshared.CPPFLAGS)
+CPPFLAGS += $(libsystemd.CPPFLAGS)
+CPPFLAGS += $(libudev.CPPFLAGS)
+CPPFLAGS += -I$(topsrcdir)/src/libsystemd/src/sd-netlink
+CPPFLAGS += -I$(topsrcdir)/src/libsystemd/src/sd-bus
+CPPFLAGS += -I$(topsrcdir)/src
+CPPFLAGS += /udev -I$(topsrcdir)/src/libudev/src
include $(topsrcdir)/build-aux/Makefile.tail.mk