Prep v229.5: Move parse-printf-format.? back to src/basic it is needed there.

diff --git a/Makefile.am b/Makefile.am
index 4091f42a6b8fe42102108aa31644aa0d1fc3b93f..41a0f77528282d8886858d2834017c96fd61b21b 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -343,6 +343,8 @@ libbasic_la_SOURCES = \
        src/basic/escape.h \
        src/basic/path-util.c \
        src/basic/path-util.h \
        src/basic/escape.h \
        src/basic/path-util.c \
        src/basic/path-util.h \

+       src/basic/parse-printf-format.c \
+       src/basic/parse-printf-format.h \

        src/basic/time-util.c \
        src/basic/time-util.h \
        src/basic/locale-util.c \
        src/basic/time-util.c \
        src/basic/time-util.h \
        src/basic/locale-util.c \


@@ -448,8 +450,6 @@ libshared_la_SOURCES = \
        src/shared/musl_missing.c \
        src/shared/pager.c \
        src/shared/pager.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/spawn-polkit-agent.c \
        src/shared/spawn-polkit-agent.h
 

diff --git a/cb/elogind.cbp b/cb/elogind.cbp
index 17d61e0f0e13ed96b3c02d4e6cc2f1353b059507..9dea79f54a31ac0cf30d5b7998628f16eb48699c 100644 (file)
--- a/cb/elogind.cbp
+++ b/cb/elogind.cbp
@@ -162,6 +162,10 @@
                        <Option compilerVar="CC" />
                </Unit>
                <Unit filename="../src/basic/mount-util.h" />
                        <Option compilerVar="CC" />
                </Unit>
                <Unit filename="../src/basic/mount-util.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>
                <Unit filename="../src/basic/parse-util.c">
                        <Option compilerVar="CC" />
                </Unit>


@@ -491,10 +495,6 @@
                        <Option compilerVar="CC" />
                </Unit>
                <Unit filename="../src/shared/pager.h" />
                        <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>
                <Unit filename="../src/shared/spawn-polkit-agent.c">
                        <Option compilerVar="CC" />
                </Unit>

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

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