From 0b4288e3168dee3224c04871528170442305348f Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Fri, 21 Oct 2016 14:10:13 -0400 Subject: libcore, nspawn --- src/systemd-machine-id-setup/Makefile | 7 +++---- src/systemd-machine-id-setup/machine-id-setup-main.c | 3 +-- src/systemd-machine-id-setup/machine-id-setup.c | 1 - src/systemd-machine-id-setup/machine-id-setup.h | 1 - 4 files changed, 4 insertions(+), 8 deletions(-) delete mode 120000 src/systemd-machine-id-setup/machine-id-setup.c delete mode 120000 src/systemd-machine-id-setup/machine-id-setup.h (limited to 'src/systemd-machine-id-setup') diff --git a/src/systemd-machine-id-setup/Makefile b/src/systemd-machine-id-setup/Makefile index 4cbba418ff..97f9087ac6 100644 --- a/src/systemd-machine-id-setup/Makefile +++ b/src/systemd-machine-id-setup/Makefile @@ -25,12 +25,11 @@ include $(topsrcdir)/build-aux/Makefile.head.mk rootbin_PROGRAMS += systemd-machine-id-setup systemd_machine_id_setup_SOURCES = \ - src/machine-id-setup/machine-id-setup-main.c \ - src/core/machine-id-setup.c \ - src/core/machine-id-setup.h + src/machine-id-setup/machine-id-setup-main.c systemd_machine_id_setup_LDADD = \ - libsystemd-shared.la + libsystemd-basic.la \ + libcore.la SYSINIT_TARGET_WANTS += \ systemd-machine-id-commit.service diff --git a/src/systemd-machine-id-setup/machine-id-setup-main.c b/src/systemd-machine-id-setup/machine-id-setup-main.c index deb0656d2f..bde4d4faa6 100644 --- a/src/systemd-machine-id-setup/machine-id-setup-main.c +++ b/src/systemd-machine-id-setup/machine-id-setup-main.c @@ -22,12 +22,11 @@ #include #include +#include "core/machine-id-setup.h" #include "systemd-basic/log.h" #include "systemd-basic/path-util.h" #include "systemd-basic/util.h" -#include "machine-id-setup.h" - static char *arg_root = NULL; static bool arg_commit = false; static bool arg_print = false; diff --git a/src/systemd-machine-id-setup/machine-id-setup.c b/src/systemd-machine-id-setup/machine-id-setup.c deleted file mode 120000 index 78f80e2b73..0000000000 --- a/src/systemd-machine-id-setup/machine-id-setup.c +++ /dev/null @@ -1 +0,0 @@ -../grp-system/libcore/machine-id-setup.c \ No newline at end of file diff --git a/src/systemd-machine-id-setup/machine-id-setup.h b/src/systemd-machine-id-setup/machine-id-setup.h deleted file mode 120000 index d2659724ce..0000000000 --- a/src/systemd-machine-id-setup/machine-id-setup.h +++ /dev/null @@ -1 +0,0 @@ -../grp-system/libcore/machine-id-setup.h \ No newline at end of file -- cgit v1.2.3-54-g00ecf