diff options
| author | Thomas Haller <thaller@redhat.com> | 2019-12-15 14:28:45 +0100 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2019-12-16 10:22:09 +0100 |
| commit | 9e02a676196300370487b39cbcff4e28d6c5f27c (patch) | |
| tree | af6373d1ca2b7cd64994fc9c875964267ae5277a /Makefile.am | |
| parent | a1771c738dd2e1437bd9f7c73805fd8a1b1b3d1d (diff) | |
| parent | 0d155d1821875ab0de1ebe95570e5684daeb7d52 (diff) | |
| download | NetworkManager-9e02a676196300370487b39cbcff4e28d6c5f27c.tar.gz | |
systemd: merge branch systemd into master
Diffstat (limited to 'Makefile.am')
| -rw-r--r-- | Makefile.am | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/Makefile.am b/Makefile.am index 8b75426009..abee1d13c5 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1788,10 +1788,10 @@ shared_systemd_libnm_systemd_shared_la_SOURCES = \ shared/systemd/sd-adapt-shared/locale-util.h \ shared/systemd/sd-adapt-shared/memfd-util.h \ shared/systemd/sd-adapt-shared/missing_fs.h \ + shared/systemd/sd-adapt-shared/missing_keyctl.h \ shared/systemd/sd-adapt-shared/missing_magic.h \ shared/systemd/sd-adapt-shared/missing_network.h \ shared/systemd/sd-adapt-shared/missing_sched.h \ - shared/systemd/sd-adapt-shared/missing_syscall.h \ shared/systemd/sd-adapt-shared/missing_timerfd.h \ shared/systemd/sd-adapt-shared/mkdir.h \ shared/systemd/sd-adapt-shared/namespace-util.h \ @@ -1849,6 +1849,7 @@ shared_systemd_libnm_systemd_shared_la_SOURCES = \ shared/systemd/src/basic/missing_random.h \ shared/systemd/src/basic/missing_socket.h \ shared/systemd/src/basic/missing_stat.h \ + shared/systemd/src/basic/missing_syscall.h \ shared/systemd/src/basic/missing_type.h \ shared/systemd/src/basic/parse-util.c \ shared/systemd/src/basic/parse-util.h \ @@ -1861,6 +1862,7 @@ shared_systemd_libnm_systemd_shared_la_SOURCES = \ shared/systemd/src/basic/random-util.c \ shared/systemd/src/basic/random-util.h \ shared/systemd/src/basic/set.h \ + shared/systemd/src/basic/signal-util.c \ shared/systemd/src/basic/signal-util.h \ shared/systemd/src/basic/siphash24.h \ shared/systemd/src/basic/socket-util.c \ |