summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon McVittie <smcv@debian.org>2018-01-29 09:22:45 +0000
committerSimon McVittie <smcv@debian.org>2018-01-29 09:22:45 +0000
commitc9f1a9671e5c67da3a7d730407241b995c6606f9 (patch)
tree74974c1293d86b9b55de8ba25f28b133d8fc5d89
parent512cb36200c7d6006fe947336801e9fdc22df4b4 (diff)
downloaddbus-glib-c9f1a9671e5c67da3a7d730407241b995c6606f9.tar.gz
Use GLIB instead of DBUS_GLIB as prefix for GLib dependency
Signed-off-by: Simon McVittie <smcv@debian.org>
-rw-r--r--Makefile.am16
1 files changed, 8 insertions, 8 deletions
diff --git a/Makefile.am b/Makefile.am
index 3654076..cc46f6e 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -9,7 +9,7 @@ AM_CPPFLAGS = \
-I$(top_srcdir) \
-I$(top_builddir) \
$(DBUS_CFLAGS) \
- $(DBUS_GLIB_CFLAGS) \
+ $(GLIB_CFLAGS) \
$(NULL)
noinst_LTLIBRARIES = \
@@ -22,7 +22,7 @@ libdbus_gmain_la_SOURCES = \
dbus-gmain.h \
$(NULL)
-libdbus_gmain_la_LIBADD = $(DBUS_LIBS) $(DBUS_GLIB_LIBS)
+libdbus_gmain_la_LIBADD = $(DBUS_LIBS) $(GLIB_LIBS)
libdbus_gmain_la_LDFLAGS = -no-undefined
tests_libtest_la_SOURCES = \
@@ -30,7 +30,7 @@ tests_libtest_la_SOURCES = \
tests/util.h \
$(NULL)
-tests_libtest_la_LIBADD = $(DBUS_LIBS) $(DBUS_GLIB_LIBS)
+tests_libtest_la_LIBADD = $(DBUS_LIBS) $(GLIB_LIBS)
tests_libtest_la_LDFLAGS = -no-undefined
TESTS = \
@@ -50,8 +50,8 @@ tests_test_thread_server_SOURCES = \
tests_test_thread_server_LDADD = \
libdbus-gmain.la \
tests/libtest.la \
- $(DBUS_GLIB_THREADS_LIBS) \
- $(DBUS_GLIB_LIBS) \
+ $(GLIB_THREADS_LIBS) \
+ $(GLIB_LIBS) \
$(DBUS_LIBS) \
$(NULL)
@@ -62,8 +62,8 @@ tests_test_thread_client_SOURCES = \
tests_test_thread_client_LDADD = \
libdbus-gmain.la \
tests/libtest.la \
- $(DBUS_GLIB_THREADS_LIBS) \
- $(DBUS_GLIB_LIBS) \
+ $(GLIB_THREADS_LIBS) \
+ $(GLIB_LIBS) \
$(DBUS_LIBS) \
$(NULL)
@@ -73,7 +73,7 @@ tests_test_30574_SOURCES = \
tests_test_30574_LDADD = \
libdbus-gmain.la \
tests/libtest.la \
- $(DBUS_GLIB_LIBS) \
+ $(GLIB_LIBS) \
$(DBUS_LIBS) \
$(NULL)