← Back to branch summary

~ubuntu-branches/ubuntu/maverick/telepathy-glib/maverick

« back to all changes in this revision

Viewing changes to tests/Makefile.am

  • Committer: Bazaar Package Importer
  • Author(s): Simon McVittie
  • Date: 2010-06-14 17:42:08 UTC
  • mfrom: (1.6.3 upstream)
  • Revision ID: james.westby@ubuntu.com-20100614174208-7b6teypo8jnx5uux
Tags: 0.11.7-1
* New upstream version
  - requires gobject-introspection 0.6.13
  - new ABI, API

Show diffs side-by-side

added added

removed removed

Lines of Context:
tests/Makefile.am
25
25
    abs_top_srcdir=@abs_top_srcdir@ \
26
26
    G_SLICE=debug-blocks \
27
27
    G_DEBUG=fatal_warnings,fatal_criticals$(maybe_gc_friendly) \
28
 
    PYTHONPATH=@abs_top_srcdir@/tools
 
28
    PYTHONPATH=@abs_top_srcdir@/tools \
 
29
    $(EXTRA_TESTS_ENVIRONMENT)
 
30
 
 
31
EXTRA_TESTS_ENVIRONMENT =
29
32
 
30
33
include $(top_srcdir)/tools/valgrind.mk
31
34
 
109
112
    $(GLIB_CFLAGS) \
110
113
    -D_TP_IGNORE_DEPRECATIONS \
111
114
    $(TP_GLIB_CFLAGS)
 
115
 
 
116
AM_CXXFLAGS = \
 
117
    $(DBUS_CFLAGS) \
 
118
    $(GLIB_CFLAGS) \
 
119
    -D_TP_IGNORE_DEPRECATIONS \
 
120
    $(TP_GLIB_CFLAGS)
 
121
 
 
122
if HAVE_CXX
 
123
noinst_PROGRAMS += \
 
124
    test-util-cxx
 
125
 
 
126
test_util_cxx_SOURCES = util-cxx.cpp
 
127
endif