[folks] Split the documentation into folks and folks-telepathy packages
- From: Travis Reitter <treitter src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [folks] Split the documentation into folks and folks-telepathy packages
- Date: Tue, 21 Sep 2010 00:00:00 +0000 (UTC)
commit 531a4e3e6f0064214a854625e790107ad7e57236
Author: Philip Withnall <philip withnall collabora co uk>
Date: Mon Sep 13 16:12:00 2010 +0100
Split the documentation into folks and folks-telepathy packages
This means that each documentation package is only scanning files from one
directory, opening us up to the possibility of adding gtk-doc support.
Helps: bgo#629526
docs/Makefile.am | 75 ++++++++++++++++++++++++++++++++++++------------------
1 files changed, 50 insertions(+), 25 deletions(-)
---
diff --git a/docs/Makefile.am b/docs/Makefile.am
index 03782cf..83b47e2 100644
--- a/docs/Makefile.am
+++ b/docs/Makefile.am
@@ -1,51 +1,76 @@
-docdir=$(datadir)/devhelp/references/folks- FOLKS_MAJOR_MINOR_VERSION@
-innerdocdir=$(datadir)/devhelp/references/folks- FOLKS_MAJOR_MINOR_VERSION@/folks- FOLKS_MAJOR_MINOR_VERSION@
-imgdir=$(datadir)/devhelp/references/folks- FOLKS_MAJOR_MINOR_VERSION@/folks- FOLKS_MAJOR_MINOR_VERSION@/img
+folksdocdir=$(datadir)/devhelp/references/folks- FOLKS_MAJOR_MINOR_VERSION@
+folksinnerdocdir=$(datadir)/devhelp/references/folks- FOLKS_MAJOR_MINOR_VERSION@/folks- FOLKS_MAJOR_MINOR_VERSION@
+folksimgdir=$(datadir)/devhelp/references/folks- FOLKS_MAJOR_MINOR_VERSION@/folks- FOLKS_MAJOR_MINOR_VERSION@/img
+folkstpdocdir=$(datadir)/devhelp/references/folks-telepathy- FOLKS_MAJOR_MINOR_VERSION@
+folkstpinnerdocdir=$(datadir)/devhelp/references/folks-telepathy- FOLKS_MAJOR_MINOR_VERSION@/folks-telepathy- FOLKS_MAJOR_MINOR_VERSION@
+folkstpimgdir=$(datadir)/devhelp/references/folks-telepathy- FOLKS_MAJOR_MINOR_VERSION@/folks-telepathy- FOLKS_MAJOR_MINOR_VERSION@/img
-doc_data = \
+folksdoc_data = \
folks- FOLKS_MAJOR_MINOR_VERSION@/*.css \
folks- FOLKS_MAJOR_MINOR_VERSION@/*.png \
$(NULL)
+folkstpdoc_data = \
+ folks-telepathy- FOLKS_MAJOR_MINOR_VERSION@/*.css \
+ folks-telepathy- FOLKS_MAJOR_MINOR_VERSION@/*.png \
+ $(NULL)
-doc_DATA = \
+folksdoc_DATA = \
folks- FOLKS_MAJOR_MINOR_VERSION@/index.html \
- $(doc_data) \
+ $(folksdoc_data) \
+ $(NULL)
+folkstpdoc_DATA = \
+ folks-telepathy- FOLKS_MAJOR_MINOR_VERSION@/index.html \
+ $(folkstpdoc_data) \
$(NULL)
-innerdoc_DATA = \
+folksinnerdoc_DATA = \
folks- FOLKS_MAJOR_MINOR_VERSION@/folks- FOLKS_MAJOR_MINOR_VERSION@/index.htm \
folks- FOLKS_MAJOR_MINOR_VERSION@/folks- FOLKS_MAJOR_MINOR_VERSION@/*.html \
$(NULL)
+folkstpinnerdoc_DATA = \
+ folks-telepathy- FOLKS_MAJOR_MINOR_VERSION@/folks-telepathy- FOLKS_MAJOR_MINOR_VERSION@/index.htm \
+ folks-telepathy- FOLKS_MAJOR_MINOR_VERSION@/folks-telepathy- FOLKS_MAJOR_MINOR_VERSION@/*.html \
+ $(NULL)
-img_DATA = \
+folksimg_DATA = \
folks- FOLKS_MAJOR_MINOR_VERSION@/folks- FOLKS_MAJOR_MINOR_VERSION@/img/*.png \
$(NULL)
+folkstpimg_DATA = \
+ folks-telepathy- FOLKS_MAJOR_MINOR_VERSION@/folks-telepathy- FOLKS_MAJOR_MINOR_VERSION@/img/*.png \
+ $(NULL)
-$(doc_data) $(innerdoc_DATA) $(img_DATA): folks- FOLKS_MAJOR_MINOR_VERSION@/index.html
+$(folksdoc_data) $(folksinnerdoc_DATA) $(folksimg_DATA): folks- FOLKS_MAJOR_MINOR_VERSION@/index.html
+$(folkstpdoc_data) $(folkstpinnerdoc_DATA) $(folkstpimg_DATA): folks-telepathy- FOLKS_MAJOR_MINOR_VERSION@/index.html
-VALAFLAGS = \
- --vapidir=$(top_srcdir)/folks \
- --vapidir=$(top_srcdir)/backends/telepathy \
- --vapidir=$(top_srcdir)/backends/telepathy/lib
+# folks documentation
+folks_doc_files = $(top_srcdir)/folks/*.vala
-# 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)))
+folks- FOLKS_MAJOR_MINOR_VERSION@/index.html: $(folks_doc_files)
+ $(AM_V_GEN)$(VALADOC) -o folks- FOLKS_MAJOR_MINOR_VERSION@/ --force -b $(top_srcdir)/folks \
+ --pkg=gee-1.0 --pkg=gio-2.0 --pkg=gmodule-2.0 --pkg=build-conf \
+ --vapidir=$(top_srcdir)/folks $(folks_doc_files)
+
+# folks-telepathy documentation
+folks_telepathy_doc_files = $(top_srcdir)/backends/telepathy/lib/*.vala
-folks- FOLKS_MAJOR_MINOR_VERSION@/index.html: $(doc_files)
- $(AM_V_GEN)$(VALADOC) -o folks- FOLKS_MAJOR_MINOR_VERSION@/ --force -b $(top_srcdir) \
+folks-telepathy- FOLKS_MAJOR_MINOR_VERSION@/index.html: $(folks_telepathy_doc_files)
+ $(AM_V_GEN)$(VALADOC) -o folks-telepathy- FOLKS_MAJOR_MINOR_VERSION@/ \
+ --force -b $(top_srcdir)/backends/telepathy/lib \
--pkg=gee-1.0 --pkg=gio-2.0 --pkg=gmodule-2.0 --pkg=build-conf \
--pkg=dbus-glib-1 --pkg=telepathy-glib --pkg=tp-lowlevel \
- $(VALAFLAGS) $(doc_files)
+ --pkg=folks \
+ --vapidir=$(top_srcdir)/folks \
+ --vapidir=$(top_srcdir)/backends/telepathy/lib \
+ $(folks_telepathy_doc_files)
distclean-local: distclean-docs
distclean-docs:
- rm -rf folks- FOLKS_MAJOR_MINOR_VERSION@
+ rm -rf folks- FOLKS_MAJOR_MINOR_VERSION@ && \
+ rm -rf folks-telepathy- FOLKS_MAJOR_MINOR_VERSION@
-GITIGNOREFILES = folks- FOLKS_MAJOR_MINOR_VERSION@/
+GITIGNOREFILES = \
+ folks- FOLKS_MAJOR_MINOR_VERSION@/ \
+ folks-telepathy- FOLKS_MAJOR_MINOR_VERSION@/ \
+ $(NULL)
-include $(top_srcdir)/git.mk
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]