Commit Graph

22 Commits

Author SHA1 Message Date
Dan Williams
a9b9330bed build: fix builddir != srcdir when building D-Bus API spec HTML 2013-08-29 13:43:03 -05:00
Dan Williams
3a5bf0517c build: always generate docs at dist time (bgo #700093)
dist tarballs shouldn't ever be released without the documentation,
and this allows us to build the tarballs with pre-generated docs
that get installed on the end system, but don't need to be built
there.  So the end system doesn't need gtk-doc installed, only
the dist system does.

https://bugzilla.gnome.org/show_bug.cgi?id=700093
2013-05-14 10:53:46 -05:00
Jiří Klimeš
76b5e24ac9 build: fix build with --enable-doc (docs/api/Makefile.am)
"./autogen.sh --enable-doc && make" produced this error:
warning: failed to load external entity "../settings-spec.xml"
../network-manager-docs.xml:57: element include: XInclude error : could not load ../settings-spec.xml, and no fallback was found

Removing settings-spec.xml from $(content_files) made the file non-DISTed but it
also removed the file as a dependency for html-build.stamp that also runs
cd html && gtkdoc-mkhtml $$mkhtml_options $(MKHTML_OPTIONS) $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE)
and $(DOC_MAIN_SGML_FILE) includes settings-spec.xml.

Fix that by making $(DOC_MAIN_SGML_FILE) dependent on setting-spec.xml.
2013-02-12 17:25:20 +01:00
Dan Williams
a78d66bb38 build: fix distcheck when building settings specification XML
The generated settings-spec.xml should not be DIST-ed because it's
regenerated every time libnm-util changes.  That meants it gets
rebuilt during 'make' even from a dist tarball.  Thus, it shouldn't
be part of the dist tarball itself.

In addition, settings-spec.html shouldn't be included in
$(content_files) becuase this is added to EXTRA_DIST by gtk-doc.make.

Since generate-settings-spec.c the move from docs/api/ to tools/,
this started breaking distcheck even though the original Makefile
rules were wrong too.
2013-02-05 15:26:05 -06:00
Jiří Klimeš
2981953e47 tools: move generate-settings-spec to tools 2013-02-05 18:25:03 +01:00
Jiří Klimeš
029e613288 docs: generate refentry xml in addition to Docbook book xml for settings-spec
The refentry xml is used to generate manual page with settings description.

The invocation is:
generate-settings-spec <type> <output file> [<type> <output file>]
where <type> is  "book" or "refentry"
2013-02-05 18:22:33 +01:00
Pavel Šimerda
1b0b943663 build: clean all files on 'make distclean' 2012-11-13 23:13:25 +01:00
Pavel Šimerda
e6d1fc8755 build: fix more srcdir != builddir issues 2012-11-13 22:00:28 +01:00
Dan Williams
4eb4402c01 build: fix srcdir != builddir issue 2012-11-13 14:18:04 -06:00
Pavel Šimerda
faa1bcb540 build: improve documentation and test configure options
Use --enable-doc and --enable-tests instead of --with-docs and
--with-tests. This is consistent with other features and with
--enable-gtk-doc option. Support current variants as fallback.

Don't build tests unless --enable-tests is specified.
2012-11-13 20:23:06 +01:00
Robert Shade
0677bf9c07 doc: fix build with build with gtk-doc < 1.15
gtk-doc < 1.15 does not handle a missing DOC_SOURCE_DIR
2012-07-02 12:29:52 -05:00
Dan Williams
a10a8be7c3 docs: fix 'make distcheck' API doc xslt paths
Since all.xml is a built file these days, and will contain paths
relative to $(top_srcdir)/introspection even though it's not in
that directory, it seems we need to clue xsltproc into where the
other API XML files really are.
2012-03-14 12:48:51 -05:00
Dan Williams
6c901ab040 api: update version based on configure version
Instead of manually which is error-prone.
2011-08-06 11:19:33 +02:00
Dan Williams
100580b7fe docs: fix distcheck error building settings spec
Apparently sometimes when doing the distcheck the generator can't
open the file for writing (gets ENOACCESS) presumably because there's
already a file there that's read-only.  So remove any existing
settings spec before regenerating.
2011-03-14 10:56:56 -05:00
Dan Williams
e05fd1cc47 docs: fix distcheck and ensure spec.html gets put in the right place
gtk-doc removes the 'html' directory as part of the build process
so we need to have spec.html generation depend on the gtk-doc html
target.  Also, fix up the paths to make sure the generated spec.html
gets copied into the final 'html' directory.
2011-03-04 14:38:28 -06:00
Dan Williams
173773c3b6 docs: fix distcheck 2011-02-23 16:27:16 -06:00
Dan Williams
53cb0af587 docs: ensure spec.html always gets into HTML docs directory 2011-02-23 10:42:16 -06:00
Dan Williams
efd80ab4bc docs: ensure dbus spec can be copied to html dir (bgo #642853) 2011-02-21 18:26:55 -06:00
Dan Williams
10c57a0562 docs: add in-progress section on migrating to NM 0.9 2011-02-18 14:58:03 -06:00
Dan Williams
6ef8a6d12d docs: convert settings specification to docbook 2011-02-18 11:25:48 -06:00
Dan Williams
0a3a4222af docs: fix distcheck 2011-02-16 16:39:43 -06:00
Dan Williams
a90a7f7dd2 docs: create new master NM documentation module 2011-02-16 16:24:16 -06:00