diff options
author | Beniamino Galvani <bgalvani@redhat.com> | 2019-06-25 11:44:02 +0200 |
---|---|---|
committer | Beniamino Galvani <bgalvani@redhat.com> | 2019-07-04 10:56:48 +0200 |
commit | 72d504a5c828f3383118d31fb6b154d19501a739 (patch) | |
tree | 8eb5b8bd0dfa4eb62036d54493779f34769243b6 | |
parent | c59821d2f4055aa18301c536a7d74ab5f72ce711 (diff) | |
download | NetworkManager-72d504a5c828f3383118d31fb6b154d19501a739.tar.gz |
systemd: add dns-domain utils to systemd static library
dns-domain.c contains useful functions for manipulating DNS names.
Add it to the systemd static library we build in shared/, similarly to
what we already do for other utility files that were originally in
src/systemd/src/basic/.
-rw-r--r-- | Makefile.am | 6 | ||||
-rw-r--r-- | shared/meson.build | 3 | ||||
-rw-r--r-- | shared/systemd/src/shared/dns-domain.c (renamed from src/systemd/src/shared/dns-domain.c) | 2 | ||||
-rw-r--r-- | shared/systemd/src/shared/dns-domain.h (renamed from src/systemd/src/shared/dns-domain.h) | 0 | ||||
-rw-r--r-- | src/systemd/meson.build | 2 |
5 files changed, 7 insertions, 6 deletions
diff --git a/Makefile.am b/Makefile.am index e58b8d68ee..6d2dca47e2 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1659,6 +1659,7 @@ libsystemd_cppflags = \ -I$(srcdir)/shared/systemd/ \ -I$(srcdir)/shared/systemd/sd-adapt-shared \ -I$(srcdir)/shared/systemd/src/basic \ + -I$(srcdir)/shared/systemd/src/shared \ $(LIBSYSTEMD_NM_CFLAGS) \ $(GLIB_CFLAGS) \ $(CODE_COVERAGE_CFLAGS) \ @@ -1801,6 +1802,8 @@ shared_systemd_libnm_systemd_shared_la_SOURCES = \ shared/systemd/src/basic/utf8.h \ shared/systemd/src/basic/util.c \ shared/systemd/src/basic/util.h \ + shared/systemd/src/shared/dns-domain.c \ + shared/systemd/src/shared/dns-domain.h \ $(NULL) shared_systemd_libnm_systemd_shared_la_LIBADD = \ @@ -1817,7 +1820,6 @@ src_libnm_systemd_core_la_cppflags = \ -I$(srcdir)/src \ -I$(srcdir)/src/systemd/sd-adapt-core \ -I$(srcdir)/src/systemd/src/systemd \ - -I$(srcdir)/src/systemd/src/shared \ -I$(srcdir)/src/systemd/src/libsystemd-network \ -I$(srcdir)/src/systemd/src/libsystemd/sd-event \ -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_SYSTEMD \ @@ -1878,8 +1880,6 @@ src_libnm_systemd_core_la_SOURCES = \ src/systemd/src/libsystemd/sd-id128/id128-util.c \ src/systemd/src/libsystemd/sd-id128/id128-util.h \ src/systemd/src/libsystemd/sd-id128/sd-id128.c \ - src/systemd/src/shared/dns-domain.c \ - src/systemd/src/shared/dns-domain.h \ src/systemd/src/systemd/_sd-common.h \ src/systemd/src/systemd/sd-dhcp-client.h \ src/systemd/src/systemd/sd-dhcp-lease.h \ diff --git a/shared/meson.build b/shared/meson.build index 304b8e0c5c..513e400bd8 100644 --- a/shared/meson.build +++ b/shared/meson.build @@ -274,11 +274,13 @@ libnm_systemd_shared = static_library( 'systemd/src/basic/tmpfile-util.c', 'systemd/src/basic/utf8.c', 'systemd/src/basic/util.c', + 'systemd/src/shared/dns-domain.c', 'systemd/nm-sd-utils-shared.c', ), include_directories: include_directories( 'systemd/sd-adapt-shared', 'systemd/src/basic', + 'systemd/src/shared', ), dependencies: shared_nm_glib_aux_dep, c_args: [ @@ -291,6 +293,7 @@ libnm_systemd_shared_dep = declare_dependency( include_directories: include_directories( 'systemd/sd-adapt-shared', 'systemd/src/basic', + 'systemd/src/shared', ), dependencies: [ shared_nm_glib_aux_dep, diff --git a/src/systemd/src/shared/dns-domain.c b/shared/systemd/src/shared/dns-domain.c index 3efa381682..92543ebe9b 100644 --- a/src/systemd/src/shared/dns-domain.c +++ b/shared/systemd/src/shared/dns-domain.c @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: LGPL-2.1+ */ -#include "nm-sd-adapt-core.h" +#include "nm-sd-adapt-shared.h" #if 0 /* NM_IGNORED */ #if HAVE_LIBIDN2 diff --git a/src/systemd/src/shared/dns-domain.h b/shared/systemd/src/shared/dns-domain.h index 17db7c5274..17db7c5274 100644 --- a/src/systemd/src/shared/dns-domain.h +++ b/shared/systemd/src/shared/dns-domain.h diff --git a/src/systemd/meson.build b/src/systemd/meson.build index 257a9462c8..599c95e8a4 100644 --- a/src/systemd/meson.build +++ b/src/systemd/meson.build @@ -23,7 +23,6 @@ libnm_systemd_core = static_library( 'src/libsystemd/sd-event/sd-event.c', 'src/libsystemd/sd-id128/id128-util.c', 'src/libsystemd/sd-id128/sd-id128.c', - 'src/shared/dns-domain.c', 'nm-sd.c', 'nm-sd-utils-core.c', ), @@ -33,7 +32,6 @@ libnm_systemd_core = static_library( 'sd-adapt-core', 'src/libsystemd-network', 'src/libsystemd/sd-event', - 'src/shared', 'src/systemd', ) ], |