Add UML file generation to the "make dist" output

cardcomm/pkcs11/src/Makefile.am

@@ -161,7 +161,7 @@ libbeidpkcs11_la_SOURCES += \
 	dialogs/dialogsgtk/dlgs_gtk.cpp \
 	dialogs/dialogsgtk/single_dialog.c
 libexec_PROGRAMS = beid-askpin beid-changepin beid-badpin beid-askaccess beid-spr-askpin beid-spr-changepin
-SUBDIRS = dialogs/dialogsgtk/po
+SUBDIRS = dialogs/dialogsgtk/po cardlayer/uml
 endif
 
 if P11KIT

cardcomm/pkcs11/src/cardlayer/uml/Makefile.am

@@ -0,0 +1,10 @@
+if PLANTUML
+%.png: %.puml
+	@PLANTUML@ -o $(abs_builddir) $<
+
+%.svg: %.puml
+	@PLANTUML@ -o $(abs_builddir) -tsvg $<
+
+dist_noinst_DATA = cal.png
+endif
+EXTRA_DIST = cal.puml

configure.ac

@@ -25,6 +25,9 @@ AC_PROG_LN_S
 AC_PROG_MKDIR_P
 PKG_PROG_PKG_CONFIG
 
+AC_CHECK_PROGS(PLANTUML, plantuml)
+AM_CONDITIONAL([PLANTUML], [test x$PLANTUML != x])
+
 # Checks for header files.
 AC_CHECK_HEADERS([fcntl.h float.h limits.h netinet/in.h stdlib.h string.h sys/file.h sys/ioctl.h sys/time.h unistd.h malloc.h memory.h sys/timeb.h termios.h])
 
@@ -209,6 +212,7 @@ AC_SUBST([p11kitcfdir])
 
 AC_CONFIG_FILES([Makefile
 		 cardcomm/pkcs11/src/Makefile
+		 cardcomm/pkcs11/src/cardlayer/uml/Makefile
 		 cardcomm/pkcs11/src/libbeidpkcs11.pc
 		 cardcomm/pkcs11/src/beidpkcs11.json
 		 cardcomm/pkcs11/src/beidp11kit.json
@@ -224,6 +228,7 @@ AC_CONFIG_FILES([Makefile
 		 plugins_tools/eid-viewer/test/Makefile
 		 plugins_tools/eid-viewer/gtk/po/Makefile.in
 		 plugins_tools/eid-viewer/gtk/eid-viewer.desktop.sh
+		 plugins_tools/eid-viewer/uml/Makefile
 		 rpm/eid-mw.spec])
 AC_CONFIG_SUBDIRS([plugins_tools/xpi])
 

plugins_tools/eid-viewer/Makefile.am

@@ -123,7 +123,7 @@ libeidviewer_la_LIBADD = $(top_builddir)/plugins_tools/util/liblabels.la $(top_b
 libeidviewer_la_LDFLAGS = -version-info 1:0:1
 AM_CFLAGS = @GTK_CFLAGS@ -I. -I$(srcdir)/include -Igtk -DDATAROOTDIR='"$(datarootdir)"' -I$(top_srcdir)/doc/sdk/include/rsaref220 -I$(top_srcdir)/plugins_tools/util @SSL_CFLAGS@ @GIO_CFLAGS@ @XML2_CFLAGS@ @CURL_CFLAGS@ @libproxy_CFLAGS@ -fvisibility=hidden @FUZZING@
 AM_CXXFLAGS = $(AM_CFLAGS) -std=c++98
-SUBDIRS = . gtk/po test
+SUBDIRS = . gtk/po test uml
 
 resources/%.c: resources/%.png
 	echo -e "#include <gdk-pixbuf/gdk-pixdata.h>\n#if __GNUC__ >= 4\n#pragma GCC diagnostic push\n#pragma GCC diagnostic ignored \"-Wpointer-sign\"\n#endif\n" > $@

plugins_tools/eid-viewer/uml/Makefile.am

@@ -0,0 +1,10 @@
+if PLANTUML
+%.png: %.puml
+	@PLANTUML@ -o $(abs_builddir) $<
+
+%.svg: %.puml
+	@PLANTUML@ -o $(abs_builddir) -tsvg $<
+
+dist_noinst_DATA = be-statemach.png be-statemach-docs.png
+endif
+EXTRA_DIST = be-statemach.puml be-statemach-docs.puml