diff options
| author | Alexander Larsson <alexl@redhat.com> | 2020-11-19 11:01:03 +0100 |
|---|---|---|
| committer | Alexander Larsson <alexl@redhat.com> | 2020-11-19 11:01:03 +0100 |
| commit | c12f4a5b21d873374242294fdbe3aec83f2b7066 (patch) | |
| tree | 50d1adb1961e5e2f3f30fde0a6cd6b30e77953ea | |
| parent | d8e0d2785e10fafe2a668fc284307b3f1b0af2c2 (diff) | |
| download | flatpak-c12f4a5b21d873374242294fdbe3aec83f2b7066.tar.gz | |
Fix build/dist of API docs
We don't want to dist the stamp files, because they are not actually
created.
Also include the AuthenticatorRequest dbus interface in the docs
| -rw-r--r-- | doc/reference/Makefile.am | 24 | ||||
| -rw-r--r-- | doc/reference/libflatpak-docs.xml | 1 |
2 files changed, 21 insertions, 4 deletions
diff --git a/doc/reference/Makefile.am b/doc/reference/Makefile.am index 33902e1b..88bd31bb 100644 --- a/doc/reference/Makefile.am +++ b/doc/reference/Makefile.am @@ -47,20 +47,37 @@ EXTRA_HFILES = HTML_IMAGES = -content_files = \ +dbus_stamp_files = \ dbus-org.freedesktop.Flatpak.Authenticator.stamp \ dbus-org.freedesktop.Flatpak.stamp \ dbus-org.freedesktop.impl.portal.PermissionStore.stamp \ dbus-org.freedesktop.portal.Documents.stamp \ dbus-org.freedesktop.portal.Flatpak.stamp \ $(NULL) -expand_content_files = + +# Generated from the above stamps +xml_files = \ + dbus-org.freedesktop.Flatpak.AuthenticatorRequest.xml \ + dbus-org.freedesktop.Flatpak.Authenticator.xml \ + dbus-org.freedesktop.Flatpak.Development.xml \ + dbus-org.freedesktop.Flatpak.SessionHelper.xml \ + dbus-org.freedesktop.Flatpak.SystemHelper.xml \ + dbus-org.freedesktop.impl.portal.PermissionStore.xml \ + dbus-org.freedesktop.portal.Documents.xml \ + dbus-org.freedesktop.portal.Flatpak.UpdateMonitor.xml \ + dbus-org.freedesktop.portal.Flatpak.xml \ + $(NULL) + +content_files = +expand_content_files = AM_CPPFLAGS = -I$(top_srcdir)/common -I$(top_builddir)/common $(BASE_CFLAGS) GTKDOC_LIBS = $(top_builddir)/libflatpak.la $(BASE_LIBS) include $(top_srcdir)/gtk-doc.make +CLEANFILES += $(xml_files) + EXTRA_DIST += version.xml.in if ENABLE_GTK_DOC_CHECK @@ -70,8 +87,7 @@ TESTS_ENVIRONMENT = \ TESTS = $(GTKDOC_CHECK) endif -libflatpak-docs.html: libflatpak-docs.xml docs - $(AM_V_GEN) $(XMLTO) $(XMLTO_FLAGS) --skip-validation xhtml-nochunks -m $(srcdir)/../xmlto-config.xsl $< +sgml.stamp: $(dbus_stamp_files) dbus-%.stamp: $(top_srcdir)/data/%.xml $(AM_V_GEN)$(GDBUS_CODEGEN) --generate-docbook=dbus $< diff --git a/doc/reference/libflatpak-docs.xml b/doc/reference/libflatpak-docs.xml index a225ff8f..ab668be6 100644 --- a/doc/reference/libflatpak-docs.xml +++ b/doc/reference/libflatpak-docs.xml @@ -33,6 +33,7 @@ <chapter> <title>D-Bus APIs</title> <xi:include href="dbus-org.freedesktop.Flatpak.Authenticator.xml"/> + <xi:include href="dbus-org.freedesktop.Flatpak.AuthenticatorRequest.xml"/> <xi:include href="dbus-org.freedesktop.Flatpak.Development.xml"/> <xi:include href="dbus-org.freedesktop.Flatpak.SessionHelper.xml"/> <xi:include href="dbus-org.freedesktop.Flatpak.SystemHelper.xml"/> |