diff options
Diffstat (limited to 'src/grp-system/grp-utils')
7 files changed, 6 insertions, 7 deletions
diff --git a/src/grp-system/grp-utils/systemd-analyze/Makefile b/src/grp-system/grp-utils/systemd-analyze/Makefile index cb1b72e77d..db8a29e9aa 100644 --- a/src/grp-system/grp-utils/systemd-analyze/Makefile +++ b/src/grp-system/grp-utils/systemd-analyze/Makefile @@ -34,6 +34,7 @@ systemd_analyze_CFLAGS = \ $(MOUNT_CFLAGS) systemd_analyze_LDADD = \ + libsystemd-internal.la \ libcore.la include $(topsrcdir)/build-aux/Makefile.tail.mk diff --git a/src/grp-system/grp-utils/systemd-analyze/analyze-verify.c b/src/grp-system/grp-utils/systemd-analyze/analyze-verify.c index 2f5b1e4da3..620ae7ee35 100644 --- a/src/grp-system/grp-utils/systemd-analyze/analyze-verify.c +++ b/src/grp-system/grp-utils/systemd-analyze/analyze-verify.c @@ -19,7 +19,7 @@ #include <stdlib.h> -#include "manager.h" +#include "core/manager.h" #include "sd-bus/bus-error.h" #include "sd-bus/bus-util.h" #include "systemd-basic/alloc-util.h" diff --git a/src/grp-system/grp-utils/systemd-fstab-generator/Makefile b/src/grp-system/grp-utils/systemd-fstab-generator/Makefile index 43475f69e1..be9090654b 100644 --- a/src/grp-system/grp-utils/systemd-fstab-generator/Makefile +++ b/src/grp-system/grp-utils/systemd-fstab-generator/Makefile @@ -25,10 +25,10 @@ include $(topsrcdir)/build-aux/Makefile.head.mk systemgenerator_PROGRAMS += systemd-fstab-generator systemd_fstab_generator_SOURCES = \ - src/fstab-generator/fstab-generator.c \ - src/core/mount-setup.c + src/fstab-generator/fstab-generator.c systemd_fstab_generator_LDADD = \ + libcore.la \ libsystemd-shared.la include $(topsrcdir)/build-aux/Makefile.tail.mk diff --git a/src/grp-system/grp-utils/systemd-fstab-generator/fstab-generator.c b/src/grp-system/grp-utils/systemd-fstab-generator/fstab-generator.c index d4ca2551fa..f4b3a048e9 100644 --- a/src/grp-system/grp-utils/systemd-fstab-generator/fstab-generator.c +++ b/src/grp-system/grp-utils/systemd-fstab-generator/fstab-generator.c @@ -23,6 +23,7 @@ #include <string.h> #include <unistd.h> +#include "core/mount-setup.h" #include "systemd-basic/alloc-util.h" #include "systemd-basic/fd-util.h" #include "systemd-basic/fileio.h" @@ -42,8 +43,6 @@ #include "systemd-shared/fstab-util.h" #include "systemd-shared/generator.h" -#include "mount-setup.h" - static const char *arg_dest = "/tmp"; static bool arg_fstab_enabled = true; static char *arg_root_what = NULL; diff --git a/src/grp-system/grp-utils/systemd-fstab-generator/mount-setup.c b/src/grp-system/grp-utils/systemd-fstab-generator/mount-setup.c deleted file mode 120000 index 7f7ff15b46..0000000000 --- a/src/grp-system/grp-utils/systemd-fstab-generator/mount-setup.c +++ /dev/null @@ -1 +0,0 @@ -../../libcore/mount-setup.c
\ No newline at end of file diff --git a/src/grp-system/grp-utils/systemd-fstab-generator/mount-setup.h b/src/grp-system/grp-utils/systemd-fstab-generator/mount-setup.h deleted file mode 120000 index 50721d8bfc..0000000000 --- a/src/grp-system/grp-utils/systemd-fstab-generator/mount-setup.h +++ /dev/null @@ -1 +0,0 @@ -../../libcore/mount-setup.h
\ No newline at end of file diff --git a/src/grp-system/grp-utils/systemd-run/Makefile b/src/grp-system/grp-utils/systemd-run/Makefile index 9664591eb6..48559f098e 100644 --- a/src/grp-system/grp-utils/systemd-run/Makefile +++ b/src/grp-system/grp-utils/systemd-run/Makefile @@ -28,6 +28,7 @@ systemd_run_SOURCES = \ src/run/run.c systemd_run_LDADD = \ + libsystemd-internal.la \ libsystemd-shared.la include $(topsrcdir)/build-aux/Makefile.tail.mk |