Commit6346266

authored and

Felipe Zimmerle

committed

Refactoring on the doxygen generation

1 parenta5bbb83 commit6346266Copy full SHA for 6346266

File tree

+1359

-849

lines changed

+1359

-849

lines changed

Lines changed: 2 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,8 @@`
`1`	`1`	`DD MMM YYYY - 2.9.2 - To be released`
`2`	`2`	`------------------------------------`
`3`	`3`
	`4`	`+ * Fix --enable-docs adding missing Makefile, modifying autoconf and filenames`
	`5`	`+ [Issue #1322 - @victorhora]`
`4`	`6`	`* Change from using rand() to thread-safe ap_random_pick.`
`5`	`7`	`[Issue #1289 - Robert Bost]`
`6`	`8`	`* Cosmetics: added comments on odd looking code to prevent future`

Lines changed: 14 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -288,7 +288,20 @@ AC_ARG_ENABLE(docs,`
`288`	`288`	`])`
`289`	`289`	`AM_CONDITIONAL([BUILD_DOCS],[test "$build_docs" -eq 1])`
`290`	`290`	`if test "$build_docs" -eq 1; then`
`291`		`- TOPLEVEL_SUBDIRS="$TOPLEVEL_SUBDIRS docs"`
	`291`	`+ TOPLEVEL_SUBDIRS="$TOPLEVEL_SUBDIRS doc"`
	`292`	`+AC_CHECK_PROGS([DOXYGEN],[doxygen])`
	`293`	`+ if test -z "$DOXYGEN"; then`
	`294`	`+AC_MSG_WARN([Doxygen not found - continue without Doxygen support])`
	`295`	`+ fi`
	`296`	`+ if test "$build_apache2_module" -eq 1; then`
	`297`	`+AC_CONFIG_FILES([doc/doxygen-apache])`
	`298`	`+ fi`
	`299`	`+ if test "$build_standalone_module" -eq 1; then`
	`300`	`+AC_CONFIG_FILES([doc/doxygen-nginx])`
	`301`	`+AC_CONFIG_FILES([doc/doxygen-iis])`
	`302`	`+AC_CONFIG_FILES([doc/doxygen-standalone])`
	`303`	`+ fi`
	`304`	`+AC_CONFIG_FILES([doc/Makefile])`
`292`	`305`	`fi`
`293`	`306`
`294`	`307`

Lines changed: 27 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,27 @@`
	`1`	`+apache:`
	`2`	`+$(DOXYGEN) doxygen-apache`
	`3`	`+touch apache.stamp`
	`4`	`+`
	`5`	`+iis:`
	`6`	`+$(DOXYGEN) doxygen-iis`
	`7`	`+touch iis.stamp`
	`8`	`+`
	`9`	`+nginx:`
	`10`	`+$(DOXYGEN) doxygen-nginx`
	`11`	`+touch nginx.stamp`
	`12`	`+`
	`13`	`+standalone:`
	`14`	`+$(DOXYGEN) doxygen-standalone`
	`15`	`+touch standalone.stamp`
	`16`	`+`
	`17`	`+`
	`18`	`+if BUILD_APACHE2_MODULE`
	`19`	`+all-local: apache`
	`20`	`+endif`
	`21`	`+`
	`22`	`+if BUILD_STANDALONE_MODULE`
	`23`	`+all-local: iis nginx standalone`
	`24`	`+endif`
	`25`	`+`
	`26`	`+clean-local:`
	`27`	`+rm -rf apache iis nginx standalone`

Comments

(0)