From: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Date: Thu, 29 Nov 2018 09:29:34 +0000 (+0100)
Subject: Move mount-util.c to shared/
X-Git-Tag: v240~172^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F10990%2Fhead;p=thirdparty%2Fsystemd.git

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 906d1c1b3d6..124a3e9f847 100644
--- 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 b7676b6eb97..85c546eb5bb 100644
--- 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