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/tests/Makefile.am | |
| parent | 7df62b86e35a67049a4bc7810c29994d8a7ef175 (diff) | |
| parent | 59c3714a494c3b3765657c0551ad82842d98a7d2 (diff) | |
Merge tag 'upstream/0.9.8.10'
Upstream version 0.9.8.10
Diffstat (limited to 'src/tests/Makefile.am')
| -rw-r--r-- | src/tests/Makefile.am | 16 |
1 files changed, 5 insertions, 11 deletions
diff --git a/src/tests/Makefile.am b/src/tests/Makefile.am index 8f406361..77e6c0f5 100644 --- a/src/tests/Makefile.am +++ b/src/tests/Makefile.am @@ -1,13 +1,15 @@ 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 \ - -I$(top_builddir)/src + -I$(top_builddir)/src \ + $(GLIB_CFLAGS) \ + $(DBUS_CFLAGS) noinst_PROGRAMS = \ test-dhcp-options \ @@ -20,8 +22,7 @@ test_dhcp_options_SOURCES = \ test-dhcp-options.c test_dhcp_options_CPPFLAGS = \ - $(GLIB_CFLAGS) \ - $(DBUS_CFLAGS) \ + $(AM_CPPFLAGS) \ -DDHCLIENT_PATH=\"$(DHCLIENT_PATH)\" \ -DDHCPCD_PATH=\"$(DHCPCD_PATH)\" @@ -37,9 +38,6 @@ test_dhcp_options_LDADD = \ test_policy_hosts_SOURCES = \ test-policy-hosts.c -test_policy_hosts_CPPFLAGS = \ - $(GLIB_CFLAGS) - test_policy_hosts_LDADD = \ -ldl \ $(top_builddir)/src/libtest-policy-hosts.la \ @@ -50,10 +48,6 @@ test_policy_hosts_LDADD = \ test_wifi_ap_utils_SOURCES = \ test-wifi-ap-utils.c -test_wifi_ap_utils_CPPFLAGS = \ - $(GLIB_CFLAGS) \ - $(DBUS_CFLAGS) - test_wifi_ap_utils_LDADD = \ $(top_builddir)/libnm-util/libnm-util.la \ $(top_builddir)/src/libtest-wifi-ap-utils.la \ |