[tracker: 14/14] Merge branch 'vala-makefiles'

[Martyn James Russell <mr src gnome org>]

commit 3b8b73ffb7210a62eb16e2380148679f4e2bf8b0
Merge: cdd4268 b532b1a
Author: Martyn Russell <martyn lanedo com>
Date:   Wed Nov 10 11:23:07 2010 +0000

    Merge branch 'vala-makefiles'

 configure.ac                                      |    4 +-
 src/libtracker-bus/Makefile.am                    |   68 ++++++-------
 src/libtracker-client/Makefile.am                 |   69 ++++++-------
 src/libtracker-data/Makefile.am                   |   76 ++++++--------
 src/libtracker-direct/Makefile.am                 |   60 +++++-------
 src/libtracker-miner/Makefile-shared-sources.decl |    9 ++-
 src/libtracker-miner/Makefile.am                  |   14 ++-
 src/libtracker-sparql/Makefile.am                 |   53 ++++------
 src/libtracker-sparql/tracker-uri.c               |    2 -
 src/miners/flickr/Makefile.am                     |   54 ++++-------
 src/tracker-explorer/Makefile.am                  |   30 ++----
 src/tracker-preferences/Makefile.am               |   43 +++------
 tests/functional-tests/ipc/Makefile.am            |  113 ++++-----------------
 tests/libtracker-miner/Makefile.am                |   76 +++++++++------
 14 files changed, 266 insertions(+), 405 deletions(-)
---