Prep v239: Mirror upstream and move pager.[hc] from shared to basic.

diff --git a/cb/elogind.cbp b/cb/elogind.cbp
index f6c6a6667f364f65744ab0343aa84e6e4a1e77e4..2df9826df4de3f29b7d6742bc63e976d4517a448 100644 (file)
--- 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 0161aba765c5600072c8bd784c6e4f9d31b05471..27d6ace453a984840fe31446160eb2a3a7d4e380 100644 (file)
--- 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 695bb063fce8ac69bf4641d7d5cf46a1dcff9271..760f9a123dc27de75f4ecb99ab0b730987852161 100644 (file)
--- 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