diff options
| author | Luke Shumaker <lukeshu@sbcglobal.net> | 2016-06-07 02:50:07 -0400 |
|---|---|---|
| committer | Luke Shumaker <lukeshu@sbcglobal.net> | 2016-06-07 02:50:07 -0400 |
| commit | 590eca26c13f4d704b2fc614e7ef49b600e6b5e0 (patch) | |
| tree | 0ce57d70ead69a55809c631d605d4fd2b6c853ef /src/systemd-nspawn | |
| parent | d10902f55ae7aed2eeffedcd29d8ced80ec903ba (diff) | |
| parent | f0c56a8635949d284e6fb61e04d07e9a8e2b429b (diff) | |
Merge branch 'lukeshu/postmove' into lukeshu/master
# Conflicts:
# build-aux/Makefile.each.tail/20-systemd.mk
# build-aux/Makefile.once.head/20-systemd.mk
# build-aux/Makefile.once.tail/20-systemd.mk
# config.mk.in
# src/busctl/Makefile
# src/grp-boot/bootctl/Makefile
# src/grp-boot/systemd-boot/Makefile
# src/grp-coredump/coredumpctl/Makefile
# src/grp-coredump/systemd-coredump/Makefile
# src/grp-machine/libmachine-core/Makefile
# src/grp-machine/nss-mymachines/Makefile
# src/libbasic/Makefile
# src/libfirewall/Makefile
# src/libshared/Makefile
# src/libsystemd/Makefile
# src/libsystemd/libsystemd-internal/Makefile
# src/libsystemd/libsystemd-journal-internal/Makefile
# src/libudev/src/Makefile
# src/systemd-nspawn/Makefile
Diffstat (limited to 'src/systemd-nspawn')
| -rw-r--r-- | src/systemd-nspawn/Makefile | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/systemd-nspawn/Makefile b/src/systemd-nspawn/Makefile index 778afb8dc8..0cb85bb82d 100644 --- a/src/systemd-nspawn/Makefile +++ b/src/systemd-nspawn/Makefile @@ -67,7 +67,6 @@ systemd_nspawn_LDADD += \ endif # HAVE_LIBIPTC bin_PROGRAMS += systemd-nspawn -$(eval $(value automake2autothing)) at.depdirs += $(topoutdir)/src/libshared $(if $(HAVE_LIBIPTC),$(topoutdir)/src/libfirewall) systemd.CPPFLAGS += $(libshared.CPPFLAGS) $(if $(HAVE_LIBIPTC),$(libfirewall.CPPFLAGS)) |