Merge branch 'post' into lukeshu-postmove

# Conflicts:
#	Makefile.am
#	am-pretty.mk
#	common.once.head.mk
#	config.mk.in
#	discard.mk
#	src/kernel-install/Makefile
#	src/libbasic/Makefile
#	src/libcore/Makefile
#	src/libfirewall/Makefile
#	src/libshared/Makefile
#	src/libsystemd/Makefile
#	src/libsystemd/src/Makefile
#	src/libudev/Makefile
#	src/libudev/src/Makefile
#	src/system/systemd/Makefile
#	src/systemd-nspawn/.gitignore
#	src/systemd-nspawn/Makefile

7 files changed, 110 insertions, 32 deletions

diff --git a/src/libcore/Makefile b/src/libcore/Makefile
index 746287ce61..87ec8ef9c3 100644
--- a/src/libcore/Makefile
+++ b/src/libcore/Makefile
@@ -20,7 +20,6 @@
 #
 #  You should have received a copy of the GNU Lesser General Public License
 #  along with systemd; If not, see <http://www.gnu.org/licenses/>.
-
 noinst_LTLIBRARIES += \
 	libcore.la
 
@@ -166,3 +165,16 @@ libcore_la_LIBADD = \
 src/core/load-fragment-gperf-nulstr.c: src/core/load-fragment-gperf.gperf
 	$(AM_V_at)$(MKDIR_P) $(dir $@)
 	$(AM_V_GEN)$(AWK) 'BEGIN{ keywords=0 ; FS="," ; print "extern const char load_fragment_gperf_nulstr[];" ; print "const char load_fragment_gperf_nulstr[] ="} ; keyword==1 { print "\"" $$1 "\\0\"" } ; /%%/ { keyword=1} ; END { print ";" }' < $< > $@
+
+systemd_shutdown_SOURCES = \
+	src/core/umount.c \
+	src/core/umount.h \
+	src/core/shutdown.c \
+	src/core/mount-setup.c \
+	src/core/mount-setup.h \
+	src/core/killall.h \
+	src/core/killall.c
+
+systemd_shutdown_LDADD = \
+	libshared.la
+
diff --git a/src/libfirewall/Makefile b/src/libfirewall/Makefile
index b12fe3c33a..f0697f1513 100644
--- a/src/libfirewall/Makefile
+++ b/src/libfirewall/Makefile
@@ -1,3 +1,25 @@
+#  -*- Mode: makefile; indent-tabs-mode: t -*-
+#
+#  This file is part of systemd.
+#
+#  Copyright 2010-2012 Lennart Poettering
+#  Copyright 2010-2012 Kay Sievers
+#  Copyright 2013 Zbigniew Jędrzejewski-Szmek
+#  Copyright 2013 David Strauss
+#  Copyright 2016 Luke Shumaker
+#
+#  systemd is free software; you can redistribute it and/or modify it
+#  under the terms of the GNU Lesser General Public License as published by
+#  the Free Software Foundation; either version 2.1 of the License, or
+#  (at your option) any later version.
+#
+#  systemd is distributed in the hope that it will be useful, but
+#  WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+#  Lesser General Public License for more details.
+#
+#  You should have received a copy of the GNU Lesser General Public License
+#  along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ifneq ($(HAVE_LIBIPTC),)
 noinst_LTLIBRARIES += \
 	libfirewall.la
diff --git a/src/libsystemd/Makefile b/src/libsystemd/Makefile
new file mode 100644
index 0000000000..7e7f0d00fc
--- /dev/null
+++ b/src/libsystemd/Makefile
@@ -0,0 +1,39 @@
+#  -*- Mode: makefile; indent-tabs-mode: t -*-
+#
+#  This file is part of systemd.
+#
+#  Copyright 2010-2012 Lennart Poettering
+#  Copyright 2010-2012 Kay Sievers
+#  Copyright 2013 Zbigniew Jędrzejewski-Szmek
+#  Copyright 2013 David Strauss
+#  Copyright 2016 Luke Shumaker
+#
+#  systemd is free software; you can redistribute it and/or modify it
+#  under the terms of the GNU Lesser General Public License as published by
+#  the Free Software Foundation; either version 2.1 of the License, or
+#  (at your option) any later version.
+#
+#  systemd is distributed in the hope that it will be useful, but
+#  WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+#  Lesser General Public License for more details.
+#
+#  You should have received a copy of the GNU Lesser General Public License
+#  along with systemd; If not, see <http://www.gnu.org/licenses/>.
+test-libsystemd-sym.c: \
+		$(top_builddir)/src/libsystemd/libsystemd.sym \
+		src/systemd/sd-journal.h \
+		src/systemd/sd-daemon.h \
+		src/systemd/sd-login.h \
+		src/systemd/sd-bus.h \
+		src/systemd/sd-utf8.h \
+		src/systemd/sd-resolve.h \
+		src/systemd/sd-path.h \
+		src/systemd/sd-event.h
+	$(generate-sym-test)
+
+nodist_test_libsystemd_sym_SOURCES = \
+	test-libsystemd-sym.c
+test_libsystemd_sym_LDADD = \
+	libsystemd.la
+
diff --git a/src/libsystemd/src/Makefile b/src/libsystemd/src/Makefile
index cf72f9ea95..01a31f1d17 100644
--- a/src/libsystemd/src/Makefile
+++ b/src/libsystemd/src/Makefile
@@ -357,20 +357,3 @@ busctl_SOURCES = \
 busctl_LDADD = \
 	libshared.la
 
-test-libsystemd-sym.c: \
-		$(top_builddir)/src/libsystemd/libsystemd.sym \
-		src/systemd/sd-journal.h \
-		src/systemd/sd-daemon.h \
-		src/systemd/sd-login.h \
-		src/systemd/sd-bus.h \
-		src/systemd/sd-utf8.h \
-		src/systemd/sd-resolve.h \
-		src/systemd/sd-path.h \
-		src/systemd/sd-event.h
-	$(generate-sym-test)
-
-nodist_test_libsystemd_sym_SOURCES = \
-	test-libsystemd-sym.c
-test_libsystemd_sym_LDADD = \
-	libsystemd.la
-
diff --git a/src/libudev/Makefile b/src/libudev/Makefile
new file mode 100644
index 0000000000..8aefffb488
--- /dev/null
+++ b/src/libudev/Makefile
@@ -0,0 +1,35 @@
+#  -*- Mode: makefile; indent-tabs-mode: t -*-
+#
+#  This file is part of systemd.
+#
+#  Copyright 2010-2012 Lennart Poettering
+#  Copyright 2010-2012 Kay Sievers
+#  Copyright 2013 Zbigniew Jędrzejewski-Szmek
+#  Copyright 2013 David Strauss
+#  Copyright 2016 Luke Shumaker
+#
+#  systemd is free software; you can redistribute it and/or modify it
+#  under the terms of the GNU Lesser General Public License as published by
+#  the Free Software Foundation; either version 2.1 of the License, or
+#  (at your option) any later version.
+#
+#  systemd is distributed in the hope that it will be useful, but
+#  WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+#  Lesser General Public License for more details.
+#
+#  You should have received a copy of the GNU Lesser General Public License
+#  along with systemd; If not, see <http://www.gnu.org/licenses/>.
+test-libudev-sym.c: \
+		src/libudev/libudev.sym \
+		src/udev/udev.h
+	$(generate-sym-test)
+
+nodist_test_libudev_sym_SOURCES = \
+	test-libudev-sym.c
+test_libudev_sym_CFLAGS = \
+	$(AM_CFLAGS) \
+	-Wno-deprecated-declarations
+test_libudev_sym_LDADD = \
+	libudev.la
+
diff --git a/src/libudev/src/Makefile b/src/libudev/src/Makefile
index 3f1540b14a..2ff3272d48 100644
--- a/src/libudev/src/Makefile
+++ b/src/libudev/src/Makefile
@@ -75,16 +75,3 @@ noinst_LTLIBRARIES += \
 libudev_internal_la_SOURCES =\
 	$(libudev_la_SOURCES)
 
-test-libudev-sym.c: \
-		src/libudev/libudev.sym \
-		src/udev/udev.h
-	$(generate-sym-test)
-
-nodist_test_libudev_sym_SOURCES = \
-	test-libudev-sym.c
-test_libudev_sym_CFLAGS = \
-	$(AM_CFLAGS) \
-	-Wno-deprecated-declarations
-test_libudev_sym_LDADD = \
-	libudev.la
-
diff --git a/src/system/systemd/Makefile b/src/system/systemd/Makefile
index e873ba3f94..16e2681222 100644
--- a/src/system/systemd/Makefile
+++ b/src/system/systemd/Makefile
@@ -20,7 +20,6 @@
 #
 #  You should have received a copy of the GNU Lesser General Public License
 #  along with systemd; If not, see <http://www.gnu.org/licenses/>.
-
 systemd_SOURCES = \
 	src/core/main.c
 
@@ -61,3 +60,4 @@ dist_systemunit_DATA_busnames += \
 
 BUSNAMES_TARGET_WANTS += \
 	org.freedesktop.systemd1.busname
+