colin/NetworkManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

systemd: add dns-domain utils to systemd static library

Browse Source 
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/.
This commit is contained in:
Beniamino Galvani
2019-06-25 11:44:02 +02:00
parent 92a717e7c2
commit 7d3098ff90
5 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Makefile.am
View File

@@ -1659,6 +1659,7 @@ libsystemd_cppflags = \
-I$(srcdir)/shared/systemd/ \ -I$(srcdir)/shared/systemd/ \
-I$(srcdir)/shared/systemd/sd-adapt-shared \ -I$(srcdir)/shared/systemd/sd-adapt-shared \
-I$(srcdir)/shared/systemd/src/basic \ -I$(srcdir)/shared/systemd/src/basic \
-I$(srcdir)/shared/systemd/src/shared \
$(LIBSYSTEMD_NM_CFLAGS) \ $(LIBSYSTEMD_NM_CFLAGS) \
$(GLIB_CFLAGS) \ $(GLIB_CFLAGS) \
$(CODE_COVERAGE_CFLAGS) \ $(CODE_COVERAGE_CFLAGS) \
@@ -1802,6 +1803,8 @@ shared_systemd_libnm_systemd_shared_la_SOURCES = \
shared/systemd/src/basic/utf8.h \ shared/systemd/src/basic/utf8.h \
shared/systemd/src/basic/util.c \ shared/systemd/src/basic/util.c \
shared/systemd/src/basic/util.h \ shared/systemd/src/basic/util.h \
shared/systemd/src/shared/dns-domain.c \
shared/systemd/src/shared/dns-domain.h \
$(NULL) $(NULL)
shared_systemd_libnm_systemd_shared_la_LIBADD = \ shared_systemd_libnm_systemd_shared_la_LIBADD = \
@@ -1818,7 +1821,6 @@ src_libnm_systemd_core_la_cppflags = \
-I$(srcdir)/src \ -I$(srcdir)/src \
-I$(srcdir)/src/systemd/sd-adapt-core \ -I$(srcdir)/src/systemd/sd-adapt-core \
-I$(srcdir)/src/systemd/src/systemd \ -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-network \
-I$(srcdir)/src/systemd/src/libsystemd/sd-event \ -I$(srcdir)/src/systemd/src/libsystemd/sd-event \
-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_SYSTEMD \ -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_SYSTEMD \
@@ -1879,8 +1881,6 @@ src_libnm_systemd_core_la_SOURCES = \
src/systemd/src/libsystemd/sd-id128/id128-util.c \ src/systemd/src/libsystemd/sd-id128/id128-util.c \
src/systemd/src/libsystemd/sd-id128/id128-util.h \ src/systemd/src/libsystemd/sd-id128/id128-util.h \
src/systemd/src/libsystemd/sd-id128/sd-id128.c \ 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-common.h \
src/systemd/src/systemd/sd-dhcp-client.h \ src/systemd/src/systemd/sd-dhcp-client.h \
src/systemd/src/systemd/sd-dhcp-lease.h \ src/systemd/src/systemd/sd-dhcp-lease.h \

3
shared/meson.build
View File

@@ -275,11 +275,13 @@ libnm_systemd_shared = static_library(
'systemd/src/basic/tmpfile-util.c', 'systemd/src/basic/tmpfile-util.c',
'systemd/src/basic/utf8.c', 'systemd/src/basic/utf8.c',
'systemd/src/basic/util.c', 'systemd/src/basic/util.c',
'systemd/src/shared/dns-domain.c',
'systemd/nm-sd-utils-shared.c', 'systemd/nm-sd-utils-shared.c',
), ),
include_directories: include_directories( include_directories: include_directories(
'systemd/sd-adapt-shared', 'systemd/sd-adapt-shared',
'systemd/src/basic', 'systemd/src/basic',
'systemd/src/shared',
), ),
dependencies: shared_nm_glib_aux_dep, dependencies: shared_nm_glib_aux_dep,
c_args: [ c_args: [
@@ -292,6 +294,7 @@ libnm_systemd_shared_dep = declare_dependency(
include_directories: include_directories( include_directories: include_directories(
'systemd/sd-adapt-shared', 'systemd/sd-adapt-shared',
'systemd/src/basic', 'systemd/src/basic',
'systemd/src/shared',
), ),
dependencies: [ dependencies: [
shared_nm_glib_aux_dep, shared_nm_glib_aux_dep,

2
src/systemd/src/shared/dns-domain.c → shared/systemd/src/shared/dns-domain.c
View File

@@ -1,6 +1,6 @@
/* SPDX-License-Identifier: LGPL-2.1+ */ /* SPDX-License-Identifier: LGPL-2.1+ */
#include "nm-sd-adapt-core.h" #include "nm-sd-adapt-shared.h"
#if 0 /* NM_IGNORED */ #if 0 /* NM_IGNORED */
#if HAVE_LIBIDN2 #if HAVE_LIBIDN2

0
src/systemd/src/shared/dns-domain.h → shared/systemd/src/shared/dns-domain.h
View File

2
src/systemd/meson.build
View File

@@ -23,7 +23,6 @@ libnm_systemd_core = static_library(
'src/libsystemd/sd-event/sd-event.c', 'src/libsystemd/sd-event/sd-event.c',
'src/libsystemd/sd-id128/id128-util.c', 'src/libsystemd/sd-id128/id128-util.c',
'src/libsystemd/sd-id128/sd-id128.c', 'src/libsystemd/sd-id128/sd-id128.c',
'src/shared/dns-domain.c',
'nm-sd.c', 'nm-sd.c',
'nm-sd-utils-core.c', 'nm-sd-utils-core.c',
), ),
@@ -33,7 +32,6 @@ libnm_systemd_core = static_library(
'sd-adapt-core', 'sd-adapt-core',
'src/libsystemd-network', 'src/libsystemd-network',
'src/libsystemd/sd-event', 'src/libsystemd/sd-event',
'src/shared',
'src/systemd', 'src/systemd',
) )
], ],