diff options
| -rw-r--r-- | src/libsystemd/include/systemd/sd-utf8.h | 32 | ||||
| -rw-r--r-- | src/libsystemd/src/Makefile | 4 | ||||
| l--------- | src/libsystemd/src/sd-path/Makefile | 1 | ||||
| l--------- | src/libsystemd/src/sd-utf8/Makefile | 1 | ||||
| -rw-r--r-- | src/libsystemd/src/sd-utf8/sd-utf8.c | 35 | ||||
| -rw-r--r-- | src/libsystemd/src/subdir.mk | 2 | ||||
| -rw-r--r-- | src/systemd-path/Makefile | 6 | ||||
| l--------- | src/systemd-path/_sd-common.h | 1 | ||||
| -rw-r--r-- | src/systemd-path/path.c | 2 | ||||
| -rw-r--r-- | src/systemd-path/sd-path.c (renamed from src/libsystemd/src/sd-path/sd-path.c) | 2 | ||||
| -rw-r--r-- | src/systemd-path/sd-path.h (renamed from src/libsystemd/include/systemd/sd-path.h) | 0 |
11 files changed, 8 insertions, 78 deletions
diff --git a/src/libsystemd/include/systemd/sd-utf8.h b/src/libsystemd/include/systemd/sd-utf8.h deleted file mode 100644 index 6781983878..0000000000 --- a/src/libsystemd/include/systemd/sd-utf8.h +++ /dev/null @@ -1,32 +0,0 @@ -#ifndef foosdutf8hfoo -#define foosdutf8hfoo - -/*** - This file is part of systemd. - - Copyright 2013 Lennart Poettering - - systemd is free software; you can redistribute it and/or modify it - under the terms of the GNU Lesser General Public License as published by - the Free Software Foundation; either version 2.1 of the License, or - (at your option) any later version. - - systemd is distributed in the hope that it will be useful, but - WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public License - along with systemd; If not, see <http://www.gnu.org/licenses/>. -***/ - -#include "_sd-common.h" - -_SD_BEGIN_DECLARATIONS; - -_sd_pure_ const char *sd_utf8_is_valid(const char *s); -_sd_pure_ const char *sd_ascii_is_valid(const char *s); - -_SD_END_DECLARATIONS; - -#endif diff --git a/src/libsystemd/src/Makefile b/src/libsystemd/src/Makefile index 5ebeb9d7fa..3e30a2377b 100644 --- a/src/libsystemd/src/Makefile +++ b/src/libsystemd/src/Makefile @@ -27,14 +27,12 @@ _libsystemd_internal_la_SOURCES = \ src/systemd/sd-bus.h \ src/systemd/sd-bus-protocol.h \ src/systemd/sd-bus-vtable.h \ - src/systemd/sd-utf8.h \ src/systemd/sd-event.h \ src/systemd/sd-netlink.h \ src/systemd/sd-resolve.h \ src/systemd/sd-login.h \ src/systemd/sd-id128.h \ src/systemd/sd-daemon.h \ - src/systemd/sd-path.h \ src/systemd/sd-network.h \ src/systemd/sd-hwdb.h \ src/systemd/sd-device.h \ @@ -81,7 +79,6 @@ _libsystemd_internal_la_SOURCES = \ src/libsystemd/sd-bus/kdbus.h \ src/libsystemd/sd-bus/bus-dump.c \ src/libsystemd/sd-bus/bus-dump.h \ - src/libsystemd/sd-utf8/sd-utf8.c \ src/libsystemd/sd-event/sd-event.c \ src/libsystemd/sd-netlink/sd-netlink.c \ src/libsystemd/sd-netlink/netlink-internal.h \ @@ -97,7 +94,6 @@ _libsystemd_internal_la_SOURCES = \ src/libsystemd/sd-id128/sd-id128.c \ src/libsystemd/sd-daemon/sd-daemon.c \ src/libsystemd/sd-login/sd-login.c \ - src/libsystemd/sd-path/sd-path.c \ src/libsystemd/sd-network/sd-network.c \ src/libsystemd/sd-network/network-util.h \ src/libsystemd/sd-network/network-util.c \ diff --git a/src/libsystemd/src/sd-path/Makefile b/src/libsystemd/src/sd-path/Makefile deleted file mode 120000 index 71a1159ce0..0000000000 --- a/src/libsystemd/src/sd-path/Makefile +++ /dev/null @@ -1 +0,0 @@ -../subdir.mk
\ No newline at end of file diff --git a/src/libsystemd/src/sd-utf8/Makefile b/src/libsystemd/src/sd-utf8/Makefile deleted file mode 120000 index 71a1159ce0..0000000000 --- a/src/libsystemd/src/sd-utf8/Makefile +++ /dev/null @@ -1 +0,0 @@ -../subdir.mk
\ No newline at end of file diff --git a/src/libsystemd/src/sd-utf8/sd-utf8.c b/src/libsystemd/src/sd-utf8/sd-utf8.c deleted file mode 100644 index 58e4a88f07..0000000000 --- a/src/libsystemd/src/sd-utf8/sd-utf8.c +++ /dev/null @@ -1,35 +0,0 @@ -/*** - This file is part of systemd. - - Copyright 2013 Lennart Poettering - - systemd is free software; you can redistribute it and/or modify it - under the terms of the GNU Lesser General Public License as published by - the Free Software Foundation; either version 2.1 of the License, or - (at your option) any later version. - - systemd is distributed in the hope that it will be useful, but - WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public License - along with systemd; If not, see <http://www.gnu.org/licenses/>. -***/ - -#include <systemd/sd-utf8.h> - -#include "basic/utf8.h" -#include "basic/util.h" - -_public_ const char *sd_utf8_is_valid(const char *s) { - assert_return(s, NULL); - - return utf8_is_valid(s); -} - -_public_ const char *sd_ascii_is_valid(const char *s) { - assert_return(s, NULL); - - return ascii_is_valid(s); -} diff --git a/src/libsystemd/src/subdir.mk b/src/libsystemd/src/subdir.mk index 752ffa6aed..2b0ea2c84f 100644 --- a/src/libsystemd/src/subdir.mk +++ b/src/libsystemd/src/subdir.mk @@ -27,8 +27,6 @@ include $(topsrcdir)/build-aux/Makefile.head.mk systemd.CPPFLAGS += $(libsystemd.CPPFLAGS) systemd.CPPFLAGS += $(libbasic.CPPFLAGS) systemd.CPPFLAGS += $(libshared.CPPFLAGS) -systemd.CPPFLAGS += -DLIBDIR=\"$(libdir)\" systemd.CPPFLAGS += -DUDEVLIBEXECDIR=\"$(udevlibexecdir)\" -systemd.CPPFLAGS += -DROOTLIBDIR=\"$(rootlibdir)\" include $(topsrcdir)/build-aux/Makefile.tail.mk diff --git a/src/systemd-path/Makefile b/src/systemd-path/Makefile index eb609cb1b9..4835742fd6 100644 --- a/src/systemd-path/Makefile +++ b/src/systemd-path/Makefile @@ -26,9 +26,13 @@ include $(topsrcdir)/build-aux/Makefile.head.mk bin_PROGRAMS += systemd-path systemd_path_SOURCES = \ + sd-path.c \ src/path/path.c systemd_path_LDADD = \ - libshared.la + libbasic.la + +systemd.CPPFLAGS += -DLIBDIR=\"$(libdir)\" +systemd.CPPFLAGS += -DROOTLIBDIR=\"$(rootlibdir)\" include $(topsrcdir)/build-aux/Makefile.tail.mk diff --git a/src/systemd-path/_sd-common.h b/src/systemd-path/_sd-common.h new file mode 120000 index 0000000000..89aca2e4a7 --- /dev/null +++ b/src/systemd-path/_sd-common.h @@ -0,0 +1 @@ +../libsystemd/include/systemd/_sd-common.h
\ No newline at end of file diff --git a/src/systemd-path/path.c b/src/systemd-path/path.c index 0856f6b323..aa63884365 100644 --- a/src/systemd-path/path.c +++ b/src/systemd-path/path.c @@ -22,7 +22,7 @@ #include <stdio.h> #include <stdlib.h> -#include <systemd/sd-path.h> +#include "sd-path.h" #include "basic/alloc-util.h" #include "basic/log.h" diff --git a/src/libsystemd/src/sd-path/sd-path.c b/src/systemd-path/sd-path.c index f18fd49719..b904b56c01 100644 --- a/src/libsystemd/src/sd-path/sd-path.c +++ b/src/systemd-path/sd-path.c @@ -17,7 +17,7 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>. ***/ -#include <systemd/sd-path.h> +#include "sd-path.h" #include "basic/alloc-util.h" #include "basic/architecture.h" diff --git a/src/libsystemd/include/systemd/sd-path.h b/src/systemd-path/sd-path.h index be6abdcd03..be6abdcd03 100644 --- a/src/libsystemd/include/systemd/sd-path.h +++ b/src/systemd-path/sd-path.h |