diff options
| author | Philip Withnall <philip.withnall@collabora.co.uk> | 2010-08-26 12:37:15 +0100 |
|---|---|---|
| committer | Philip Withnall <philip.withnall@collabora.co.uk> | 2010-08-26 22:21:49 +0100 |
| commit | e221dec87f9092b526a1d87b285b127c5a2c4ca2 (patch) | |
| tree | 0741c597ecf98af9d290ffb4dc9c00cc12a25481 /docs | |
| parent | 870ffaab3cb41d34e7694b1eba27992c44df89f3 (diff) | |
Move the folks-telepathy library to a "lib" subdir of backends/telepathy
This solves the ordering problem between building folks-telepathy.la and
folks-backend-telepathy.la, where the latter depends on the former, under
parallel installation. See
http://old.nabble.com/relinking-error-td27796838.html for an explanation of
why adding DEPENDENCIES doesn't work.
This fixes parallel installation of libfolks. Closes: bgo#627898
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/Makefile.am | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/docs/Makefile.am b/docs/Makefile.am index 3366215..693b44c 100644 --- a/docs/Makefile.am +++ b/docs/Makefile.am @@ -23,13 +23,17 @@ img_DATA = \ $(doc_data) $(innerdoc_DATA) $(img_DATA): folks-0.1/index.html -VALAFLAGS = --vapidir=$(top_srcdir)/folks --vapidir=$(top_srcdir)/backends/telepathy +VALAFLAGS = \ + --vapidir=$(top_srcdir)/folks \ + --vapidir=$(top_srcdir)/backends/telepathy \ + --vapidir=$(top_srcdir)/backends/telepathy/lib VALAFLAGS += $(TP_VALA_VALAFLAGS) # The Vala files which will have documentation extracted from them _doc_files = \ $(top_srcdir)/folks/*.vala \ $(top_srcdir)/backends/telepathy/*.vala \ + $(top_srcdir)/backends/telepathy/lib/*.vala \ $(top_srcdir)/backends/key-file/*.vala doc_files = $(filter-out %-backend-factory.vala,$(wildcard $(_doc_files))) |