summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorSimon McVittie <smcv@debian.org>2018-01-29 09:26:54 +0000
committerSimon McVittie <smcv@debian.org>2018-01-29 09:26:54 +0000
commit7945a3738f425508342b1ec06f9ffb2e433f7733 (patch)
treeae34c9c2bc5c68be19959c7372a9d9428a5fcf80 /test
parent636e8d917e11ff426d8a43c74b94876528c65718 (diff)
downloaddbus-glib-7945a3738f425508342b1ec06f9ffb2e433f7733.tar.gz
Check for GLib under the name GLIB, not DBUS_GLIB
Signed-off-by: Simon McVittie <smcv@debian.org>
Diffstat (limited to 'test')
-rw-r--r--test/Makefile.am4
-rw-r--r--test/core/Makefile.am6
-rw-r--r--test/interfaces/Makefile.am4
3 files changed, 7 insertions, 7 deletions
diff --git a/test/Makefile.am b/test/Makefile.am
index e538f2d..7393bed 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -6,12 +6,12 @@ AM_CPPFLAGS = \
-I$(top_builddir) \
-I$(top_builddir)/dbus \
$(DBUS_CFLAGS) \
- $(DBUS_GLIB_CFLAGS) \
+ $(GLIB_CFLAGS) \
$(NULL)
LDADD = \
$(top_builddir)/dbus/libdbus-glib-1.la \
- $(DBUS_GLIB_LIBS) \
+ $(GLIB_LIBS) \
$(DBUS_LIBS) \
$(NULL)
diff --git a/test/core/Makefile.am b/test/core/Makefile.am
index 314ff40..91c3772 100644
--- a/test/core/Makefile.am
+++ b/test/core/Makefile.am
@@ -4,12 +4,12 @@ AM_CPPFLAGS = \
-I$(top_builddir) \
-I$(top_builddir)/dbus \
$(DBUS_CFLAGS) \
- $(DBUS_GLIB_CFLAGS) \
+ $(GLIB_CFLAGS) \
-DDBUS_COMPILATION
LDADD = \
- $(DBUS_GLIB_THREADS_LIBS) \
- $(DBUS_GLIB_LIBS) \
+ $(GLIB_THREADS_LIBS) \
+ $(GLIB_LIBS) \
$(DBUS_LIBS) \
$(top_builddir)/dbus/libdbus-glib-1.la \
$(top_builddir)/dbus-gmain/tests/libtest.la \
diff --git a/test/interfaces/Makefile.am b/test/interfaces/Makefile.am
index fa5ae33..f3f62e4 100644
--- a/test/interfaces/Makefile.am
+++ b/test/interfaces/Makefile.am
@@ -3,10 +3,10 @@ AM_CPPFLAGS = \
-I$(top_builddir) \
-I$(top_builddir)/dbus \
$(DBUS_CFLAGS) \
- $(DBUS_GLIB_CFLAGS) \
+ $(GLIB_CFLAGS) \
-DDBUS_COMPILATION
-LDADD = $(DBUS_GLIB_LIBS) \
+LDADD = $(GLIB_LIBS) \
$(top_builddir)/dbus/libdbus-glib-1.la \
$(top_builddir)/dbus/libdbus-gtool.la \
$(top_builddir)/dbus-gmain/tests/libtest.la \