diff options
| author | Thomas Haller <thaller@redhat.com> | 2016-08-11 12:42:53 +0200 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2016-08-11 20:51:23 +0200 |
| commit | 53afa963c51271edb271866f378b9554b6528f83 (patch) | |
| tree | 89da42dc821829faf256061a0ac5d1b9a4c19aab /src/Makefile.am | |
| parent | f124f8772ed39254567343248e63de796a633aed (diff) | |
| parent | c8ff87803944f8e16137328b5440b7bb87aa297f (diff) | |
| download | NetworkManager-th/systemdx.tar.gz | |
systemd: merge branch systemd into masterth/systemdx
Conflicts:
src/systemd/src/basic/fd-util.c
src/systemd/src/basic/fileio.c
src/systemd/src/libsystemd/sd-event/sd-event.c
src/systemd/src/libsystemd/sd-id128/sd-id128.c
Diffstat (limited to 'src/Makefile.am')
| -rw-r--r-- | src/Makefile.am | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index ae6f2800d5..565a89fa65 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -200,6 +200,7 @@ libsystemd_nm_la_SOURCES = \ systemd/src/libsystemd-network/sd-ipv4ll.c \ systemd/src/libsystemd-network/sd-lldp.c \ systemd/src/libsystemd/sd-event/sd-event.c \ + systemd/src/libsystemd/sd-id128/id128-util.h \ systemd/src/libsystemd/sd-id128/sd-id128.c \ systemd/src/shared/dns-domain.c \ systemd/src/shared/dns-domain.h \ |