docs: don't require 'dia' to build the docs

These diagrams are not expected to change much, so just include the generated
PNGs in the repository, and remove 'dia' from the prerequisites to build the
documentation.

9 files changed, 17 insertions, 26 deletions

diff --git a/configure.ac b/configure.ac
index bfa54a17..3bc03ac2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -29,14 +29,6 @@ AC_ARG_WITH(docs, AS_HELP_STRING([--with-docs], [Build ModemManager documentatio
 AM_CONDITIONAL(WITH_DOCS, test "x$with_docs" = "xyes")
 case $with_docs in
     yes)
-        # Check for dia if we are building gtk_doc
-        AC_PATH_PROG(DIA, dia)
-        AC_SUBST(DIA)
-
-        if test -z "$DIA"; then
-           AC_MSG_ERROR([Could not find Dia tool required to build documentation.])
-        fi
-
         enable_gtk_doc=yes
         ;;
     *)
diff --git a/data/Makefile.am b/data/Makefile.am
index eb87359b..770f97d1 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -57,6 +57,13 @@ logos = \
 	ModemManager-logo-wide-text.svg ModemManager-logo-wide-text.png
 
 
+# Diagrams
+diagrams = \
+	ModemManager-states.png \
+	ModemManager-interface-initialization-sequence.png \
+	ModemManager-interface-initialization-sequence-subclassed.png
+
+
 # Polkit
 dist_polkit_policy_in_files = org.freedesktop.ModemManager1.policy.in
 if WITH_POLKIT
@@ -90,4 +97,5 @@ EXTRA_DIST = \
 	$(dbusservice_file_nopolkit) \
 	$(icon_DATA) \
 	$(dist_polkit_policy_in_files) \
-	$(logos)
+	$(logos) \
+	$(diagrams)
diff --git a/docs/reference/api/ModemManager-interface-initialization-sequence-subclassed.dia b/data/ModemManager-interface-initialization-sequence-subclassed.dia
index d23a9213..d23a9213 100644
--- a/docs/reference/api/ModemManager-interface-initialization-sequence-subclassed.dia
+++ b/data/ModemManager-interface-initialization-sequence-subclassed.dia
diff --git a/data/ModemManager-interface-initialization-sequence-subclassed.png b/data/ModemManager-interface-initialization-sequence-subclassed.png
new file mode 100644
index 00000000..7202f8dd
--- /dev/null
+++ b/data/ModemManager-interface-initialization-sequence-subclassed.png
diff --git a/docs/reference/api/ModemManager-interface-initialization-sequence.dia b/data/ModemManager-interface-initialization-sequence.dia
index 4522effe..4522effe 100644
--- a/docs/reference/api/ModemManager-interface-initialization-sequence.dia
+++ b/data/ModemManager-interface-initialization-sequence.dia
diff --git a/data/ModemManager-interface-initialization-sequence.png b/data/ModemManager-interface-initialization-sequence.png
new file mode 100644
index 00000000..f31898ce
--- /dev/null
+++ b/data/ModemManager-interface-initialization-sequence.png
diff --git a/docs/reference/api/ModemManager-states.dia b/data/ModemManager-states.dia
index 21e59479..21e59479 100644
--- a/docs/reference/api/ModemManager-states.dia
+++ b/data/ModemManager-states.dia
diff --git a/data/ModemManager-states.png b/data/ModemManager-states.png
new file mode 100644
index 00000000..de42aaaa
--- /dev/null
+++ b/data/ModemManager-states.png
diff --git a/docs/reference/api/Makefile.am b/docs/reference/api/Makefile.am
index 9358484d..c8b58a06 100644
--- a/docs/reference/api/Makefile.am
+++ b/docs/reference/api/Makefile.am
@@ -1,24 +1,16 @@
 
-# Generation of the additional PNG files from DIA files
-#  (list of original '.dia' files with '.png' extension)
-DIAGRAMS = \
-	ModemManager-states.dia \
-	ModemManager-interface-initialization-sequence.dia \
-	ModemManager-interface-initialization-sequence-subclassed.dia
-
-# The wanted PNG files
-DIAGRAMS_PNG = $(notdir $(DIAGRAMS:.dia=.png))
-
-# DIA to PNG conversion
-$(DIAGRAMS_PNG): $(DIAGRAMS)
-	$(AM_V_GEN) $(DIA) -t png $^ 1>/dev/null 2>&1
-
 # Logos
 LOGOS_PNG = \
 	$(top_srcdir)/data/ModemManager-logo-square.png \
 	$(top_srcdir)/data/ModemManager-logo-wide.png \
 	$(top_srcdir)/data/ModemManager-logo-wide-text.png
 
+# Diagrams
+DIAGRAMS_PNG = \
+	$(top_srcdir)/data/ModemManager-states.png \
+	$(top_srcdir)/data/ModemManager-interface-initialization-sequence.png \
+	$(top_srcdir)/data/ModemManager-interface-initialization-sequence-subclassed.png
+
 # The name of the module.
 DOC_MODULE = ModemManager
 
@@ -122,8 +114,7 @@ CLEANFILES += \
 	$(NULL)
 
 # PNGs are removed only in dist-clean
-# Diagrams are generated by dia in the current directory
-# Logos are copied to current directory by gtk-doc
+# Diagrams and logos are generated by dia in the current directory
 DISTCLEANFILES = \
-	$(DIAGRAMS_PNG) \
+	$(notdir $(DIAGRAMS_PNG)) \
 	$(notdir $(LOGOS_PNG))