Move mount-util.c to shared/

libmount dep is moved from libbasic to libshared, potentially removing
libmount from some build products.

diff --git a/src/basic/meson.build b/src/basic/meson.build
index 906d1c1b3d61474dda8de80f4edffc430b32a107..124a3e9f847edd9423331f1ef7ef9b8a80106d71 100644 (file)
--- a/src/basic/meson.build
+++ b/src/basic/meson.build
@@ -94,8 +94,6 @@ basic_sources = files('''
         mkdir-label.c
         mkdir.c
         mkdir.h
-        mount-util.c
-        mount-util.h
         mountpoint-util.c
         mountpoint-util.h
         nss-util.h
@@ -259,7 +257,6 @@ libbasic = static_library(
         include_directories : includes,
         dependencies : [threads,
                         libcap,
-                        libmount,
                         libselinux,
                         libm],
         c_args : ['-fvisibility=default'],

diff --git a/src/shared/meson.build b/src/shared/meson.build
index b7676b6eb97b16b99653a6c85edf1e3b0629a849..85c546eb5bb8a9fd678cae62b4479bad1d454954 100644 (file)
--- a/src/shared/meson.build
+++ b/src/shared/meson.build
@@ -98,6 +98,8 @@ shared_sources = files('''
         machine-pool.h
         main-func.h
         module-util.h
+        mount-util.c
+        mount-util.h
         nsflags.c
         nsflags.h
         os-util.c
@@ -235,6 +237,7 @@ libshared_deps = [threads,
                   libgcrypt,
                   libiptc,
                   libkmod,
+                  libmount,
                   libseccomp,
                   libselinux,
                   libidn,

diff --git a/src/basic/mount-util.c b/src/shared/mount-util.c
similarity index 100%
rename from src/basic/mount-util.c
rename to src/shared/mount-util.c

diff --git a/src/basic/mount-util.h b/src/shared/mount-util.h
similarity index 100%
rename from src/basic/mount-util.h
rename to src/shared/mount-util.h