diff options
author | Luke Shumaker <lukeshu@sbcglobal.net> | 2016-10-21 03:00:49 -0400 |
---|---|---|
committer | Luke Shumaker <lukeshu@sbcglobal.net> | 2016-10-21 03:00:49 -0400 |
commit | 623f13d8198b83df890f014b1d27255f4d78f35b (patch) | |
tree | a38236004dfb3abd99952585638e6141513eaa8c /src/grp-locale/systemd-localed | |
parent | be6cdcb499515a8dc200440f9c0f95d16edbaa2d (diff) |
wip
Diffstat (limited to 'src/grp-locale/systemd-localed')
-rw-r--r-- | src/grp-locale/systemd-localed/Makefile | 1 | ||||
-rw-r--r-- | src/grp-locale/systemd-localed/keymap-util.c | 20 | ||||
-rw-r--r-- | src/grp-locale/systemd-localed/keymap-util.h | 2 | ||||
-rw-r--r-- | src/grp-locale/systemd-localed/localed.c | 20 | ||||
-rw-r--r-- | src/grp-locale/systemd-localed/test-keymap-util.c | 6 |
5 files changed, 25 insertions, 24 deletions
diff --git a/src/grp-locale/systemd-localed/Makefile b/src/grp-locale/systemd-localed/Makefile index 8017bcc767..5cd9e07936 100644 --- a/src/grp-locale/systemd-localed/Makefile +++ b/src/grp-locale/systemd-localed/Makefile @@ -30,6 +30,7 @@ systemd_localed_SOURCES = \ src/locale/keymap-util.h systemd_localed_LDADD = \ + libsystemd-internal.la \ libsystemd-shared.la \ -ldl diff --git a/src/grp-locale/systemd-localed/keymap-util.c b/src/grp-locale/systemd-localed/keymap-util.c index 1a99cef5e5..bbaae0d8c8 100644 --- a/src/grp-locale/systemd-localed/keymap-util.c +++ b/src/grp-locale/systemd-localed/keymap-util.c @@ -22,16 +22,16 @@ #include <string.h> #include <unistd.h> -#include "basic/def.h" -#include "basic/env-util.h" -#include "basic/fd-util.h" -#include "basic/fileio-label.h" -#include "basic/fileio.h" -#include "basic/locale-util.h" -#include "basic/macro.h" -#include "basic/mkdir.h" -#include "basic/string-util.h" -#include "basic/strv.h" +#include "systemd-basic/def.h" +#include "systemd-basic/env-util.h" +#include "systemd-basic/fd-util.h" +#include "systemd-basic/fileio-label.h" +#include "systemd-basic/fileio.h" +#include "systemd-basic/locale-util.h" +#include "systemd-basic/macro.h" +#include "systemd-basic/mkdir.h" +#include "systemd-basic/string-util.h" +#include "systemd-basic/strv.h" #include "keymap-util.h" diff --git a/src/grp-locale/systemd-localed/keymap-util.h b/src/grp-locale/systemd-localed/keymap-util.h index 58b6ec4d8f..12bb83acb6 100644 --- a/src/grp-locale/systemd-localed/keymap-util.h +++ b/src/grp-locale/systemd-localed/keymap-util.h @@ -18,7 +18,7 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>. ***/ -#include "basic/locale-util.h" +#include "systemd-basic/locale-util.h" typedef struct Context { char *locale[_VARIABLE_LC_MAX]; diff --git a/src/grp-locale/systemd-localed/localed.c b/src/grp-locale/systemd-localed/localed.c index 55fadd78df..91ad61efd8 100644 --- a/src/grp-locale/systemd-localed/localed.c +++ b/src/grp-locale/systemd-localed/localed.c @@ -29,18 +29,18 @@ #include <systemd/sd-bus.h> -#include "basic/alloc-util.h" -#include "basic/def.h" -#include "basic/locale-util.h" -#include "basic/macro.h" -#include "basic/path-util.h" -#include "basic/selinux-util.h" -#include "basic/string-util.h" -#include "basic/strv.h" -#include "basic/user-util.h" #include "sd-bus/bus-error.h" #include "sd-bus/bus-message.h" -#include "shared/bus-util.h" +#include "sd-bus/bus-util.h" +#include "systemd-basic/alloc-util.h" +#include "systemd-basic/def.h" +#include "systemd-basic/locale-util.h" +#include "systemd-basic/macro.h" +#include "systemd-basic/path-util.h" +#include "systemd-basic/selinux-util.h" +#include "systemd-basic/string-util.h" +#include "systemd-basic/strv.h" +#include "systemd-basic/user-util.h" #include "keymap-util.h" diff --git a/src/grp-locale/systemd-localed/test-keymap-util.c b/src/grp-locale/systemd-localed/test-keymap-util.c index 6c001b2f50..9a7c4c9b53 100644 --- a/src/grp-locale/systemd-localed/test-keymap-util.c +++ b/src/grp-locale/systemd-localed/test-keymap-util.c @@ -17,9 +17,9 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>. ***/ -#include "basic/alloc-util.h" -#include "basic/log.h" -#include "basic/string-util.h" +#include "systemd-basic/alloc-util.h" +#include "systemd-basic/log.h" +#include "systemd-basic/string-util.h" #include "keymap-util.h" |