diff options
| author | Thomas Haller <thaller@redhat.com> | 2016-11-21 00:43:52 +0100 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2016-11-21 14:26:37 +0100 |
| commit | 44ecb41593bc627d8f4529e74de4a549cf24a695 (patch) | |
| tree | dbaecdedb38a3a533a0a05a19fcc208dfb2b3b7a /src/dnsmasq | |
| parent | a65762ca332ee9ba5b80e66c901e5e82bc90f135 (diff) | |
build: don't add subdirectories to include search path but require qualified include
Keep the include paths clean and separate. We use directories to group source
files together. That makes sense (I guess), but then we should use this
grouping also when including files. Thus require to #include files with their
path relative to "src/".
Also, we build various artifacts from the "src/" tree. Instead of having
individual CFLAGS for each artifact in Makefile.am, the CFLAGS should be
unified. Previously, the CFLAGS for each artifact differ and are inconsistent
in which paths they add to the search path. Fix the inconsistency by just
don't add the paths at all.
Diffstat (limited to 'src/dnsmasq')
| -rw-r--r-- | src/dnsmasq/nm-dnsmasq-utils.c | 2 | ||||
| -rw-r--r-- | src/dnsmasq/nm-dnsmasq-utils.h | 2 | ||||
| -rw-r--r-- | src/dnsmasq/tests/test-dnsmasq-utils.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/src/dnsmasq/nm-dnsmasq-utils.c b/src/dnsmasq/nm-dnsmasq-utils.c index 3786f37d44..e4f4324b85 100644 --- a/src/dnsmasq/nm-dnsmasq-utils.c +++ b/src/dnsmasq/nm-dnsmasq-utils.c @@ -24,7 +24,7 @@ #include <arpa/inet.h> #include "nm-dnsmasq-utils.h" -#include "nm-platform.h" +#include "platform/nm-platform.h" #include "nm-utils.h" gboolean diff --git a/src/dnsmasq/nm-dnsmasq-utils.h b/src/dnsmasq/nm-dnsmasq-utils.h index 459dda0475..54b90309cf 100644 --- a/src/dnsmasq/nm-dnsmasq-utils.h +++ b/src/dnsmasq/nm-dnsmasq-utils.h @@ -21,7 +21,7 @@ #ifndef __NETWORKMANAGER_DNSMASQ_UTILS_H__ #define __NETWORKMANAGER_DNSMASQ_UTILS_H__ -#include "nm-platform.h" +#include "platform/nm-platform.h" gboolean nm_dnsmasq_utils_get_range (const NMPlatformIP4Address *addr, char *out_first, diff --git a/src/dnsmasq/tests/test-dnsmasq-utils.c b/src/dnsmasq/tests/test-dnsmasq-utils.c index a826abaf30..00ff66102a 100644 --- a/src/dnsmasq/tests/test-dnsmasq-utils.c +++ b/src/dnsmasq/tests/test-dnsmasq-utils.c @@ -22,7 +22,7 @@ #include <arpa/inet.h> -#include "nm-dnsmasq-utils.h" +#include "dnsmasq/nm-dnsmasq-utils.h" #include "nm-test-utils-core.h" |