From 798ba1e5bef741b80e5a36feb48b8352f5020442 Mon Sep 17 00:00:00 2001 From: Michael Jumper Date: Wed, 6 Dec 2017 00:34:47 -0800 Subject: [PATCH] GUACAMOLE-423: Automatically populate package version within Doxyfile. --- .gitignore | 1 + Makefile.am | 16 ++++++++-------- configure.ac | 1 + doc/{Doxyfile => Doxyfile.in} | 2 +- 4 files changed, 11 insertions(+), 9 deletions(-) rename doc/{Doxyfile => Doxyfile.in} (97%) diff --git a/.gitignore b/.gitignore index ec740cc0..dec0cd10 100644 --- a/.gitignore +++ b/.gitignore @@ -23,6 +23,7 @@ .deps/ .dirstamp .libs/ +Doxyfile Makefile Makefile.in aclocal.m4 diff --git a/Makefile.am b/Makefile.am index 950cf74b..8dfa9d1f 100644 --- a/Makefile.am +++ b/Makefile.am @@ -75,13 +75,13 @@ if ENABLE_GUACENC SUBDIRS += src/guacenc endif -EXTRA_DIST = \ - .dockerignore \ - CONTRIBUTING \ - Dockerfile \ - LICENSE \ - NOTICE \ - bin/guacctl \ - doc/Doxyfile \ +EXTRA_DIST = \ + .dockerignore \ + CONTRIBUTING \ + Dockerfile \ + LICENSE \ + NOTICE \ + bin/guacctl \ + doc/Doxyfile.in \ src/guacd-docker diff --git a/configure.ac b/configure.ac index e04d581a..b2d678cb 100644 --- a/configure.ac +++ b/configure.ac @@ -1196,6 +1196,7 @@ AM_CONDITIONAL([ENABLE_GUACENC], [test "x${enable_guacenc}" = "xyes" \ # AC_CONFIG_FILES([Makefile + doc/Doxyfile tests/Makefile src/common/Makefile src/common-ssh/Makefile diff --git a/doc/Doxyfile b/doc/Doxyfile.in similarity index 97% rename from doc/Doxyfile rename to doc/Doxyfile.in index 59035644..83d54df7 100644 --- a/doc/Doxyfile +++ b/doc/Doxyfile.in @@ -22,7 +22,7 @@ # PROJECT_NAME = libguac -PROJECT_NUMBER = 0.9.13-incubating +PROJECT_NUMBER = @PACKAGE_VERSION@ # # Warn about undocumented parameters and return values, but do not fill output