summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarcel Holtmann <marcel@holtmann.org>2010-07-26 10:14:58 -0700
committerMarcel Holtmann <marcel@holtmann.org>2010-07-26 10:14:58 -0700
commit162263da56c42267412d1878c493809176624697 (patch)
tree28b8ddea52d6b9cdc174199be3f57c96a40febcc
parent36a887f312bf14c265613a5a209c7de661e1bf48 (diff)
downloadconnman-162263da56c42267412d1878c493809176624697.tar.gz
connman-162263da56c42267412d1878c493809176624697.tar.bz2
connman-162263da56c42267412d1878c493809176624697.zip
Use top-level include directory for internal DHCP library
-rw-r--r--Makefile.am3
-rw-r--r--plugins/dhcp.c2
-rw-r--r--tools/dhcp-test.c2
3 files changed, 3 insertions, 4 deletions
diff --git a/Makefile.am b/Makefile.am
index 2999afe4..280f6fcf 100644
--- 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 7f8577b2..d82e16ec 100644
--- 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 133ed953..3b599afb 100644
--- 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;