summaryrefslogtreecommitdiff
path: root/src/tests
diff options
context:
space:
mode:
authorDan Winship <danw@redhat.com>2015-04-16 12:34:55 -0400
committerDan Winship <danw@redhat.com>2015-08-10 09:41:26 -0400
commit1cf35cb26b6cc04f8b2c51c3cde4bc08ef311062 (patch)
tree4d237cb0792d871ba87bee87d71832d126162538 /src/tests
parent34ba4e14b8674dc74327975159e101710ebd5403 (diff)
downloadNetworkManager-1cf35cb26b6cc04f8b2c51c3cde4bc08ef311062.tar.gz
core: final gdbus porting
Port remaining bits to gdbus and remove stray dbus-glib references Drop the dbus-glib version check from configure, since nothing depends on new dbus-glib any more. Move nm-dbus-glib-types.h and nm-gvaluearray-compat.h from include/ to libnm-util/ since they are now only used by libnm-util and libnm-glib.
Diffstat (limited to 'src/tests')
-rw-r--r--src/tests/Makefile.am3
-rw-r--r--src/tests/config/Makefile.am1
2 files changed, 1 insertions, 3 deletions
diff --git a/src/tests/Makefile.am b/src/tests/Makefile.am
index c008385f1c..8e06a54799 100644
--- a/src/tests/Makefile.am
+++ b/src/tests/Makefile.am
@@ -12,8 +12,7 @@ AM_CPPFLAGS = \
-DG_LOG_DOMAIN=\""NetworkManager"\" \
-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_INSIDE_DAEMON \
-DNM_VERSION_MAX_ALLOWED=NM_VERSION_NEXT_STABLE \
- $(GLIB_CFLAGS) \
- $(DBUS_CFLAGS)
+ $(GLIB_CFLAGS)
noinst_PROGRAMS = \
test-general \
diff --git a/src/tests/config/Makefile.am b/src/tests/config/Makefile.am
index a8e2905c80..e0e3e13218 100644
--- a/src/tests/config/Makefile.am
+++ b/src/tests/config/Makefile.am
@@ -9,7 +9,6 @@ AM_CPPFLAGS = \
-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_INSIDE_DAEMON \
-DNM_VERSION_MAX_ALLOWED=NM_VERSION_NEXT_STABLE \
$(GLIB_CFLAGS) \
- $(DBUS_CFLAGS) \
-DSRCDIR=\""$(srcdir)"\" \
-DBUILDDIR=\""$(builddir)"\"