Use top-level include directory for internal DHCP library

diff --git a/Makefile.am b/Makefile.am
index 2999afe..280f6fc 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -102,8 +102,7 @@ AM_CFLAGS = @UDEV_CFLAGS@ @IPTC_CFLAGS@ @NETLINK_CFLAGS@ @CAPNG_CFLAGS@ \
                                -DSCRIPTDIR=\""$(build_scriptdir)"\" \
                                -DSTORAGEDIR=\""$(storagedir)\""
 
-INCLUDES = -I$(builddir)/include -I$(builddir)/src \
-                                       -I$(srcdir)/gdbus -I$(srcdir)/gdhcp
+INCLUDES = -I$(builddir)/include -I$(builddir)/src -I$(srcdir)/gdbus
 
 EXTRA_DIST = src/genbuiltin src/connman-dbus.conf src/connman-polkit.conf
 

diff --git a/plugins/dhcp.c b/plugins/dhcp.c
index 7f8577b..d82e16e 100644 (file)
--- a/plugins/dhcp.c
+++ b/plugins/dhcp.c
@@ -33,7 +33,7 @@
 #include <connman/utsname.h>
 #include <connman/log.h>
 
-#include <gdhcp.h>
+#include <gdhcp/gdhcp.h>
 
 static void no_lease_cb(GDHCPClient *dhcp_client, gpointer user_data)
 {

diff --git a/tools/dhcp-test.c b/tools/dhcp-test.c
index 133ed95..3b599af 100644 (file)
--- a/tools/dhcp-test.c
+++ b/tools/dhcp-test.c
@@ -35,7 +35,7 @@
 #include <net/ethernet.h>
 #include <linux/if_arp.h>
 
-#include <gdhcp.h>
+#include <gdhcp/gdhcp.h>
 
 static GTimer *timer;