aboutsummaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorMarco Barisione <marco.barisione@collabora.co.uk>2013-05-20 21:08:16 +0800
committerMarco Barisione <marco.barisione@collabora.co.uk>2013-08-20 19:11:11 +0800
commit3d1021753d01d973c929c8758b11a147498377cc (patch)
tree348262f2e5c1f6e981213f8c6dcc156c8fbc3694 /tests
parent53a77d63614b6de76f0113b6d79a2c5ef9509e10 (diff)
downloadgsoc2013-empathy-3d1021753d01d973c929c8758b11a147498377cc.tar
gsoc2013-empathy-3d1021753d01d973c929c8758b11a147498377cc.tar.gz
gsoc2013-empathy-3d1021753d01d973c929c8758b11a147498377cc.tar.bz2
gsoc2013-empathy-3d1021753d01d973c929c8758b11a147498377cc.tar.lz
gsoc2013-empathy-3d1021753d01d973c929c8758b11a147498377cc.tar.xz
gsoc2013-empathy-3d1021753d01d973c929c8758b11a147498377cc.tar.zst
gsoc2013-empathy-3d1021753d01d973c929c8758b11a147498377cc.zip
Use the telepathy-account-widgets submodule instead of the internal copy
https://bugzilla.gnome.org/show_bug.cgi?id=699492
Diffstat (limited to 'tests')
-rw-r--r--tests/Makefile.am4
-rw-r--r--tests/interactive/Makefile.am4
2 files changed, 4 insertions, 4 deletions
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 679aa55e2..eba5c022f 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -10,21 +10,21 @@ EXTRA_DIST = \
AM_CPPFLAGS = \
$(ERROR_CFLAGS) \
- -I$(top_srcdir)/tp-account-widgets \
-I$(top_srcdir)/libempathy \
-I$(top_srcdir)/libempathy-gtk \
-DPKGDATADIR=\""$(pkgdatadir)"\" \
-DGCR_API_SUBJECT_TO_CHANGE \
$(EMPATHY_CFLAGS) \
+ $(TPAW_CFLAGS) \
$(WARN_CFLAGS) \
$(DISABLE_DEPRECATED) \
-DSRCDIR=\""$(abs_srcdir)"\" \
$(NULL)
LDADD = \
- $(top_builddir)/tp-account-widgets/libtp-account-widgets.la \
$(top_builddir)/libempathy-gtk/libempathy-gtk.la \
$(top_builddir)/libempathy/libempathy.la \
+ $(TPAW_LIBS) \
$(EMPATHY_LIBS) \
$(NULL)
diff --git a/tests/interactive/Makefile.am b/tests/interactive/Makefile.am
index 86d8fe1c3..e1236f4ba 100644
--- a/tests/interactive/Makefile.am
+++ b/tests/interactive/Makefile.am
@@ -1,17 +1,17 @@
AM_CPPFLAGS = \
$(ERROR_CFLAGS) \
- -I$(top_srcdir)/tp-account-widgets \
-I$(top_srcdir)/libempathy \
-I$(top_srcdir)/libempathy-gtk \
-DPKGDATADIR=\""$(pkgdatadir)"\" \
$(EMPATHY_CFLAGS) \
+ $(TPAW_CFLAGS) \
$(WARN_CFLAGS) \
$(DISABLE_DEPRECATED)
LDADD = \
- $(top_builddir)/tp-account-widgets/libtp-account-widgets.la \
$(top_builddir)/libempathy-gtk/libempathy-gtk.la \
$(top_builddir)/libempathy/libempathy.la \
+ $(TPAW_LIBS) \
$(EMPATHY_LIBS)
noinst_PROGRAMS = \