Re: [Openvpn-devel] [PATCH 2/2] doxygen: add make target

2017-11-08 Thread Gert Doering
Hi,

On Wed, Nov 01, 2017 at 01:55:12PM +0100, Steffan Karger wrote:
> Add a make target, such that 'make doxygen' works (both for in-tree and
> out-of-tree builds).

The relative path used for INPUT= has some funky side effects if another
project happens to be checked out "nearby" - I had openvpn in 

  /tmp/x/openvpn/

and doxygen started building documentation for

  /tmp/roundcubemail-1.3.1/

so that's overdoing things a bit :-) - feature-ACK, code-NAK.

(As discussed on IRC)

gert
-- 
USENET is *not* the non-clickable part of WWW!
   //www.muc.de/~gert/
Gert Doering - Munich, Germany g...@greenie.muc.de
fax: +49-89-35655025g...@net.informatik.tu-muenchen.de


signature.asc
Description: PGP signature
--
Check out the vibrant tech community on one of the world's most
engaging tech sites, Slashdot.org! http://sdm.link/slashdot___
Openvpn-devel mailing list
Openvpn-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/openvpn-devel


[Openvpn-devel] [PATCH 2/2] doxygen: add make target

2017-11-01 Thread Steffan Karger
Add a make target, such that 'make doxygen' works (both for in-tree and
out-of-tree builds).

Signed-off-by: Steffan Karger 
---
 Makefile.am |   5 +-
 configure.ac|   1 +
 doc/Makefile.am |   2 +
 doc/doxygen/openvpn.doxyfile| 279 
 doc/doxygen/openvpn.doxyfile.in | 279 
 5 files changed, 286 insertions(+), 280 deletions(-)
 delete mode 100644 doc/doxygen/openvpn.doxyfile
 create mode 100644 doc/doxygen/openvpn.doxyfile.in

diff --git a/Makefile.am b/Makefile.am
index 87af724..34632c4 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -46,7 +46,7 @@ EXTRA_DIST = \
contrib \
debug
 
-.PHONY: config-version.h
+.PHONY: config-version.h doxygen
 
 if GIT_CHECKOUT
 BUILT_SOURCES = \
@@ -96,3 +96,6 @@ config-version.h:
else \
rm -f config-version.h.tmp; \
fi
+
+doxygen: doc/doxygen/openvpn.doxyfile
+   doxygen doc/doxygen/openvpn.doxyfile
diff --git a/configure.ac b/configure.ac
index 6f59bae..6570610 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1413,6 +1413,7 @@ AC_CONFIG_FILES([
distro/rpm/Makefile
distro/rpm/openvpn.spec
distro/systemd/Makefile
+   doc/doxygen/openvpn.doxyfile
include/Makefile
src/Makefile
src/compat/Makefile
diff --git a/doc/Makefile.am b/doc/Makefile.am
index dedd1fa..f9e7f4a 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -14,6 +14,8 @@ MAINTAINERCLEANFILES = \
 
 CLEANFILES = openvpn.8.html
 
+SUBDIRS = doxygen
+
 dist_doc_DATA = \
management-notes.txt
 
diff --git a/doc/doxygen/openvpn.doxyfile b/doc/doxygen/openvpn.doxyfile
deleted file mode 100644
index 80cda2b..000
--- a/doc/doxygen/openvpn.doxyfile
+++ /dev/null
@@ -1,279 +0,0 @@
-# Doxyfile 1.5.5
-
-#---
-# Project related configuration options
-#---
-DOXYFILE_ENCODING  = UTF-8
-PROJECT_NAME   = "OpenVPN"
-PROJECT_NUMBER =
-OUTPUT_DIRECTORY   = doxygen
-CREATE_SUBDIRS = NO
-OUTPUT_LANGUAGE= English
-BRIEF_MEMBER_DESC  = YES
-REPEAT_BRIEF   = YES
-ABBREVIATE_BRIEF   = "The $name class" \
- "The $name widget" \
- "The $name file" \
- is \
- provides \
- specifies \
- contains \
- represents \
- a \
- an \
- the
-ALWAYS_DETAILED_SEC= NO
-INLINE_INHERITED_MEMB  = NO
-FULL_PATH_NAMES= YES
-STRIP_FROM_PATH= "."
-STRIP_FROM_INC_PATH=
-SHORT_NAMES= NO
-JAVADOC_AUTOBRIEF  = YES # NO
-QT_AUTOBRIEF   = NO
-MULTILINE_CPP_IS_BRIEF = NO
-DETAILS_AT_TOP = NO
-INHERIT_DOCS   = YES
-SEPARATE_MEMBER_PAGES  = NO
-TAB_SIZE   = 8
-ALIASES=
-OPTIMIZE_OUTPUT_FOR_C  = YES
-OPTIMIZE_OUTPUT_JAVA   = NO
-OPTIMIZE_FOR_FORTRAN   = NO
-OPTIMIZE_OUTPUT_VHDL   = NO
-BUILTIN_STL_SUPPORT= NO
-CPP_CLI_SUPPORT= NO
-SIP_SUPPORT= NO
-DISTRIBUTE_GROUP_DOC   = NO
-SUBGROUPING= YES
-TYPEDEF_HIDES_STRUCT   = NO
-#---
-# Build related configuration options
-#---
-EXTRACT_ALL= YES
-EXTRACT_PRIVATE= YES
-EXTRACT_STATIC = YES
-EXTRACT_LOCAL_CLASSES  = YES
-EXTRACT_LOCAL_METHODS  = YES
-EXTRACT_ANON_NSPACES   = YES
-HIDE_UNDOC_MEMBERS = NO
-HIDE_UNDOC_CLASSES = NO
-HIDE_FRIEND_COMPOUNDS  = NO
-HIDE_IN_BODY_DOCS  = NO
-INTERNAL_DOCS  = NO
-CASE_SENSE_NAMES   = NO
-HIDE_SCOPE_NAMES   = NO
-SHOW_INCLUDE_FILES = YES
-INLINE_INFO= YES
-SORT_MEMBER_DOCS   = YES
-SORT_BRIEF_DOCS= NO
-SORT_GROUP_NAMES   = NO
-SORT_BY_SCOPE_NAME = NO
-GENERATE_TODOLIST  = YES
-GENERATE_TESTLIST  = YES
-GENERATE_BUGLIST   = YES
-GENERATE_DEPRECATEDLIST= YES
-ENABLED_SECTIONS   =
-MAX_INITIALIZER_LINES  = 30
-SHOW_USED_FILES= YES
-SHOW_DIRECTORIES   = NO
-FILE_VERSION_FILTER=
-#---
-# configuration options related to warning and progress messages
-#---
-QUIET  = NO
-WARNINGS   = YES
-WARN_IF_UNDOCUMENTED   = YES
-WARN_IF_DOC_ERROR  = YES
-WARN_NO_PARAMDOC   = NO
-WARN_FORMAT= "$file:$line: $text"
-WARN_LOGFILE   =
-#---
-# configuration options related to the inp