From fe8f6f69ec8377aa37cf503f6877ce994e1ff821 Mon Sep 17 00:00:00 2001
From: Sven Eden <yamakuzure@gmx.net>
Date: Mon, 20 Aug 2018 18:51:42 +0200
Subject: [PATCH] Prep v239: Mirror upstream and move pager.[hc] from shared to
 basic.

---
 cb/elogind.cbp                | 13 ++++---------
 src/basic/meson.build         |  2 ++
 src/{shared => basic}/pager.c |  0
 src/{shared => basic}/pager.h |  0
 src/shared/meson.build        |  2 --
 5 files changed, 6 insertions(+), 11 deletions(-)
 rename src/{shared => basic}/pager.c (100%)
 rename src/{shared => basic}/pager.h (100%)

diff --git a/cb/elogind.cbp b/cb/elogind.cbp
index f6c6a6667..2df9826df 100644
--- a/cb/elogind.cbp
+++ b/cb/elogind.cbp
@@ -399,6 +399,10 @@
 			<Option target="all" />
 			<Option target="clean" />
 		</Unit>
+		<Unit filename="../src/basic/pager.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="../src/basic/pager.h" />
 		<Unit filename="../src/basic/parse-printf-format.c">
 			<Option compilerVar="CC" />
 			<Option target="all" />
@@ -1205,15 +1209,6 @@
 			<Option target="all" />
 			<Option target="clean" />
 		</Unit>
-		<Unit filename="../src/shared/pager.c">
-			<Option compilerVar="CC" />
-			<Option target="all" />
-			<Option target="clean" />
-		</Unit>
-		<Unit filename="../src/shared/pager.h">
-			<Option target="all" />
-			<Option target="clean" />
-		</Unit>
 		<Unit filename="../src/shared/sleep-config.c">
 			<Option compilerVar="CC" />
 			<Option target="all" />
diff --git a/src/basic/meson.build b/src/basic/meson.build
index 0161aba76..27d6ace45 100644
--- a/src/basic/meson.build
+++ b/src/basic/meson.build
@@ -297,6 +297,8 @@ basic_sources = files('''
         mkdir-label.c
         mount-util.c
         mount-util.h
+        pager.c
+        pager.h
         parse-printf-format.c
         parse-printf-format.h
         parse-util.c
diff --git a/src/shared/pager.c b/src/basic/pager.c
similarity index 100%
rename from src/shared/pager.c
rename to src/basic/pager.c
diff --git a/src/shared/pager.h b/src/basic/pager.h
similarity index 100%
rename from src/shared/pager.h
rename to src/basic/pager.h
diff --git a/src/shared/meson.build b/src/shared/meson.build
index 695bb063f..760f9a123 100644
--- a/src/shared/meson.build
+++ b/src/shared/meson.build
@@ -118,8 +118,6 @@ shared_sources = '''
         nsflags.h
         output-mode.c
         output-mode.h
-        pager.c
-        pager.h
         sleep-config.c
         sleep-config.h
         spawn-polkit-agent.c
-- 
2.30.2