diff options
| -rw-r--r-- | configure.ac | 12 | ||||
| -rw-r--r-- | salut/plugins/Makefile.am | 2 | ||||
| -rw-r--r-- | salut/src/Makefile.am | 10 | ||||
| -rw-r--r-- | salut/tests/Makefile.am | 4 |
4 files changed, 14 insertions, 14 deletions
diff --git a/configure.ac b/configure.ac index 2f71eb13..763ac201 100644 --- a/configure.ac +++ b/configure.ac @@ -182,19 +182,19 @@ PKG_CHECK_MODULES(LIBXML2, [libxml-2.0]) AC_SUBST(LIBXML2_CFLAGS) AC_SUBST(LIBXML2_LIBS) -TELEPATHY_GLIB_REQUIRED=0.99.7 +TP_GLIB_REQUIRED=0.99.7 AC_DEFINE([TP_SEAL_ENABLE], [], [Prevent to use sealed variables]) AC_DEFINE([TP_DISABLE_SINGLE_INCLUDE], [], [Disable single header include]) AC_DEFINE([TP_VERSION_MIN_REQUIRED], [TP_VERSION_1_0], [Ignore post 1.0 deprecations]) AC_DEFINE([TP_VERSION_MAX_ALLOWED], [TP_VERSION_1_0], [Prevent post 1.0 APIs]) -PKG_CHECK_MODULES([TELEPATHY_GLIB], +PKG_CHECK_MODULES([TP_GLIB], [ - telepathy-glib-1 >= $TELEPATHY_GLIB_REQUIRED - telepathy-glib-1-dbus >= $TELEPATHY_GLIB_REQUIRED + telepathy-glib-1 >= $TP_GLIB_REQUIRED + telepathy-glib-1-dbus >= $TP_GLIB_REQUIRED ]) -AC_SUBST(TELEPATHY_GLIB_CFLAGS) -AC_SUBST(TELEPATHY_GLIB_LIBS) +AC_SUBST(TP_GLIB_CFLAGS) +AC_SUBST(TP_GLIB_LIBS) dnl check the backend to use AS_IF([test "$platform" = "win32"], diff --git a/salut/plugins/Makefile.am b/salut/plugins/Makefile.am index 8a663d76..a49875f9 100644 --- a/salut/plugins/Makefile.am +++ b/salut/plugins/Makefile.am @@ -25,6 +25,6 @@ test_la_LDFLAGS = $(AM_LDFLAGS) -rpath $(pluginexecdir) AM_CFLAGS = $(ERROR_CFLAGS) \ -I $(top_srcdir) -I $(top_builddir) \ - @GLIB_CFLAGS@ @TELEPATHY_GLIB_CFLAGS@ @WOCKY_CFLAGS@ \ + @GLIB_CFLAGS@ @TP_GLIB_CFLAGS@ @WOCKY_CFLAGS@ \ -I $(top_srcdir)/salut -I $(top_builddir)/salut \ -I $(top_srcdir)/salut/plugins diff --git a/salut/src/Makefile.am b/salut/src/Makefile.am index 6381ed39..46eea7ff 100644 --- a/salut/src/Makefile.am +++ b/salut/src/Makefile.am @@ -126,7 +126,7 @@ libsalut_plugins_la_android_ldflags = \ -avoid-version libsalut_plugins_la_LIBADD = \ - @TELEPATHY_GLIB_LIBS@ \ + @TP_GLIB_LIBS@ \ @GLIB_LIBS@ \ @WOCKY_LIBS@ @@ -161,7 +161,7 @@ write_mgr_file_SOURCES = write-mgr-file.c write_mgr_file_LDADD = libsalut-convenience.la \ $(top_builddir)/lib/gibber/libgibber.la \ $(top_builddir)/extensions/libsalut-extensions.la \ - @TELEPATHY_GLIB_LIBS@ + @TP_GLIB_LIBS@ telepathy_salut_1_SOURCES = \ salut.c @@ -180,7 +180,7 @@ check_c_sources = \ include $(top_srcdir)/tools/check-coding-style.mk check-local: check-coding-style -# TELEPATHY_GLIB_LIBS is only here so compiling against a static lib succeeds +# TP_GLIB_LIBS is only here so compiling against a static lib succeeds telepathy_salut_android_libs = libsalut-convenience.la \ -lgibber-salut \ $(top_builddir)/extensions/libsalut-extensions.la @@ -205,7 +205,7 @@ AM_CFLAGS = \ @GMODULE_CFLAGS@ \ @WOCKY_CFLAGS@ \ @DBUS_CFLAGS@ \ - @TELEPATHY_GLIB_CFLAGS@ \ + @TP_GLIB_CFLAGS@ \ @UUID_CFLAGS@ \ @LIBSOUP_CFLAGS@ \ $(NULL) @@ -217,7 +217,7 @@ AM_LDFLAGS = \ @GMODULE_LIBS@ \ @WOCKY_LIBS@ \ @DBUS_LIBS@ \ - @TELEPATHY_GLIB_LIBS@ \ + @TP_GLIB_LIBS@ \ @UUID_LIBS@ \ @LIBSOUP_LIBS@ \ $(NULL) diff --git a/salut/tests/Makefile.am b/salut/tests/Makefile.am index b6a06566..70fdc9a5 100644 --- a/salut/tests/Makefile.am +++ b/salut/tests/Makefile.am @@ -34,13 +34,13 @@ $(top_builddir)/lib/gibber/libgibber.la: check_PROGRAMS = check-node-properties AM_CFLAGS = $(ERROR_CFLAGS) @GLIB_CFLAGS@ @LIBXML2_CFLAGS@ @WOCKY_CFLAGS@ \ - @DBUS_CFLAGS@ @TELEPATHY_GLIB_CFLAGS@ \ + @DBUS_CFLAGS@ @TP_GLIB_CFLAGS@ \ -I $(top_srcdir) -I $(top_builddir) \ -I $(top_srcdir)/lib -I $(top_builddir)/lib \ -I $(top_srcdir)/salut/src -I $(top_builddir)/salut/src AM_LDFLAGS = \ - @GLIB_LIBS@ @TELEPATHY_GLIB_LIBS@ @LIBSOUP_LIBS@ @WOCKY_LIBS@ @UUID_LIBS@ + @GLIB_LIBS@ @TP_GLIB_LIBS@ @LIBSOUP_LIBS@ @WOCKY_LIBS@ @UUID_LIBS@ check_node_properties_LDADD = \ $(top_builddir)/salut/src/libsalut-convenience.la \ |