Merge branch 'lukeshu/postmove' into lukeshu/master

17 files changed, 94 insertions, 44 deletions

diff --git a/src/grp-machine/systemd-machined/.gitignore b/src/grp-machine/libmachine-core/.gitignore
index e1065b5894..e1065b5894 100644
--- a/src/grp-machine/systemd-machined/.gitignore
+++ b/src/grp-machine/libmachine-core/.gitignore
diff --git a/src/grp-machine/libmachine-core/Makefile b/src/grp-machine/libmachine-core/Makefile
new file mode 100644
index 0000000000..7dc9d419b6
--- /dev/null
+++ b/src/grp-machine/libmachine-core/Makefile
@@ -0,0 +1,51 @@
+#  -*- 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/>.
+include $(dir $(lastword $(MAKEFILE_LIST)))/../../config.mk
+include $(topsrcdir)/build-aux/Makefile.head.mk
+
+libmachine_core_la_SOURCES = \
+	src/machine/machine.c \
+	src/machine/machine.h \
+	src/machine/machined-dbus.c \
+	src/machine/machine-dbus.c \
+	src/machine/machine-dbus.h \
+	src/machine/image-dbus.c \
+	src/machine/image-dbus.h
+
+libmachine_core_la_LIBADD = \
+	libshared.la
+
+noinst_LTLIBRARIES += \
+	libmachine-core.la
+
+test_machine_tables_SOURCES = \
+	src/machine/test-machine-tables.c
+
+test_machine_tables_LDADD = \
+	libmachine-core.la
+
+tests += \
+	test-machine-tables
+
+$(eval $(value automake2autothing))
+include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/grp-machine/systemd-machined/image-dbus.c b/src/grp-machine/libmachine-core/image-dbus.c
index 73f5112c4d..73f5112c4d 100644
--- a/src/grp-machine/systemd-machined/image-dbus.c
+++ b/src/grp-machine/libmachine-core/image-dbus.c
diff --git a/src/grp-machine/systemd-machined/image-dbus.h b/src/grp-machine/libmachine-core/image-dbus.h
index b62da996c6..b62da996c6 100644
--- a/src/grp-machine/systemd-machined/image-dbus.h
+++ b/src/grp-machine/libmachine-core/image-dbus.h
diff --git a/src/grp-machine/systemd-machined/machine-dbus.c b/src/grp-machine/libmachine-core/machine-dbus.c
index 71f20b3f07..71f20b3f07 100644
--- a/src/grp-machine/systemd-machined/machine-dbus.c
+++ b/src/grp-machine/libmachine-core/machine-dbus.c
diff --git a/src/grp-machine/systemd-machined/machine-dbus.h b/src/grp-machine/libmachine-core/machine-dbus.h
index 224f36529f..224f36529f 100644
--- a/src/grp-machine/systemd-machined/machine-dbus.h
+++ b/src/grp-machine/libmachine-core/machine-dbus.h
diff --git a/src/grp-machine/systemd-machined/machine.c b/src/grp-machine/libmachine-core/machine.c
index 468fc1fecf..468fc1fecf 100644
--- a/src/grp-machine/systemd-machined/machine.c
+++ b/src/grp-machine/libmachine-core/machine.c
diff --git a/src/grp-machine/systemd-machined/machine.h b/src/grp-machine/libmachine-core/machine.h
index 1d8cc5911a..1d8cc5911a 100644
--- a/src/grp-machine/systemd-machined/machine.h
+++ b/src/grp-machine/libmachine-core/machine.h
diff --git a/src/grp-machine/systemd-machined/machined-dbus.c b/src/grp-machine/libmachine-core/machined-dbus.c
index 96f2c4769e..96f2c4769e 100644
--- a/src/grp-machine/systemd-machined/machined-dbus.c
+++ b/src/grp-machine/libmachine-core/machined-dbus.c
diff --git a/src/grp-machine/systemd-machined/org.freedesktop.machine1.conf b/src/grp-machine/libmachine-core/org.freedesktop.machine1.conf
index 9d40b90151..9d40b90151 100644
--- a/src/grp-machine/systemd-machined/org.freedesktop.machine1.conf
+++ b/src/grp-machine/libmachine-core/org.freedesktop.machine1.conf
diff --git a/src/grp-machine/systemd-machined/org.freedesktop.machine1.policy.in b/src/grp-machine/libmachine-core/org.freedesktop.machine1.policy.in
index 69f78a5c25..69f78a5c25 100644
--- a/src/grp-machine/systemd-machined/org.freedesktop.machine1.policy.in
+++ b/src/grp-machine/libmachine-core/org.freedesktop.machine1.policy.in
diff --git a/src/grp-machine/systemd-machined/org.freedesktop.machine1.service b/src/grp-machine/libmachine-core/org.freedesktop.machine1.service
index d3dc99852b..d3dc99852b 100644
--- a/src/grp-machine/systemd-machined/org.freedesktop.machine1.service
+++ b/src/grp-machine/libmachine-core/org.freedesktop.machine1.service
diff --git a/src/grp-machine/systemd-machined/test-machine-tables.c b/src/grp-machine/libmachine-core/test-machine-tables.c
index f851a4d37d..f851a4d37d 100644
--- a/src/grp-machine/systemd-machined/test-machine-tables.c
+++ b/src/grp-machine/libmachine-core/test-machine-tables.c
diff --git a/src/grp-machine/machinectl/Makefile b/src/grp-machine/machinectl/Makefile
new file mode 100644
index 0000000000..e1cb38d8cf
--- /dev/null
+++ b/src/grp-machine/machinectl/Makefile
@@ -0,0 +1,43 @@
+#  -*- 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/>.
+include $(dir $(lastword $(MAKEFILE_LIST)))/../../config.mk
+include $(topsrcdir)/build-aux/Makefile.head.mk
+
+machinectl_SOURCES = \
+	src/machine/machinectl.c
+
+machinectl_LDADD = \
+	libshared.la
+
+bin_PROGRAMS += \
+	machinectl
+
+dist_bashcompletion_data += \
+	shell-completion/bash/machinectl
+
+dist_zshcompletion_data += \
+	shell-completion/zsh/_machinectl \
+	shell-completion/zsh/_sd_machines
+
+$(eval $(value automake2autothing))
+include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/grp-machine/systemd-machined/machinectl.c b/src/grp-machine/machinectl/machinectl.c
index fb743ab6cb..fb743ab6cb 100644
--- a/src/grp-machine/systemd-machined/machinectl.c
+++ b/src/grp-machine/machinectl/machinectl.c
diff --git a/src/grp-machine/nss-mymachines/Makefile b/src/grp-machine/nss-mymachines/Makefile
index ebef7c3f48..9e06a5e767 100644
--- a/src/grp-machine/nss-mymachines/Makefile
+++ b/src/grp-machine/nss-mymachines/Makefile
@@ -23,7 +23,6 @@
 include $(dir $(lastword $(MAKEFILE_LIST)))/../../../config.mk
 include $(topsrcdir)/build-aux/Makefile.head.mk
 
-ifneq ($(ENABLE_MACHINED),)
 
 libnss_mymachines_la_SOURCES = \
 	src/nss-mymachines/nss-mymachines.sym \
@@ -44,7 +43,6 @@ libnss_mymachines_la_LIBADD = \
 lib_LTLIBRARIES += \
 	libnss_mymachines.la
 
-endif # ENABLE_MACHINED
 $(eval $(value automake2autothing))
 at.depdirs += $(topoutdir)/src/libsystemd/libsystemd-internal
 AM_CPPFLAGS += $(libbasic.CPPFLAGS)
diff --git a/src/grp-machine/systemd-machined/Makefile b/src/grp-machine/systemd-machined/Makefile
index 2f6e745c53..116b5a479c 100644
--- a/src/grp-machine/systemd-machined/Makefile
+++ b/src/grp-machine/systemd-machined/Makefile
@@ -23,7 +23,6 @@
 include $(dir $(lastword $(MAKEFILE_LIST)))/../../config.mk
 include $(topsrcdir)/build-aux/Makefile.head.mk
 
-ifneq ($(ENABLE_MACHINED),)
 systemd_machined_SOURCES = \
 	src/machine/machined.c \
 	src/machine/machined.h
@@ -34,39 +33,6 @@ systemd_machined_LDADD = \
 libexec_PROGRAMS += \
 	systemd-machined
 
-libmachine_core_la_SOURCES = \
-	src/machine/machine.c \
-	src/machine/machine.h \
-	src/machine/machined-dbus.c \
-	src/machine/machine-dbus.c \
-	src/machine/machine-dbus.h \
-	src/machine/image-dbus.c \
-	src/machine/image-dbus.h
-
-libmachine_core_la_LIBADD = \
-	libshared.la
-
-noinst_LTLIBRARIES += \
-	libmachine-core.la
-
-machinectl_SOURCES = \
-	src/machine/machinectl.c
-
-machinectl_LDADD = \
-	libshared.la
-
-bin_PROGRAMS += \
-	machinectl
-
-test_machine_tables_SOURCES = \
-	src/machine/test-machine-tables.c
-
-test_machine_tables_LDADD = \
-	libmachine-core.la
-
-tests += \
-	test-machine-tables
-
 nodist_systemunit_DATA += \
 	units/systemd-machined.service
 
@@ -85,20 +51,12 @@ dist_dbuspolicy_DATA += \
 polkitpolicy_files += \
 	src/machine/org.freedesktop.machine1.policy
 
-dist_bashcompletion_data += \
-	shell-completion/bash/machinectl
-
-dist_zshcompletion_data += \
-	shell-completion/zsh/_machinectl \
-	shell-completion/zsh/_sd_machines
-
 SYSTEM_UNIT_ALIASES += \
 	systemd-machined.service dbus-org.freedesktop.machine1.service
 
 BUSNAMES_TARGET_WANTS += \
 	org.freedesktop.machine1.busname
 
-endif # ENABLE_MACHINED
 
 polkitpolicy_in_files += \
 	src/machine/org.freedesktop.machine1.policy.in