diff options
| author | Thomas Haller <thaller@redhat.com> | 2022-07-05 17:31:20 +0200 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2022-07-07 00:50:46 +0200 |
| commit | 556bff17679c1705c258eb9ec6f02f645e61c017 (patch) | |
| tree | 38cdbf82f898013c68d602995a8e18ae44cbee6a /Makefile.am | |
| parent | b12281089ca298a75554012ee19a176cc17ed5c8 (diff) | |
| parent | 3a603c87647c36c9f7d24dc727c81618ad06fca3 (diff) | |
| download | NetworkManager-556bff17679c1705c258eb9ec6f02f645e61c017.tar.gz | |
systemd: merge branch systemd into main
https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/merge_requests/1291
Diffstat (limited to 'Makefile.am')
| -rw-r--r-- | Makefile.am | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/Makefile.am b/Makefile.am index 355984abae..8a7b2c35e7 100644 --- a/Makefile.am +++ b/Makefile.am @@ -2177,7 +2177,6 @@ src_libnm_systemd_shared_libnm_systemd_shared_la_SOURCES = \ src/libnm-systemd-shared/sd-adapt-shared/hmac.h \ src/libnm-systemd-shared/sd-adapt-shared/idn-util.h \ src/libnm-systemd-shared/sd-adapt-shared/ioprio.h \ - src/libnm-systemd-shared/sd-adapt-shared/locale-util.h \ src/libnm-systemd-shared/sd-adapt-shared/memfd-util.h \ src/libnm-systemd-shared/sd-adapt-shared/missing_fs.h \ src/libnm-systemd-shared/sd-adapt-shared/missing_ioprio.h \ @@ -2225,6 +2224,8 @@ src_libnm_systemd_shared_libnm_systemd_shared_la_SOURCES = \ src/libnm-systemd-shared/src/basic/format-util.h \ src/libnm-systemd-shared/src/basic/fs-util.c \ src/libnm-systemd-shared/src/basic/fs-util.h \ + src/libnm-systemd-shared/src/basic/glyph-util.c \ + src/libnm-systemd-shared/src/basic/glyph-util.h \ src/libnm-systemd-shared/src/basic/hash-funcs.c \ src/libnm-systemd-shared/src/basic/hash-funcs.h \ src/libnm-systemd-shared/src/basic/hashmap.c \ @@ -2240,6 +2241,8 @@ src_libnm_systemd_shared_libnm_systemd_shared_la_SOURCES = \ src/libnm-systemd-shared/src/basic/io-util.c \ src/libnm-systemd-shared/src/basic/io-util.h \ src/libnm-systemd-shared/src/basic/list.h \ + src/libnm-systemd-shared/src/basic/locale-util.c \ + src/libnm-systemd-shared/src/basic/locale-util.h \ src/libnm-systemd-shared/src/basic/log.h \ src/libnm-systemd-shared/src/basic/macro.h \ src/libnm-systemd-shared/src/basic/memory-util.c \ @@ -2295,9 +2298,10 @@ src_libnm_systemd_shared_libnm_systemd_shared_la_SOURCES = \ src/libnm-systemd-shared/src/basic/util.c \ src/libnm-systemd-shared/src/basic/util.h \ src/libnm-systemd-shared/src/fundamental/macro-fundamental.h \ + src/libnm-systemd-shared/src/fundamental/sha256.c \ + src/libnm-systemd-shared/src/fundamental/sha256.h \ src/libnm-systemd-shared/src/fundamental/string-util-fundamental.c \ src/libnm-systemd-shared/src/fundamental/string-util-fundamental.h \ - src/libnm-systemd-shared/src/fundamental/types-fundamental.h \ src/libnm-systemd-shared/src/shared/dns-domain.c \ src/libnm-systemd-shared/src/shared/dns-domain.h \ src/libnm-systemd-shared/src/shared/log-link.h \ |