summary refs log tree commit diff
path: root/test/Makefile.am
diff options
context:
space:
mode:
authorMichael Biebl <biebl@debian.org>2014-07-06 02:16:10 +0200
committerMichael Biebl <biebl@debian.org>2014-07-06 02:16:10 +0200
commit33491bc4279481db8ae47213e34a6d695a0e8830 (patch)
tree097d2b0fdff3fae6885381ae5e57a182cd8cbbba /test/Makefile.am
parent59c3714a494c3b3765657c0551ad82842d98a7d2 (diff)
Imported Upstream version 0.9.10.0 upstream/0.9.10.0
Diffstat (limited to 'test/Makefile.am')
-rw-r--r--test/Makefile.am17
1 files changed, 8 insertions, 9 deletions
diff --git a/test/Makefile.am b/test/Makefile.am
index 4b7ca439..830019ba 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -3,27 +3,26 @@ AM_CPPFLAGS = \
 	-I${top_srcdir}/libnm-util \
 	-I${top_builddir}/libnm-util \
 	-I${top_srcdir}/libnm-glib \
-	-I${top_srcdir}/include  \
+	-I${top_srcdir}/include \
 	-I${top_builddir}/include \
 	$(DBUS_CFLAGS) \
 	$(GLIB_CFLAGS) \
+	-DNM_VERSION_MAX_ALLOWED=NM_VERSION_NEXT_STABLE \
 	-DBINDIR=\"$(bindir)\" \
 	-DDATADIR=\"$(datadir)\" \
 	-DNMLOCALEDIR=\"$(datadir)/locale\"
 
-bin_PROGRAMS = nm-tool nm-online
+bin_PROGRAMS = nm-online
 
 noinst_PROGRAMS = libnm-glib-test
 
-nm_tool_SOURCES = nm-tool.c
-nm_tool_LDADD = \
-	$(top_builddir)/libnm-glib/libnm-glib.la \
-	$(top_builddir)/libnm-util/libnm-util.la \
-	$(DBUS_LIBS) \
-	$(GLIB_LIBS)
-
 nm_online_SOURCES = nm-online.c
+nm_online_CPPFLAGS = \
+	-DG_LOG_DOMAIN=\""nm-online"\" \
+	$(AM_CPPFLAGS)
+
 nm_online_LDADD = \
+	$(top_builddir)/libnm-glib/libnm-glib.la \
 	$(top_builddir)/libnm-util/libnm-util.la \
 	$(DBUS_LIBS) \
 	$(GLIB_LIBS)