diff options
| author | Sven Eden <yamakuzure@gmx.net> | 2018-08-20 18:51:42 +0200 |
|---|---|---|
| committer | Sven Eden <yamakuzure@gmx.net> | 2018-08-24 16:47:08 +0200 |
| commit | fe8f6f69ec8377aa37cf503f6877ce994e1ff821 (patch) | |
| tree | a8d33f9588374b3bc672a72e34818676706a10d6 | |
| parent | 347760af00d87762b3809111d8975023912ed7cc (diff) | |
Prep v239: Mirror upstream and move pager.[hc] from shared to basic.
| -rw-r--r-- | cb/elogind.cbp | 13 | ||||
| -rw-r--r-- | src/basic/meson.build | 2 | ||||
| -rw-r--r-- | src/basic/pager.c (renamed from src/shared/pager.c) | 0 | ||||
| -rw-r--r-- | src/basic/pager.h (renamed from src/shared/pager.h) | 0 | ||||
| -rw-r--r-- | src/shared/meson.build | 2 |
5 files changed, 6 insertions, 11 deletions
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 index c0ad0bb3b..c0ad0bb3b 100644 --- a/src/shared/pager.c +++ b/src/basic/pager.c diff --git a/src/shared/pager.h b/src/basic/pager.h index edeae3a11..edeae3a11 100644 --- a/src/shared/pager.h +++ b/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 |