diff options
| author | Travis Reitter <travis.reitter@collabora.co.uk> | 2010-07-14 16:32:52 -0700 |
|---|---|---|
| committer | Travis Reitter <travis.reitter@collabora.co.uk> | 2010-07-14 16:32:52 -0700 |
| commit | 48f4a582df72796a8e526b45446a8f56814dbd20 (patch) | |
| tree | 2cb0b97aa23244c98186e2f953ce371ef2d37574 /docs | |
| parent | 2afe7462f22547d670d6578466f6e8f334962e78 (diff) | |
| parent | a8bbc549554350701901dc0dfc9009b6517f994b (diff) | |
Merge remote branch 'pwith/build-cleanup'
Performed quite a modifications to this branch, as it wasn't rebased on top of
the latest build changes (which also made "make distclean" work for the first
time).
Conflicts:
backends/telepathy/Makefile.am
configure.ac
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/.gitignore | 1 | ||||
| -rw-r--r-- | docs/Makefile.am | 9 |
2 files changed, 6 insertions, 4 deletions
diff --git a/docs/.gitignore b/docs/.gitignore deleted file mode 100644 index 3345521..0000000 --- a/docs/.gitignore +++ /dev/null @@ -1 +0,0 @@ -folks-0.1 diff --git a/docs/Makefile.am b/docs/Makefile.am index 55ea4b3..e1b8011 100644 --- a/docs/Makefile.am +++ b/docs/Makefile.am @@ -24,18 +24,21 @@ img_DATA = \ $(doc_data) $(innerdoc_DATA) $(img_DATA): folks-0.1/index.html VALAFLAGS = --vapidir=$(top_srcdir)/folks --vapidir=$(top_srcdir)/backends/telepathy -VALAFLAGS += $(shell PKG_CONFIG_PATH=$(PKG_CONFIG_PATH) pkg-config --variable=valaflags telepathy-vala) +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 folks-0.1/index.html: $(doc_files) - $(VALADOC) -o folks-0.1/ --force -b $(top_srcdir) \ + $(AM_V_GEN)$(VALADOC) -o folks-0.1/ --force -b $(top_srcdir) \ --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) distclean-local: distclean-docs distclean-docs: - cd $(srcdir) && rm -rf folks-0.1 + rm -rf folks-0.1 +GITIGNOREFILES = folks-0.1/ + +-include $(top_srcdir)/git.mk |