diff options
| author | Thomas Haller <thaller@redhat.com> | 2016-10-15 18:25:13 +0200 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2016-10-19 17:16:08 +0200 |
| commit | b219eb19f1649c9f794be3b3f9aec595ef5fb036 (patch) | |
| tree | ab289bedda3b703a6b1f400efe5a6e98ce087094 /src/nm-config.c | |
| parent | 7aefbcb622f855b039d3c26d9a2f3b1ecaa84a5a (diff) | |
| download | NetworkManager-b219eb19f1649c9f794be3b3f9aec595ef5fb036.tar.gz | |
build: merge "src/Makefile.am" into toplevel Makefile
Had to rename "nm-enum-types.h" because it works badly with
"libnm/nm-enum-types.h". Maybe I could fix that differently,
but duplicate names is anyway error prone.
Note that "nm-core-enum-types.h" is already taken too, so
"nm-src-enum-types.h" it is.
Diffstat (limited to 'src/nm-config.c')
| -rw-r--r-- | src/nm-config.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/nm-config.c b/src/nm-config.c index 6338eb617d..2d7237faa8 100644 --- a/src/nm-config.c +++ b/src/nm-config.c @@ -29,7 +29,7 @@ #include "nm-utils.h" #include "nm-device.h" #include "NetworkManagerUtils.h" -#include "nm-enum-types.h" +#include "nm-src-enum-types.h" #include "nm-core-internal.h" #include "nm-keyfile-internal.h" |