diff options
| author | Beniamino Galvani <bgalvani@redhat.com> | 2015-11-23 16:13:45 +0100 |
|---|---|---|
| committer | Beniamino Galvani <bgalvani@redhat.com> | 2015-11-23 16:18:10 +0100 |
| commit | aa22b2d87f28ed491fec3f1b40fc9d7b3042b926 (patch) | |
| tree | 319c0191245212a79d6a10d8b2bb8e3aa3249721 /src/Makefile.am | |
| parent | b8c2fc26c12d4732d112237c8210fef4255c43e7 (diff) | |
| parent | aa9d0d1467ae3569b7c3161cabda2cbe62056526 (diff) | |
| download | NetworkManager-aa22b2d87f28ed491fec3f1b40fc9d7b3042b926.tar.gz | |
systemd: merge branch 'systemd' into master
Diffstat (limited to 'src/Makefile.am')
| -rw-r--r-- | src/Makefile.am | 19 |
1 files changed, 19 insertions, 0 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index 0c96c4510d..367333c8e8 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -67,20 +67,34 @@ SYSTEMD_NM_CFLAGS_PATHS = \ libsystemd_nm_la_SOURCES = \ systemd/nm-sd-adapt.c \ systemd/nm-sd-adapt.h \ + systemd/src/basic/alloc-util.c \ + systemd/src/basic/alloc-util.h \ systemd/src/basic/async.h \ + systemd/src/basic/escape.c \ + systemd/src/basic/escape.h \ + systemd/src/basic/fd-util.c \ + systemd/src/basic/fd-util.h \ systemd/src/basic/fileio.c \ systemd/src/basic/fileio.h \ + systemd/src/basic/fs-util.c \ + systemd/src/basic/fs-util.h \ systemd/src/basic/hashmap.c \ systemd/src/basic/hashmap.h \ + systemd/src/basic/hexdecoct.c \ + systemd/src/basic/hexdecoct.h \ systemd/src/basic/hostname-util.c \ systemd/src/basic/hostname-util.h \ systemd/src/basic/in-addr-util.c \ systemd/src/basic/in-addr-util.h \ + systemd/src/basic/io-util.c \ + systemd/src/basic/io-util.h \ systemd/src/basic/list.h \ systemd/src/basic/log.h \ systemd/src/basic/macro.h \ systemd/src/basic/mempool.c \ systemd/src/basic/mempool.h \ + systemd/src/basic/parse-util.c \ + systemd/src/basic/parse-util.h \ systemd/src/basic/path-util.c \ systemd/src/basic/path-util.h \ systemd/src/basic/prioq.c \ @@ -93,10 +107,15 @@ libsystemd_nm_la_SOURCES = \ systemd/src/basic/set.h \ systemd/src/basic/socket-util.h \ systemd/src/basic/sparse-endian.h \ + systemd/src/basic/string-table.c \ + systemd/src/basic/string-table.h \ + systemd/src/basic/string-util.c \ + systemd/src/basic/string-util.h \ systemd/src/basic/strv.c \ systemd/src/basic/strv.h \ systemd/src/basic/time-util.c \ systemd/src/basic/time-util.h \ + systemd/src/basic/umask-util.h \ systemd/src/basic/unaligned.h \ systemd/src/basic/utf8.c \ systemd/src/basic/utf8.h \ |