summaryrefslogtreecommitdiff
path: root/Makefile.am
diff options
context:
space:
mode:
authorThomas Haller <thaller@redhat.com>2020-03-23 17:27:34 +0100
committerThomas Haller <thaller@redhat.com>2020-03-23 17:50:12 +0100
commite75d62ce763b7c571dfadc9710b9843c07110ab8 (patch)
tree74654d352c90fc4ef886ee1143e56ef22b133e7b /Makefile.am
parent44fed3c3404efcb2a9db9e4a2ad6b87c3b9a44d8 (diff)
parent46a181603483fc7e5b64beef13744920560b3ef8 (diff)
downloadNetworkManager-e75d62ce763b7c571dfadc9710b9843c07110ab8.tar.gz
systemd: merge branch systemd into master
Diffstat (limited to 'Makefile.am')
-rw-r--r--Makefile.am2
1 files changed, 2 insertions, 0 deletions
diff --git a/Makefile.am b/Makefile.am
index 3ca9eac098..4cbf9aa8e8 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1819,6 +1819,7 @@ shared_systemd_libnm_systemd_shared_la_SOURCES = \
shared/systemd/nm-sd-utils-shared.c \
shared/systemd/nm-sd-utils-shared.h \
shared/systemd/sd-adapt-shared/architecture.h \
+ shared/systemd/sd-adapt-shared/arphrd-list.h \
shared/systemd/sd-adapt-shared/build.h \
shared/systemd/sd-adapt-shared/copy.h \
shared/systemd/sd-adapt-shared/def.h \
@@ -1850,6 +1851,7 @@ shared_systemd_libnm_systemd_shared_la_SOURCES = \
shared/systemd/src/basic/alloc-util.c \
shared/systemd/src/basic/alloc-util.h \
shared/systemd/src/basic/async.h \
+ shared/systemd/src/basic/cgroup-util.h \
shared/systemd/src/basic/env-file.c \
shared/systemd/src/basic/env-file.h \
shared/systemd/src/basic/env-util.c \