diff options
| author | Thomas Haller <thaller@redhat.com> | 2018-11-23 10:55:45 +0100 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2018-11-23 11:38:02 +0100 |
| commit | 9d122e7b809d21f96bdf9fd81c0d2e34f9604ab3 (patch) | |
| tree | bc8d3bf405b020133e21cbc619930612cf55b82a /Makefile.am | |
| parent | a294ca3eecdb47b9c1dc0bb40f12d52d7512a7cc (diff) | |
| parent | 48d64de1776660eb06fde77078507d25b0d5b40a (diff) | |
| download | NetworkManager-9d122e7b809d21f96bdf9fd81c0d2e34f9604ab3.tar.gz | |
systemd: merge branch systemd into master
Diffstat (limited to 'Makefile.am')
| -rw-r--r-- | Makefile.am | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/Makefile.am b/Makefile.am index 419006499e..dce77f9df5 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1500,6 +1500,7 @@ src_libsystemd_nm_la_cppflags = \ -I$(srcdir)/src/systemd/src/basic \ -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 \ $(LIBSYSTEMD_NM_CFLAGS) \ $(GLIB_CFLAGS) \ @@ -1642,6 +1643,9 @@ src_libsystemd_nm_la_SOURCES = \ src/systemd/src/libsystemd-network/sd-ipv4acd.c \ src/systemd/src/libsystemd-network/sd-ipv4ll.c \ src/systemd/src/libsystemd-network/sd-lldp.c \ + src/systemd/src/libsystemd/sd-event/event-source.h \ + src/systemd/src/libsystemd/sd-event/event-util.c \ + src/systemd/src/libsystemd/sd-event/event-util.h \ src/systemd/src/libsystemd/sd-event/sd-event.c \ src/systemd/src/libsystemd/sd-id128/id128-util.c \ src/systemd/src/libsystemd/sd-id128/id128-util.h \ |