diff options
| author | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2010-09-20 18:33:24 +0100 |
|---|---|---|
| committer | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2010-09-20 18:33:24 +0100 |
| commit | 59b295da005fa3e8ec0322125439ee14b5f4d2b6 (patch) | |
| tree | 95f55c8f719fe15b9a087bed2e5130176097e7da | |
| parent | e865a46cf7cf462d25307b311bd8b5a7dca08014 (diff) | |
Alter generation of version.xml to work when building out-of-tree
It's in the srcdir, because that's how gtk-doc works...
| -rw-r--r-- | .gitignore | 1 | ||||
| -rw-r--r-- | configure.ac | 1 | ||||
| -rw-r--r-- | docs/reference/Makefile.am | 11 | ||||
| -rw-r--r-- | docs/reference/version.xml.in | 1 |
4 files changed, 9 insertions, 5 deletions
diff --git a/.gitignore b/.gitignore index d7ebb8cae..ab09ceb1a 100644 --- a/.gitignore +++ b/.gitignore @@ -46,6 +46,7 @@ docs/reference/*.prerequisites docs/reference/*.signals docs/reference/*.stamp docs/reference/*.types +/docs/reference/version.xml docs/reference/html docs/reference/tmpl/*.sgml docs/reference/xml diff --git a/configure.ac b/configure.ac index 9c31585c0..c289c8f1a 100644 --- a/configure.ac +++ b/configure.ac @@ -298,7 +298,6 @@ AM_CONDITIONAL([HAVE_CXX], [test $tp_cxx_works = yes]) AC_OUTPUT( Makefile \ docs/Makefile \ docs/reference/Makefile \ - docs/reference/version.xml \ examples/Makefile \ examples/client/Makefile \ examples/cm/Makefile \ diff --git a/docs/reference/Makefile.am b/docs/reference/Makefile.am index 59d808ee9..ed1d106d5 100644 --- a/docs/reference/Makefile.am +++ b/docs/reference/Makefile.am @@ -82,9 +82,14 @@ HTML_IMAGES= # Extra SGML files that are included by $(DOC_MAIN_SGML_FILE). # e.g. content_files=running.sgml building.sgml changes-2.0.sgml -content_files= \ - tp-svc.xml \ - version.xml +content_files=tp-svc.xml + +html-build.stamp: $(srcdir)/version.xml +pdf-build.stamp: $(srcdir)/version.xml + +$(srcdir)/version.xml: Makefile + @-chmod u+w $(srcdir) $(srcdir)/version.xml + echo @PACKAGE_VERSION@ > $(srcdir)/version.xml # SGML files where gtk-doc abbrevations (#GtkWidget) are expanded # These files must be listed here *and* in content_files diff --git a/docs/reference/version.xml.in b/docs/reference/version.xml.in deleted file mode 100644 index a24f9877a..000000000 --- a/docs/reference/version.xml.in +++ /dev/null @@ -1 +0,0 @@ -@PACKAGE_VERSION@ |