about summary refs log tree commit diff
path: root/src/settings/tests/Makefile.am
diff options
context:
space:
mode:
authorMichael Biebl <biebl@debian.org>2014-07-06 03:04:17 +0200
committerMichael Biebl <biebl@debian.org>2014-07-06 03:04:17 +0200
commit3ce667b6ee6b86291bbe60ef93cba7f11a5c5400 (patch)
treeaf3daa7221e898b72f3de26eb2cf0c1b1c8661b0 /src/settings/tests/Makefile.am
parentf02d31d95af29678092d1ff01f714621bc9dcc0f (diff)
parent33491bc4279481db8ae47213e34a6d695a0e8830 (diff)
Merge tag 'upstream/0.9.10.0'
Upstream version 0.9.10.0
Diffstat (limited to 'src/settings/tests/Makefile.am')
-rw-r--r--src/settings/tests/Makefile.am13
1 files changed, 3 insertions, 10 deletions
diff --git a/src/settings/tests/Makefile.am b/src/settings/tests/Makefile.am
index 9471bcb7..4115d4ba 100644
--- a/src/settings/tests/Makefile.am
+++ b/src/settings/tests/Makefile.am
@@ -1,10 +1,9 @@
-if ENABLE_TESTS
-
 AM_CPPFLAGS = \
 	-I$(top_srcdir)/include \
 	-I$(top_builddir)/include \
 	-I$(top_srcdir)/libnm-util \
 	-I$(top_srcdir)/src/settings \
+	-DG_LOG_DOMAIN=\""NetworkManager"\" \
 	$(GLIB_CFLAGS) \
 	$(DBUS_CFLAGS)
 
@@ -17,14 +16,8 @@ test_wired_defname_SOURCES = \
 	test-wired-defname.c
 
 test_wired_defname_LDADD = \
-	$(top_builddir)/libnm-util/libnm-util.la \
-	$(top_builddir)/src/settings/libtest-settings-utils.la \
-	$(GLIB_LIBS) \
-	$(DBUS_LIBS)
+	$(top_builddir)/src/libNetworkManager.la
 
 ###########################################
 
-check-local: test-wired-defname
-	$(abs_builddir)/test-wired-defname
-
-endif
+TESTS = test-wired-defname