diff options
| author | Sjoerd Simons <sjoerd@luon.net> | 2014-04-26 20:55:17 +0200 |
|---|---|---|
| committer | Sjoerd Simons <sjoerd@luon.net> | 2014-04-26 20:55:17 +0200 |
| commit | 0dccbc804e92f56afd9e7d598dce4bcd8716bbcc (patch) | |
| tree | 1054a65c0cde38dc89e5c692a3a7458160823afa /src/dhcp-manager/tests | |
| parent | 7df62b86e35a67049a4bc7810c29994d8a7ef175 (diff) | |
| parent | 59c3714a494c3b3765657c0551ad82842d98a7d2 (diff) | |
Merge tag 'upstream/0.9.8.10'
Upstream version 0.9.8.10
Diffstat (limited to 'src/dhcp-manager/tests')
| -rw-r--r-- | src/dhcp-manager/tests/Makefile.am | 7 | ||||
| -rw-r--r-- | src/dhcp-manager/tests/Makefile.in | 9 |
2 files changed, 10 insertions, 6 deletions
diff --git a/src/dhcp-manager/tests/Makefile.am b/src/dhcp-manager/tests/Makefile.am index 8c9d06c1..bf859fe7 100644 --- a/src/dhcp-manager/tests/Makefile.am +++ b/src/dhcp-manager/tests/Makefile.am @@ -1,11 +1,12 @@ if ENABLE_TESTS -INCLUDES = \ +AM_CPPFLAGS = \ -I$(top_srcdir)/include \ -I$(top_builddir)/include \ -I${top_srcdir}/libnm-util \ -I${top_builddir}/libnm-util \ - -I$(top_srcdir)/src/dhcp-manager + -I$(top_srcdir)/src/dhcp-manager \ + $(GLIB_CFLAGS) noinst_PROGRAMS = test-dhcp-dhclient @@ -15,7 +16,7 @@ test_dhcp_dhclient_SOURCES = \ test-dhcp-dhclient.c test_dhcp_dhclient_CPPFLAGS = \ - $(GLIB_CFLAGS) \ + $(AM_CPPFLAGS) \ -DTESTDIR="\"$(abs_srcdir)\"" test_dhcp_dhclient_LDADD = \ diff --git a/src/dhcp-manager/tests/Makefile.in b/src/dhcp-manager/tests/Makefile.in index bb28cb9e..afcee2c0 100644 --- a/src/dhcp-manager/tests/Makefile.in +++ b/src/dhcp-manager/tests/Makefile.in @@ -206,6 +206,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@ @@ -228,6 +229,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@ @@ -412,12 +414,13 @@ with_dhclient = @with_dhclient@ with_dhcpcd = @with_dhcpcd@ with_netconfig = @with_netconfig@ with_resolvconf = @with_resolvconf@ -@ENABLE_TESTS_TRUE@INCLUDES = \ +@ENABLE_TESTS_TRUE@AM_CPPFLAGS = \ @ENABLE_TESTS_TRUE@ -I$(top_srcdir)/include \ @ENABLE_TESTS_TRUE@ -I$(top_builddir)/include \ @ENABLE_TESTS_TRUE@ -I${top_srcdir}/libnm-util \ @ENABLE_TESTS_TRUE@ -I${top_builddir}/libnm-util \ -@ENABLE_TESTS_TRUE@ -I$(top_srcdir)/src/dhcp-manager +@ENABLE_TESTS_TRUE@ -I$(top_srcdir)/src/dhcp-manager \ +@ENABLE_TESTS_TRUE@ $(GLIB_CFLAGS) ####### policy /etc/hosts test ####### @@ -425,7 +428,7 @@ with_resolvconf = @with_resolvconf@ @ENABLE_TESTS_TRUE@ test-dhcp-dhclient.c @ENABLE_TESTS_TRUE@test_dhcp_dhclient_CPPFLAGS = \ -@ENABLE_TESTS_TRUE@ $(GLIB_CFLAGS) \ +@ENABLE_TESTS_TRUE@ $(AM_CPPFLAGS) \ @ENABLE_TESTS_TRUE@ -DTESTDIR="\"$(abs_srcdir)\"" @ENABLE_TESTS_TRUE@test_dhcp_dhclient_LDADD = \ |