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 /libnm-glib/tests | |
| parent | 7df62b86e35a67049a4bc7810c29994d8a7ef175 (diff) | |
| parent | 59c3714a494c3b3765657c0551ad82842d98a7d2 (diff) | |
Merge tag 'upstream/0.9.8.10'
Upstream version 0.9.8.10
Diffstat (limited to 'libnm-glib/tests')
| -rw-r--r-- | libnm-glib/tests/Makefile.am | 5 | ||||
| -rw-r--r-- | libnm-glib/tests/Makefile.in | 7 |
2 files changed, 8 insertions, 4 deletions
diff --git a/libnm-glib/tests/Makefile.am b/libnm-glib/tests/Makefile.am index 5fda5bd2..07994481 100644 --- a/libnm-glib/tests/Makefile.am +++ b/libnm-glib/tests/Makefile.am @@ -1,6 +1,6 @@ if ENABLE_TESTS -INCLUDES = \ +AM_CPPFLAGS = \ -I$(top_srcdir)/include \ -I$(top_builddir)/include \ -I$(top_srcdir)/libnm-util \ @@ -16,7 +16,8 @@ test_remote_settings_client_SOURCES = \ test_remote_settings_client_CPPFLAGS = \ $(GLIB_CFLAGS) \ - $(DBUS_CFLAGS) + $(DBUS_CFLAGS) \ + $(AM_CPPFLAGS) test_remote_settings_client_LDADD = \ $(top_builddir)/libnm-util/libnm-util.la \ diff --git a/libnm-glib/tests/Makefile.in b/libnm-glib/tests/Makefile.in index ef9fb9b9..e9ea17b1 100644 --- a/libnm-glib/tests/Makefile.in +++ b/libnm-glib/tests/Makefile.in @@ -210,6 +210,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@ @@ -232,6 +233,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@ @@ -416,7 +418,7 @@ 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 \ @@ -430,7 +432,8 @@ with_resolvconf = @with_resolvconf@ @ENABLE_TESTS_TRUE@test_remote_settings_client_CPPFLAGS = \ @ENABLE_TESTS_TRUE@ $(GLIB_CFLAGS) \ -@ENABLE_TESTS_TRUE@ $(DBUS_CFLAGS) +@ENABLE_TESTS_TRUE@ $(DBUS_CFLAGS) \ +@ENABLE_TESTS_TRUE@ $(AM_CPPFLAGS) @ENABLE_TESTS_TRUE@test_remote_settings_client_LDADD = \ @ENABLE_TESTS_TRUE@ $(top_builddir)/libnm-util/libnm-util.la \ |