gravatar
alpar (Alpar Juttner)
alpar@cs.elte.hu
Merge #404 to branch 1.1
1 4 1
merge 1.1
1 file changed with 56 insertions and 24 deletions:
↑ Collapse diff ↑
Ignore white space 4 line context
... ...
@@ -99,5 +99,5 @@
99 99
dnl Add dependencies on files generated by configure.
100 100
AC_SUBST([CONFIG_STATUS_DEPENDENCIES],
101
  ['$(top_srcdir)/doc/Doxyfile.in $(top_srcdir)/lemon/lemon.pc.in $(top_srcdir)/cmake/version.cmake.in'])
101
  ['$(top_srcdir)/doc/Doxyfile.in $(top_srcdir)/doc/mainpage.dox.in $(top_srcdir)/lemon/lemon.pc.in $(top_srcdir)/cmake/version.cmake.in'])
102 102

	
103 103
AC_CONFIG_FILES([
... ...
@@ -106,4 +106,5 @@
106 106
cmake/version.cmake
107 107
doc/Doxyfile
108
doc/mainpage.dox
108 109
lemon/lemon.pc
109 110
])
Ignore white space 4 line context
... ...
@@ -12,4 +12,10 @@
12 12
)
13 13

	
14
CONFIGURE_FILE(
15
  ${PROJECT_SOURCE_DIR}/doc/mainpage.dox.in
16
  ${PROJECT_BINARY_DIR}/doc/mainpage.dox
17
  @ONLY
18
)
19

	
14 20
IF(DOXYGEN_EXECUTABLE AND GHOSTSCRIPT_EXECUTABLE)
15 21
  FILE(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/html/)
Ignore white space 4 line context
1
# Doxyfile 1.5.9
1
# Doxyfile 1.7.3
2 2

	
3 3
#---------------------------------------------------------------------------
... ...
@@ -5,6 +5,8 @@
5 5
#---------------------------------------------------------------------------
6 6
DOXYFILE_ENCODING      = UTF-8
7
PROJECT_NAME           = @PACKAGE_NAME@
8
PROJECT_NUMBER         = @PACKAGE_VERSION@
7
PROJECT_NAME           = 
8
PROJECT_NUMBER         = 
9
PROJECT_BRIEF          =
10
PROJECT_LOGO           =
9 11
OUTPUT_DIRECTORY       = 
10 12
CREATE_SUBDIRS         = NO
... ...
@@ -30,4 +32,5 @@
30 32
OPTIMIZE_FOR_FORTRAN   = NO
31 33
OPTIMIZE_OUTPUT_VHDL   = NO
34
EXTENSION_MAPPING      =
32 35
BUILTIN_STL_SUPPORT    = YES
33 36
CPP_CLI_SUPPORT        = NO
... ...
@@ -55,9 +58,12 @@
55 58
HIDE_SCOPE_NAMES       = YES
56 59
SHOW_INCLUDE_FILES     = YES
60
FORCE_LOCAL_INCLUDES   = NO
57 61
INLINE_INFO            = YES
58 62
SORT_MEMBER_DOCS       = NO
59 63
SORT_BRIEF_DOCS        = NO
64
SORT_MEMBERS_CTORS_1ST = NO
60 65
SORT_GROUP_NAMES       = NO
61 66
SORT_BY_SCOPE_NAME     = NO
67
STRICT_PROTO_MATCHING  = NO
62 68
GENERATE_TODOLIST      = YES
63 69
GENERATE_TESTLIST      = YES
... ...
@@ -91,5 +97,6 @@
91 97
                         "@abs_top_srcdir@/demo" \
92 98
                         "@abs_top_srcdir@/tools" \
93
                         "@abs_top_srcdir@/test/test_tools.h"
99
                         "@abs_top_srcdir@/test/test_tools.h" \
100
                         "@abs_top_builddir@/doc/mainpage.dox"
94 101
INPUT_ENCODING         = UTF-8
95 102
FILE_PATTERNS          = *.h \
... ...
@@ -111,4 +118,5 @@
111 118
FILTER_PATTERNS        = 
112 119
FILTER_SOURCE_FILES    = NO
120
FILTER_SOURCE_PATTERNS =
113 121
#---------------------------------------------------------------------------
114 122
# configuration options related to source browsing
... ...
@@ -137,9 +145,15 @@
137 145
HTML_FOOTER            = 
138 146
HTML_STYLESHEET        = 
147
HTML_COLORSTYLE_HUE    = 220
148
HTML_COLORSTYLE_SAT    = 100
149
HTML_COLORSTYLE_GAMMA  = 80
150
HTML_TIMESTAMP         = YES
139 151
HTML_ALIGN_MEMBERS     = YES
140
HTML_DYNAMIC_SECTIONS  = NO
152
HTML_DYNAMIC_SECTIONS  = YES
141 153
GENERATE_DOCSET        = NO
142 154
DOCSET_FEEDNAME        = "Doxygen generated docs"
143 155
DOCSET_BUNDLE_ID       = org.doxygen.Project
156
DOCSET_PUBLISHER_ID    = org.doxygen.Publisher
157
DOCSET_PUBLISHER_NAME  = Publisher
144 158
GENERATE_HTMLHELP      = NO
145 159
CHM_FILE               = 
... ...
@@ -153,10 +167,22 @@
153 167
QHP_NAMESPACE          = org.doxygen.Project
154 168
QHP_VIRTUAL_FOLDER     = doc
169
QHP_CUST_FILTER_NAME   =
170
QHP_CUST_FILTER_ATTRS  =
171
QHP_SECT_FILTER_ATTRS  =
155 172
QHG_LOCATION           = 
173
GENERATE_ECLIPSEHELP   = NO
174
ECLIPSE_DOC_ID         = org.doxygen.Project
156 175
DISABLE_INDEX          = NO
157 176
ENUM_VALUES_PER_LINE   = 4
158 177
GENERATE_TREEVIEW      = NO
178
USE_INLINE_TREES       = NO
159 179
TREEVIEW_WIDTH         = 250
180
EXT_LINKS_IN_WINDOW    = NO
160 181
FORMULA_FONTSIZE       = 10
182
FORMULA_TRANSPARENT    = YES
183
USE_MATHJAX            = NO
184
MATHJAX_RELPATH        = http://www.mathjax.org/mathjax
185
SEARCHENGINE           = YES
186
SERVER_BASED_SEARCH    = NO
161 187
#---------------------------------------------------------------------------
162 188
# configuration options related to the LaTeX output
... ...
@@ -175,4 +201,5 @@
175 201
LATEX_BATCHMODE        = NO
176 202
LATEX_HIDE_INDICES     = NO
203
LATEX_SOURCE_CODE      = NO
177 204
#---------------------------------------------------------------------------
178 205
# configuration options related to the RTF output
... ...
@@ -223,5 +250,5 @@
223 250
SKIP_FUNCTION_MACROS   = YES
224 251
#---------------------------------------------------------------------------
225
# Options related to the search engine   
252
# Configuration::additions related to external references
226 253
#---------------------------------------------------------------------------
227 254
TAGFILES               = "@abs_top_builddir@/doc/libstdc++.tag = http://gcc.gnu.org/onlinedocs/libstdc++/latest-doxygen/  "
... ...
@@ -237,4 +264,5 @@
237 264
HIDE_UNDOC_RELATIONS   = YES
238 265
HAVE_DOT               = YES
266
DOT_NUM_THREADS        = 0
239 267
DOT_FONTNAME           = FreeSans
240 268
DOT_FONTSIZE           = 10
... ...
@@ -254,4 +282,5 @@
254 282
DOT_PATH               = 
255 283
DOTFILE_DIRS           = 
284
MSCFILE_DIRS           =
256 285
DOT_GRAPH_MAX_NODES    = 50
257 286
MAX_DOT_GRAPH_DEPTH    = 0
... ...
@@ -260,6 +289,2 @@
260 289
GENERATE_LEGEND        = YES
261 290
DOT_CLEANUP            = YES
262
#---------------------------------------------------------------------------
263
# Configuration::additions related to the search engine   
264
#---------------------------------------------------------------------------
265
SEARCHENGINE           = NO
Ignore white space 4 line context
... ...
@@ -3,22 +3,22 @@
3 3
  <navindex>
4 4
    <tab type="mainpage" visible="yes" title=""/>
5
    <tab type="modules" visible="yes" title=""/>
5
    <tab type="modules" visible="yes" title="" intro=""/>
6 6
    <tab type="classes" visible="yes" title="">
7
      <tab type="classes" visible="yes" title=""/>
8
      <tab type="classindex" visible="$ALPHABETICAL_INDEX" title=""/> 
9
      <tab type="hierarchy" visible="yes" title=""/>
10
      <tab type="classmembers" visible="yes" title=""/>
7
      <tab type="classes" visible="yes" title="" intro=""/>
8
      <tab type="classindex" visible="$ALPHABETICAL_INDEX" title=""/>
9
      <tab type="hierarchy" visible="yes" title="" intro=""/>
10
      <tab type="classmembers" visible="yes" title="" intro=""/>
11 11
    </tab>
12 12
    <tab type="namespaces" visible="yes" title="">
13
      <tab type="namespaces" visible="yes" title=""/>
14
      <tab type="namespacemembers" visible="yes" title=""/>
13
      <tab type="namespaces" visible="yes" title="" intro=""/>
14
      <tab type="namespacemembers" visible="yes" title="" intro=""/>
15 15
    </tab>
16 16
    <tab type="files" visible="yes" title="">
17
      <tab type="files" visible="yes" title=""/>
18
      <tab type="globals" visible="yes" title=""/>
17
      <tab type="files" visible="yes" title="" intro=""/>
18
      <tab type="globals" visible="yes" title="" intro=""/>
19 19
    </tab>
20
    <tab type="dirs" visible="yes" title=""/>
21
    <tab type="examples" visible="yes" title=""/>  
22
    <tab type="pages" visible="yes" title=""/>
20
    <tab type="dirs" visible="yes" title="" intro=""/>
21
    <tab type="examples" visible="yes" title="" intro=""/>
22
    <tab type="pages" visible="yes" title="" intro=""/>
23 23
  </navindex>
24 24

	
Ignore white space 4 line context
... ...
@@ -18,5 +18,5 @@
18 18

	
19 19
/**
20
\mainpage LEMON Documentation
20
\mainpage @PACKAGE_NAME@ @PACKAGE_VERSION@ Documentation
21 21

	
22 22
\section intro Introduction
0 comments (0 inline)