Browse Source

Updated doxygen autotools integration

Attempt to make the doxygen version filter works with git
Yann Weber 7 years ago
parent
commit
4a0c3a8d7d
2 changed files with 11 additions and 9 deletions
  1. 9
    3
      configure.ac
  2. 2
    6
      docs/Doxyfile.in

+ 9
- 3
configure.ac View File

@@ -36,12 +36,18 @@ AC_PROG_RANLIB
36 36
 
37 37
 AC_CHECK_PROGS([DOXYGEN], [doxygen])
38 38
 if test -z "$DOXYGEN";
39
-	then AC_MSG_WARN([Doxygen not found - continuing without Doxygen support])
39
+then
40
+	AC_MSG_WARN([Doxygen not found - continuing without Doxygen support])
40 41
 fi
41 42
 
42 43
 AC_CHECK_PROGS([GIT], [git])
43
-if test -z "$DOXYGEN";
44
-	then AC_MSG_WARN([git not found - continuing without Doxygen support])
44
+if test -z "$GIT";
45
+then 
46
+	AC_MSG_WARN([git not found - continuing without Doxygen support])
47
+	AC_SUBST([DOXYFILE_FILE_VERSION_FILTER], [])
48
+else
49
+	
50
+	AC_SUBST([DOXYFILE_FILE_VERSION_FILTER], ["\"/bin/sh -c 'git log --pretty=\\\"format:%ci, author:%aN <%aE>, commit:%h\\\" -1 --'\""])
45 51
 fi
46 52
 
47 53
 # Checks for libraries.

+ 2
- 6
docs/Doxyfile.in View File

@@ -669,11 +669,7 @@ SHOW_NAMESPACES        = YES
669 669
 # by doxygen. Whatever the program writes to standard output is used as the file
670 670
 # version. For an example see the documentation.
671 671
 
672
-if HAVE_GIT
673
-FILE_VERSION_FILTER    = "/bin/sh -c 'git log --pretty=\"format:%ci, author:%aN <%aE>, commit:%h\" -1 \"${1}\" || echo no git'"
674
-else
675
-FILE_VERSION_FILTER    =
676
-fi
672
+FILE_VERSION_FILTER    = @DOXYFILE_FILE_VERSION_FILTER@
677 673
 
678 674
 # The LAYOUT_FILE tag can be used to specify a layout file which will be parsed
679 675
 # by doxygen. The layout file controls the global structure of the generated
@@ -767,7 +763,7 @@ WARN_LOGFILE           =
767 763
 # spaces.
768 764
 # Note: If this tag is empty the current directory is searched.
769 765
 
770
-INPUT                  = @top_srcdir@
766
+INPUT                  = @top_builddir@/src
771 767
 
772 768
 # This tag can be used to specify the character encoding of the source files
773 769
 # that doxygen parses. Internally doxygen uses the UTF-8 encoding. Doxygen uses

Loading…
Cancel
Save