Merge branch 'lukeshu/postmove' into lukeshu/master

# Conflicts:
#	src/coredump/coredumpctl.c
#	src/coredumpctl/coredumpctl.c
#	src/systemd-coredump/coredumpctl.c

13 files changed, 119 insertions, 121 deletions

diff --git a/src/coredumpctl/Makefile b/src/coredumpctl/Makefile
new file mode 100644
index 0000000000..c300710492
--- /dev/null
+++ b/src/coredumpctl/Makefile
@@ -0,0 +1,42 @@
+#  -*- 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
+
+coredumpctl_SOURCES = \
+	src/coredump/coredumpctl.c
+
+coredumpctl_LDADD = \
+	libshared.la
+
+bin_PROGRAMS += \
+	coredumpctl
+
+dist_bashcompletion_data += \
+	shell-completion/bash/coredumpctl
+
+dist_zshcompletion_data += \
+	shell-completion/zsh/_coredumpctl
+
+$(eval $(value automake2autothing))
+include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/systemd-coredump/coredumpctl.c b/src/coredumpctl/coredumpctl.c
index 5f4f710a0c..5f4f710a0c 100644
--- a/src/systemd-coredump/coredumpctl.c
+++ b/src/coredumpctl/coredumpctl.c
diff --git a/src/systemd-coredump/Makefile b/src/systemd-coredump/Makefile
index ac65ba0730..638154aeb9 100644
--- a/src/systemd-coredump/Makefile
+++ b/src/systemd-coredump/Makefile
@@ -56,15 +56,6 @@ libexec_PROGRAMS += \
 dist_pkgsysconf_DATA += \
 	src/coredump/coredump.conf
 
-coredumpctl_SOURCES = \
-	src/coredump/coredumpctl.c
-
-coredumpctl_LDADD = \
-	libshared.la
-
-bin_PROGRAMS += \
-	coredumpctl
-
 manual_tests += \
 	test-coredump-vacuum
 
@@ -76,12 +67,6 @@ test_coredump_vacuum_SOURCES = \
 test_coredump_vacuum_LDADD = \
 	libshared.la
 
-dist_bashcompletion_data += \
-	shell-completion/bash/coredumpctl
-
-dist_zshcompletion_data += \
-	shell-completion/zsh/_coredumpctl
-
 nodist_sysctl_DATA = \
 	sysctl.d/50-coredump.conf
 
diff --git a/src/getty-generator/Makefile b/src/systemd-getty-generator/Makefile
index 84564079bb..84564079bb 100644
--- a/src/getty-generator/Makefile
+++ b/src/systemd-getty-generator/Makefile
diff --git a/src/getty-generator/getty-generator.c b/src/systemd-getty-generator/getty-generator.c
index b15c76b5b8..b15c76b5b8 100644
--- a/src/getty-generator/getty-generator.c
+++ b/src/systemd-getty-generator/getty-generator.c
diff --git a/src/systemd-hwdb/Makefile b/src/systemd-hwdb/Makefile
new file mode 100644
index 0000000000..c3abfb1cc0
--- /dev/null
+++ b/src/systemd-hwdb/Makefile
@@ -0,0 +1,77 @@
+#  -*- 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
+
+ifneq ($(ENABLE_HWDB),)
+INSTALL_DIRS += \
+	$(sysconfdir)/udev/hwdb.d
+
+systemd_hwdb_SOURCES = \
+	src/libsystemd/sd-hwdb/hwdb-internal.h \
+	src/hwdb/hwdb.c
+
+systemd_hwdb_LDADD = \
+	libshared.la
+
+bin_PROGRAMS += \
+	systemd-hwdb
+
+dist_udevhwdb_DATA = \
+	hwdb/20-pci-vendor-model.hwdb \
+	hwdb/20-pci-classes.hwdb \
+	hwdb/20-usb-vendor-model.hwdb \
+	hwdb/20-usb-classes.hwdb \
+	hwdb/20-sdio-vendor-model.hwdb \
+	hwdb/20-sdio-classes.hwdb \
+	hwdb/20-bluetooth-vendor-product.hwdb \
+	hwdb/20-acpi-vendor.hwdb \
+	hwdb/20-OUI.hwdb \
+	hwdb/20-net-ifname.hwdb \
+	hwdb/60-evdev.hwdb \
+	hwdb/60-keyboard.hwdb \
+	hwdb/70-mouse.hwdb \
+	hwdb/70-pointingstick.hwdb
+
+SYSINIT_TARGET_WANTS += \
+	systemd-hwdb-update.service
+
+# Update hwdb on installation. Do not bother if installing
+# in DESTDIR, since this is likely for packaging purposes.
+hwdb-update-hook:
+	-test -n "$(DESTDIR)" || $(bindir)/systemd-hwdb update
+
+INSTALL_DATA_HOOKS += \
+	hwdb-update-hook
+
+hwdb-remove-hook:
+	-test -n "$(DESTDIR)" || rm -f /etc/udev/hwdb.bin
+endif
+
+EXTRA_DIST += \
+	units/systemd-hwdb-update.service.in \
+	hwdb/ids-update.pl \
+	hwdb/sdio.ids
+
+$(eval $(value automake2autothing))
+include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/rc-local-generator/Makefile b/src/systemd-rc-local-generator/Makefile
index f1673644d4..f1673644d4 100644
--- a/src/rc-local-generator/Makefile
+++ b/src/systemd-rc-local-generator/Makefile
diff --git a/src/rc-local-generator/rc-local-generator.c b/src/systemd-rc-local-generator/rc-local-generator.c
index 9e9c161993..9e9c161993 100644
--- a/src/rc-local-generator/rc-local-generator.c
+++ b/src/systemd-rc-local-generator/rc-local-generator.c
diff --git a/src/system-update-generator/Makefile b/src/systemd-system-update-generator/Makefile
index e2ae889d7e..e2ae889d7e 100644
--- a/src/system-update-generator/Makefile
+++ b/src/systemd-system-update-generator/Makefile
diff --git a/src/system-update-generator/system-update-generator.c b/src/systemd-system-update-generator/system-update-generator.c
index a3d677f068..a3d677f068 100644
--- a/src/system-update-generator/system-update-generator.c
+++ b/src/systemd-system-update-generator/system-update-generator.c
diff --git a/src/sysv-generator/Makefile b/src/systemd-sysv-generator/Makefile
index 417cb7d849..417cb7d849 100644
--- a/src/sysv-generator/Makefile
+++ b/src/systemd-sysv-generator/Makefile
diff --git a/src/sysv-generator/sysv-generator.c b/src/systemd-sysv-generator/sysv-generator.c
index 5a6818a79d..5a6818a79d 100644
--- a/src/sysv-generator/sysv-generator.c
+++ b/src/systemd-sysv-generator/sysv-generator.c
diff --git a/src/udev/Makefile b/src/udev/Makefile
index 6b9958ebaa..98bffe6720 100644
--- a/src/udev/Makefile
+++ b/src/udev/Makefile
@@ -178,111 +178,5 @@ udevadm_SOURCES = \
 udevadm_LDADD = \
 	libudev-core.la
 
-# ------------------------------------------------------------------------------
-ifneq ($(ENABLE_HWDB),)
-INSTALL_DIRS += \
-	$(sysconfdir)/udev/hwdb.d
-
-systemd_hwdb_SOURCES = \
-	src/libsystemd/sd-hwdb/hwdb-internal.h \
-	src/hwdb/hwdb.c
-
-systemd_hwdb_LDADD = \
-	libshared.la
-
-bin_PROGRAMS += \
-	systemd-hwdb
-
-dist_udevhwdb_DATA = \
-	hwdb/20-pci-vendor-model.hwdb \
-	hwdb/20-pci-classes.hwdb \
-	hwdb/20-usb-vendor-model.hwdb \
-	hwdb/20-usb-classes.hwdb \
-	hwdb/20-sdio-vendor-model.hwdb \
-	hwdb/20-sdio-classes.hwdb \
-	hwdb/20-bluetooth-vendor-product.hwdb \
-	hwdb/20-acpi-vendor.hwdb \
-	hwdb/20-OUI.hwdb \
-	hwdb/20-net-ifname.hwdb \
-	hwdb/60-evdev.hwdb \
-	hwdb/60-keyboard.hwdb \
-	hwdb/70-mouse.hwdb \
-	hwdb/70-pointingstick.hwdb
-
-SYSINIT_TARGET_WANTS += \
-	systemd-hwdb-update.service
-
-# Update hwdb on installation. Do not bother if installing
-# in DESTDIR, since this is likely for packaging purposes.
-hwdb-update-hook:
-	-test -n "$(DESTDIR)" || $(bindir)/systemd-hwdb update
-
-INSTALL_DATA_HOOKS += \
-	hwdb-update-hook
-
-hwdb-remove-hook:
-	-test -n "$(DESTDIR)" || rm -f /etc/udev/hwdb.bin
-endif
-
-EXTRA_DIST += \
-	units/systemd-hwdb-update.service.in \
-	hwdb/ids-update.pl \
-	hwdb/sdio.ids
-
-# ------------------------------------------------------------------------------
-ifneq ($(ENABLE_TESTS),)
-TESTS += \
-	test/udev-test.pl
-
-ifneq ($(HAVE_PYTHON),)
-TESTS += \
-	test/rule-syntax-check.py
-
-ifneq ($(HAVE_SYSV_COMPAT),)
-TESTS += \
-	test/sysv-generator-test.py
-endif
-endif
-endif
-
-manual_tests += \
-	test-libudev \
-	test-udev
-
-test_libudev_SOURCES = \
-	src/test/test-libudev.c
-
-test_libudev_LDADD = \
-	libshared.la
-
-test_udev_SOURCES = \
-	src/test/test-udev.c
-
-test_udev_LDADD = \
-	libudev-core.la  \
-	$(BLKID_LIBS) \
-	$(KMOD_LIBS)
-
-ifneq ($(ENABLE_TESTS),)
-check_DATA += \
-	test/sys
-endif
-
-# packed sysfs test tree
-$(outdir)/sys:
-	$(AM_V_at)$(MKDIR_P) $(dir $@)
-	$(AM_V_GEN)tar -C test/ -xJf $(top_srcdir)/test/sys.tar.xz
-
-test-sys-distclean:
-	-rm -rf test/sys
-DISTCLEAN_LOCAL_HOOKS += test-sys-distclean
-
-EXTRA_DIST += \
-	test/sys.tar.xz \
-	test/udev-test.pl \
-	test/rule-syntax-check.py \
-	test/sysv-generator-test.py \
-	test/mocks/fsck
-
 $(eval $(value automake2autothing))
 include $(topsrcdir)/build-aux/Makefile.tail.mk