summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Haller <thaller@redhat.com>2016-10-12 10:43:41 +0200
committerThomas Haller <thaller@redhat.com>2016-10-12 10:43:45 +0200
commit3d2e3873c24e3c70cd28a22f2a82c7c4e81414f6 (patch)
tree0fa791846f29e0a8c8c0f7f5fd4c78e7287fbf4c
parent51835c75062be0c51c1bc717bfd9ae04c0738a3b (diff)
downloadNetworkManager-3d2e3873c24e3c70cd28a22f2a82c7c4e81414f6.tar.gz
build: always include subdir wifi/tests regardless of ENABLE_TESTS
Like done for all other device plugins.
-rw-r--r--src/devices/wifi/Makefile.am2
-rw-r--r--src/devices/wifi/tests/Makefile.am3
2 files changed, 3 insertions, 2 deletions
diff --git a/src/devices/wifi/Makefile.am b/src/devices/wifi/Makefile.am
index 3042b19794..72863bc4a6 100644
--- a/src/devices/wifi/Makefile.am
+++ b/src/devices/wifi/Makefile.am
@@ -4,9 +4,7 @@ include $(top_srcdir)/nm.mk
@GNOME_CODE_COVERAGE_RULES@
-if ENABLE_TESTS
SUBDIRS=. tests
-endif
AM_CPPFLAGS = \
-I${top_srcdir}/src \
diff --git a/src/devices/wifi/tests/Makefile.am b/src/devices/wifi/tests/Makefile.am
index 4ad66261b2..1f0171d0db 100644
--- a/src/devices/wifi/tests/Makefile.am
+++ b/src/devices/wifi/tests/Makefile.am
@@ -1,3 +1,5 @@
+if ENABLE_TESTS
+
AM_CPPFLAGS = \
-I$(top_builddir)/introspection \
-I$(top_srcdir)/shared \
@@ -26,3 +28,4 @@ test_general_LDADD = $(top_builddir)/src/libNetworkManager.la
@VALGRIND_RULES@
TESTS = test-general
+endif