summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSven Eden <yamakuzure@gmx.net>2017-06-12 12:19:09 +0200
committerSven Eden <yamakuzure@gmx.net>2017-06-16 10:12:58 +0200
commita3b86c20543b69c165d1aa52178d72710f5c853e (patch)
tree0f82f801918aa7509d18f0c5d58bba87519a86e2
parentea4ffd91b825d5caab2fba81ee578dee932fe9cb (diff)
Prep v229.5: Move parse-printf-format.? back to src/basic it is needed there.
-rw-r--r--Makefile.am4
-rw-r--r--cb/elogind.cbp8
-rw-r--r--src/basic/parse-printf-format.c (renamed from src/shared/parse-printf-format.c)0
-rw-r--r--src/basic/parse-printf-format.h (renamed from src/shared/parse-printf-format.h)0
4 files changed, 6 insertions, 6 deletions
diff --git a/Makefile.am b/Makefile.am
index 4091f42a6..41a0f7752 100644
--- 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/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 \
@@ -448,8 +450,6 @@ libshared_la_SOURCES = \
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
diff --git a/cb/elogind.cbp b/cb/elogind.cbp
index 17d61e0f0..9dea79f54 100644
--- a/cb/elogind.cbp
+++ b/cb/elogind.cbp
@@ -162,6 +162,10 @@
<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>
@@ -491,10 +495,6 @@
<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/shared/parse-printf-format.c b/src/basic/parse-printf-format.c
index a99952b70..a99952b70 100644
--- a/src/shared/parse-printf-format.c
+++ b/src/basic/parse-printf-format.c
diff --git a/src/shared/parse-printf-format.h b/src/basic/parse-printf-format.h
index 5ca0fdf56..5ca0fdf56 100644
--- a/src/shared/parse-printf-format.h
+++ b/src/basic/parse-printf-format.h