diff options
author | Sven Eden <yamakuzure@gmx.net> | 2017-06-07 12:10:11 +0200 |
---|---|---|
committer | Sven Eden <yamakuzure@gmx.net> | 2017-06-16 10:12:58 +0200 |
commit | 955baa81f8239cb338f53c7707d6d2c656c32c33 (patch) | |
tree | d06f6a9f9b0c8199527a0023c8bee88aeb5bb10a | |
parent | e1a3886b1048af543e67f4af0c02bb8d0abb9ca9 (diff) |
Prep v230: Move musl_missing and parse-printf-format to libshared.
-rw-r--r-- | Makefile.am | 20 | ||||
-rw-r--r-- | cb/elogind.cbp | 16 | ||||
-rw-r--r-- | src/cgroups-agent/cgroups-agent.c | 4 | ||||
-rw-r--r-- | src/libelogind/sd-login/test-login.c | 4 | ||||
-rw-r--r-- | src/shared/musl_missing.c (renamed from src/basic/musl_missing.c) | 0 | ||||
-rw-r--r-- | src/shared/musl_missing.h (renamed from src/basic/musl_missing.h) | 0 | ||||
-rw-r--r-- | src/shared/parse-printf-format.c (renamed from src/basic/parse-printf-format.c) | 0 | ||||
-rw-r--r-- | src/shared/parse-printf-format.h (renamed from src/basic/parse-printf-format.h) | 0 |
8 files changed, 25 insertions, 19 deletions
diff --git a/Makefile.am b/Makefile.am index 45b644759..67238fa0f 100644 --- a/Makefile.am +++ b/Makefile.am @@ -298,8 +298,6 @@ noinst_LTLIBRARIES += \ libbasic_la_SOURCES = \ src/basic/missing.h \ - src/basic/musl_missing.h \ - src/basic/musl_missing.c \ src/basic/capability-util.c \ src/basic/capability-util.h \ src/basic/conf-files.c \ @@ -413,9 +411,7 @@ libbasic_la_SOURCES = \ src/basic/copy.c \ src/basic/copy.h \ src/basic/alloc-util.h \ - src/basic/alloc-util.c \ - src/basic/parse-printf-format.c \ - src/basic/parse-printf-format.h + src/basic/alloc-util.c nodist_libbasic_la_SOURCES = \ src/basic/errno-from-name.h \ @@ -441,16 +437,20 @@ noinst_LTLIBRARIES += \ libshared.la libshared_la_SOURCES = \ + src/shared/bus-util.c \ + src/shared/bus-util.h \ + src/shared/clean-ipc.c \ + src/shared/clean-ipc.h \ src/shared/conf-parser.c \ src/shared/conf-parser.h \ + src/shared/musl_missing.h \ + src/shared/musl_missing.c \ src/shared/pager.c \ src/shared/pager.h \ + src/shared/parse-printf-format.c \ + src/shared/parse-printf-format.h \ src/shared/spawn-polkit-agent.c \ - src/shared/spawn-polkit-agent.h \ - src/shared/clean-ipc.c \ - src/shared/clean-ipc.h \ - src/shared/bus-util.c \ - src/shared/bus-util.h + src/shared/spawn-polkit-agent.h if HAVE_ACL libshared_la_SOURCES += \ diff --git a/cb/elogind.cbp b/cb/elogind.cbp index 80edb8b8a..63f91719b 100644 --- a/cb/elogind.cbp +++ b/cb/elogind.cbp @@ -164,14 +164,6 @@ <Option compilerVar="CC" /> </Unit> <Unit filename="../src/basic/mount-util.h" /> - <Unit filename="../src/basic/musl_missing.c"> - <Option compilerVar="CC" /> - </Unit> - <Unit filename="../src/basic/musl_missing.h" /> - <Unit filename="../src/basic/parse-printf-format.c"> - <Option compilerVar="CC" /> - </Unit> - <Unit filename="../src/basic/parse-printf-format.h" /> <Unit filename="../src/basic/parse-util.c"> <Option compilerVar="CC" /> </Unit> @@ -490,10 +482,18 @@ <Option compilerVar="CC" /> </Unit> <Unit filename="../src/shared/conf-parser.h" /> + <Unit filename="../src/shared/musl_missing.c"> + <Option compilerVar="CC" /> + </Unit> + <Unit filename="../src/shared/musl_missing.h" /> <Unit filename="../src/shared/pager.c"> <Option compilerVar="CC" /> </Unit> <Unit filename="../src/shared/pager.h" /> + <Unit filename="../src/shared/parse-printf-format.c"> + <Option compilerVar="CC" /> + </Unit> + <Unit filename="../src/shared/parse-printf-format.h" /> <Unit filename="../src/shared/spawn-polkit-agent.c"> <Option compilerVar="CC" /> </Unit> diff --git a/src/cgroups-agent/cgroups-agent.c b/src/cgroups-agent/cgroups-agent.c index d5f971b18..9fb7e34dd 100644 --- a/src/cgroups-agent/cgroups-agent.c +++ b/src/cgroups-agent/cgroups-agent.c @@ -21,10 +21,12 @@ #include <sys/socket.h> #include "fd-util.h" -#include "musl_missing.h" #include "log.h" #include "socket-util.h" +/// Additional includes needed by elogind +#include "musl_missing.h" + int main(int argc, char *argv[]) { static const union sockaddr_union sa = { diff --git a/src/libelogind/sd-login/test-login.c b/src/libelogind/sd-login/test-login.c index c1fd7dd33..e0a838d3f 100644 --- a/src/libelogind/sd-login/test-login.c +++ b/src/libelogind/sd-login/test-login.c @@ -29,6 +29,9 @@ #include "strv.h" #include "util.h" +/// Additional includes needed by elogind +#include "musl_missing.h" + static void test_login(void) { _cleanup_close_pair_ int pair[2] = { -1, -1 }; _cleanup_free_ char *pp = NULL, *qq = NULL; @@ -255,6 +258,7 @@ static void test_login(void) { } int main(int argc, char* argv[]) { + elogind_set_program_name(argv[0]); log_parse_environment(); log_open(); diff --git a/src/basic/musl_missing.c b/src/shared/musl_missing.c index 5ce787beb..5ce787beb 100644 --- a/src/basic/musl_missing.c +++ b/src/shared/musl_missing.c diff --git a/src/basic/musl_missing.h b/src/shared/musl_missing.h index 37a7005c9..37a7005c9 100644 --- a/src/basic/musl_missing.h +++ b/src/shared/musl_missing.h diff --git a/src/basic/parse-printf-format.c b/src/shared/parse-printf-format.c index a99952b70..a99952b70 100644 --- a/src/basic/parse-printf-format.c +++ b/src/shared/parse-printf-format.c diff --git a/src/basic/parse-printf-format.h b/src/shared/parse-printf-format.h index 5ca0fdf56..5ca0fdf56 100644 --- a/src/basic/parse-printf-format.h +++ b/src/shared/parse-printf-format.h |