aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2010-03-10 15:59:08 +0800
committerGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2010-03-15 16:28:42 +0800
commit2b8caddf10e90935b10748ea8c48e462bfc686ab (patch)
tree87763b3cf75ae81fd643e23afe508c43d33438c2
parent639c68cc074ea525cb769213939383c9ee57fb57 (diff)
downloadgsoc2013-empathy-2b8caddf10e90935b10748ea8c48e462bfc686ab.tar
gsoc2013-empathy-2b8caddf10e90935b10748ea8c48e462bfc686ab.tar.gz
gsoc2013-empathy-2b8caddf10e90935b10748ea8c48e462bfc686ab.tar.bz2
gsoc2013-empathy-2b8caddf10e90935b10748ea8c48e462bfc686ab.tar.lz
gsoc2013-empathy-2b8caddf10e90935b10748ea8c48e462bfc686ab.tar.xz
gsoc2013-empathy-2b8caddf10e90935b10748ea8c48e462bfc686ab.tar.zst
gsoc2013-empathy-2b8caddf10e90935b10748ea8c48e462bfc686ab.zip
stop exporting FAVOURITE_CONTACTS_CFLAGS and FAVOURITE_CONTACTS_LIBS
-rw-r--r--configure.ac2
-rw-r--r--libempathy-gtk/Makefile.am2
-rw-r--r--libempathy/Makefile.am2
3 files changed, 0 insertions, 6 deletions
diff --git a/configure.ac b/configure.ac
index 6aac784db..952ff13cd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -483,8 +483,6 @@ if test "x$enable_favourite_contacts" = "xyes" -a "x$have_favourite_contacts" !=
fi
AM_CONDITIONAL(HAVE_FAVOURITE_CONTACTS, test "x$have_telepathy_logger" = "xyes")
-AC_SUBST(FAVOURITE_CONTACTS_CFLAGS)
-AC_SUBST(FAVOURITE_CONTACTS_LIBS)
# -----------------------------------------------------------
# nautilus-sendto
diff --git a/libempathy-gtk/Makefile.am b/libempathy-gtk/Makefile.am
index 2df400103..6ec319e1c 100644
--- a/libempathy-gtk/Makefile.am
+++ b/libempathy-gtk/Makefile.am
@@ -11,7 +11,6 @@ AM_CPPFLAGS = \
$(LIBNOTIFY_CFLAGS) \
$(ENCHANT_CFLAGS) \
$(LIBCHAMPLAIN_CFLAGS) \
- $(FAVOURITE_CONTACTS_CFLAGS) \
$(GEOCLUE_CFLAGS) \
$(MEEGO_CFLAGS) \
$(WEBKIT_CFLAGS) \
@@ -136,7 +135,6 @@ libempathy_gtk_la_LIBADD = \
$(TPL_LIBS) \
$(ENCHANT_LIBS) \
$(LIBCHAMPLAIN_LIBS) \
- $(FAVOURITE_CONTACTS_LIBS) \
$(GEOCLUE_LIBS) \
$(MEEGO_LIBS) \
$(WEBKIT_LIBS) \
diff --git a/libempathy/Makefile.am b/libempathy/Makefile.am
index 057203bd3..1f1423952 100644
--- a/libempathy/Makefile.am
+++ b/libempathy/Makefile.am
@@ -10,7 +10,6 @@ AM_CPPFLAGS = \
-DG_LOG_DOMAIN=\"empathy\" \
$(TPL_CFLAGS) \
$(LIBEMPATHY_CFLAGS) \
- $(FAVOURITE_CONTACTS_CFLAGS) \
$(GEOCLUE_CFLAGS) \
$(NETWORK_MANAGER_CFLAGS) \
$(CONNMAN_CFLAGS) \
@@ -120,7 +119,6 @@ nodist_libempathy_la_SOURCES =\
libempathy_la_LIBADD = \
$(top_builddir)/extensions/libemp-extensions.la \
$(LIBEMPATHY_LIBS) \
- $(FAVOURITE_CONTACTS_LIBS) \
$(GEOCLUE_LIBS) \
$(TPL_LIBS) \
$(NETWORK_MANAGER_LIBS) \