Prep v230: Move musl_missing and parse-printf-format to libshared.

diff --git a/Makefile.am b/Makefile.am
index 45b64475912dafb873988b62b907d3e2e4d4944f..67238fa0f4c3a0ae146e16ec0fa7c1548d4a3176 100644 (file)
--- 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 80edb8b8af7162f2290f4777cdcf633724356517..63f91719b1c63295695da3282d1411d37dafafe3 100644 (file)
--- 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 d5f971b18a1d41835a5f2070b130d9f3933a1107..9fb7e34dd7560da2fbac627e56fcf51e5f3d009d 100644 (file)
--- 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 c1fd7dd33e4abe544691cb8917d89dba5dac048d..e0a838d3fef011e8b5b7b43aad84c1a34f03d58f 100644 (file)
--- 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
similarity index 100%
rename from src/basic/musl_missing.c
rename to src/shared/musl_missing.c

diff --git a/src/basic/musl_missing.h b/src/shared/musl_missing.h
similarity index 100%
rename from src/basic/musl_missing.h
rename to src/shared/musl_missing.h

diff --git a/src/basic/parse-printf-format.c b/src/shared/parse-printf-format.c
similarity index 100%
rename from src/basic/parse-printf-format.c
rename to src/shared/parse-printf-format.c

diff --git a/src/basic/parse-printf-format.h b/src/shared/parse-printf-format.h
similarity index 100%
rename from src/basic/parse-printf-format.h
rename to src/shared/parse-printf-format.h