summary refs log tree commit diff
path: root/test
diff options
context:
space:
mode:
authorSjoerd Simons <sjoerd@luon.net>2014-04-26 20:55:09 +0200
committerSjoerd Simons <sjoerd@luon.net>2014-04-26 20:55:09 +0200
commit59c3714a494c3b3765657c0551ad82842d98a7d2 (patch)
treee4dcdf9791fc40581f02bfaf870c30b102b3133a /test
parenta4256940da049f91bbbea5e53e469a59ea9c10f7 (diff)
Imported Upstream version 0.9.8.10 upstream/0.9.8.10
Diffstat (limited to 'test')
-rw-r--r--test/Makefile.am13
-rw-r--r--test/Makefile.in15
2 files changed, 14 insertions, 14 deletions
diff --git a/test/Makefile.am b/test/Makefile.am
index bdfd306d..4b7ca439 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -1,11 +1,10 @@
-INCLUDES = -I${top_srcdir}                    \
-           -I${top_srcdir}/libnm-util         \
-           -I${top_builddir}/libnm-util         \
-           -I${top_srcdir}/libnm-glib         \
-           -I${top_srcdir}/include            \
-	   -I${top_builddir}/include
-
 AM_CPPFLAGS = \
+	-I${top_srcdir} \
+	-I${top_srcdir}/libnm-util \
+	-I${top_builddir}/libnm-util \
+	-I${top_srcdir}/libnm-glib \
+	-I${top_srcdir}/include  \
+	-I${top_builddir}/include \
 	$(DBUS_CFLAGS) \
 	$(GLIB_CFLAGS) \
 	-DBINDIR=\"$(bindir)\" \
diff --git a/test/Makefile.in b/test/Makefile.in
index f599ca3a..f904b534 100644
--- a/test/Makefile.in
+++ b/test/Makefile.in
@@ -224,6 +224,7 @@ DEPDIR = @DEPDIR@
 DHCLIENT_PATH = @DHCLIENT_PATH@
 DHCPCD_PATH = @DHCPCD_PATH@
 DLLTOOL = @DLLTOOL@
+DNSMASQ_PATH = @DNSMASQ_PATH@
 DSYMUTIL = @DSYMUTIL@
 DUMPBIN = @DUMPBIN@
 ECHO_C = @ECHO_C@
@@ -246,6 +247,7 @@ GNUTLS_CFLAGS = @GNUTLS_CFLAGS@
 GNUTLS_LIBS = @GNUTLS_LIBS@
 GREP = @GREP@
 GTKDOC_CHECK = @GTKDOC_CHECK@
+GTKDOC_CHECK_PATH = @GTKDOC_CHECK_PATH@
 GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@
 GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@
 GTKDOC_MKPDF = @GTKDOC_MKPDF@
@@ -430,14 +432,13 @@ with_dhclient = @with_dhclient@
 with_dhcpcd = @with_dhcpcd@
 with_netconfig = @with_netconfig@
 with_resolvconf = @with_resolvconf@
-INCLUDES = -I${top_srcdir}                    \
-           -I${top_srcdir}/libnm-util         \
-           -I${top_builddir}/libnm-util         \
-           -I${top_srcdir}/libnm-glib         \
-           -I${top_srcdir}/include            \
-	   -I${top_builddir}/include
-
 AM_CPPFLAGS = \
+	-I${top_srcdir} \
+	-I${top_srcdir}/libnm-util \
+	-I${top_builddir}/libnm-util \
+	-I${top_srcdir}/libnm-glib \
+	-I${top_srcdir}/include  \
+	-I${top_builddir}/include \
 	$(DBUS_CFLAGS) \
 	$(GLIB_CFLAGS) \
 	-DBINDIR=\"$(bindir)\" \