From 24ca4c3a1d7cc3b2d26d6034124fbb2c31251d90 Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Tue, 25 Oct 2016 17:06:47 -0400 Subject: tidy --- tools/notsd-fixup--makefiles | 2 +- tools/notsd-move | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/tools/notsd-fixup--makefiles b/tools/notsd-fixup--makefiles index bb18c3be7b..f89e4b075b 100755 --- a/tools/notsd-fixup--makefiles +++ b/tools/notsd-fixup--makefiles @@ -22,7 +22,7 @@ main() { set -o pipefail local filename for filename in "$@"; do - >&2 printf ' => fixup %q\n' "$filename" + >&2 printf ' => %q %q\n' "$0" "$filename" doit "$filename" done } diff --git a/tools/notsd-move b/tools/notsd-move index fcb9eaff4b..23469ba407 100755 --- a/tools/notsd-move +++ b/tools/notsd-move @@ -709,6 +709,12 @@ move_files() ( mv -t src/grp-"$base" "$file" done rmdir system-preset + + ln -srT src/libsystemd/include/systemd/_sd-common.h src/libsystemd-network/include/systemd-network/_sd-common.h + ln -srT src/libsystemd/include/systemd/_sd-common.h src/grp-utils/systemd-path/_sd-common.h + ln -srT src/grp-login/systemd-logind/logind-acl.h src/grp-udev/libudev-core/logind-acl.h + ln -srT src/grp-login/systemd-logind/logind-acl.c src/grp-udev/libudev-core/logind-acl.c + ln -srT src/libsystemd/src/sd-login/sd-login.c src/grp-udev/libudev-core/sd-login.c ) breakup_makefile() ( @@ -756,12 +762,6 @@ breakup_makefile() ( src/libsystemd/src/sd-journal/Makefile \ src/grp-udev/libudev-core/Makefile - ln -srT src/libsystemd/include/systemd/_sd-common.h src/libsystemd-network/include/systemd-network/_sd-common.h - ln -srT src/libsystemd/include/systemd/_sd-common.h src/grp-utils/systemd-path/_sd-common.h - ln -srT src/grp-login/systemd-logind/logind-acl.h src/grp-udev/libudev-core/logind-acl.h - ln -srT src/grp-login/systemd-logind/logind-acl.c src/grp-udev/libudev-core/logind-acl.c - ln -srT src/libsystemd/src/sd-login/sd-login.c src/grp-udev/libudev-core/sd-login.c - ln -sT ../subdir.mk src/libsystemd/src/sd-network/Makefile ln -sT ../subdir.mk src/libsystemd/src/sd-bus/Makefile ln -sT ../subdir.mk src/libsystemd/src/sd-event/Makefile -- cgit v1.2.3-54-g00ecf