gravatar
alpar (Alpar Juttner)
alpar@cs.elte.hu
Merge #404
1 6 1
merge default
7 files changed with 55 insertions and 23 deletions:
↑ Collapse diff ↑
Ignore white space 6 line context
... ...
@@ -116,3 +116,3 @@
116 116
AC_SUBST([CONFIG_STATUS_DEPENDENCIES],
117
  ['$(top_srcdir)/doc/Doxyfile.in $(top_srcdir)/lemon/lemon.pc.in $(top_srcdir)/cmake/version.cmake.in'])
117
  ['$(top_srcdir)/doc/Doxyfile.in $(top_srcdir)/doc/mainpage.dox.in $(top_srcdir)/lemon/lemon.pc.in $(top_srcdir)/cmake/version.cmake.in'])
118 118

	
... ...
@@ -123,2 +123,3 @@
123 123
doc/Doxyfile
124
doc/mainpage.dox
124 125
lemon/lemon.pc
Ignore white space 6 line context
... ...
@@ -13,2 +13,8 @@
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 PYTHONINTERP_FOUND AND GHOSTSCRIPT_EXECUTABLE)
Ignore white space 6 line context
1
# Doxyfile 1.5.9
1
# Doxyfile 1.7.3
2 2

	
... ...
@@ -6,4 +6,6 @@
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       = 
... ...
@@ -31,2 +33,3 @@
31 33
OPTIMIZE_OUTPUT_VHDL   = NO
34
EXTENSION_MAPPING      =
32 35
BUILTIN_STL_SUPPORT    = YES
... ...
@@ -56,2 +59,3 @@
56 59
SHOW_INCLUDE_FILES     = YES
60
FORCE_LOCAL_INCLUDES   = NO
57 61
INLINE_INFO            = YES
... ...
@@ -59,4 +63,6 @@
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
... ...
@@ -94,2 +100,3 @@
94 100
                         "@abs_top_srcdir@/test/test_tools.h" \
101
                         "@abs_top_builddir@/doc/mainpage.dox" \
95 102
                         "@abs_top_builddir@/doc/references.dox"
... ...
@@ -114,2 +121,3 @@
114 121
FILTER_SOURCE_FILES    = NO
122
FILTER_SOURCE_PATTERNS =
115 123
#---------------------------------------------------------------------------
... ...
@@ -140,4 +148,8 @@
140 148
HTML_STYLESHEET        = 
149
HTML_COLORSTYLE_HUE    = 220
150
HTML_COLORSTYLE_SAT    = 100
151
HTML_COLORSTYLE_GAMMA  = 80
152
HTML_TIMESTAMP         = YES
141 153
HTML_ALIGN_MEMBERS     = YES
142
HTML_DYNAMIC_SECTIONS  = NO
154
HTML_DYNAMIC_SECTIONS  = YES
143 155
GENERATE_DOCSET        = NO
... ...
@@ -145,2 +157,4 @@
145 157
DOCSET_BUNDLE_ID       = org.doxygen.Project
158
DOCSET_PUBLISHER_ID    = org.doxygen.Publisher
159
DOCSET_PUBLISHER_NAME  = Publisher
146 160
GENERATE_HTMLHELP      = NO
... ...
@@ -156,3 +170,8 @@
156 170
QHP_VIRTUAL_FOLDER     = doc
171
QHP_CUST_FILTER_NAME   =
172
QHP_CUST_FILTER_ATTRS  =
173
QHP_SECT_FILTER_ATTRS  =
157 174
QHG_LOCATION           = 
175
GENERATE_ECLIPSEHELP   = NO
176
ECLIPSE_DOC_ID         = org.doxygen.Project
158 177
DISABLE_INDEX          = NO
... ...
@@ -160,4 +179,11 @@
160 179
GENERATE_TREEVIEW      = NO
180
USE_INLINE_TREES       = NO
161 181
TREEVIEW_WIDTH         = 250
182
EXT_LINKS_IN_WINDOW    = NO
162 183
FORMULA_FONTSIZE       = 10
184
FORMULA_TRANSPARENT    = YES
185
USE_MATHJAX            = NO
186
MATHJAX_RELPATH        = http://www.mathjax.org/mathjax
187
SEARCHENGINE           = YES
188
SERVER_BASED_SEARCH    = NO
163 189
#---------------------------------------------------------------------------
... ...
@@ -178,2 +204,3 @@
178 204
LATEX_HIDE_INDICES     = NO
205
LATEX_SOURCE_CODE      = NO
179 206
#---------------------------------------------------------------------------
... ...
@@ -226,3 +253,3 @@
226 253
#---------------------------------------------------------------------------
227
# Options related to the search engine   
254
# Configuration::additions related to external references
228 255
#---------------------------------------------------------------------------
... ...
@@ -240,2 +267,3 @@
240 267
HAVE_DOT               = YES
268
DOT_NUM_THREADS        = 0
241 269
DOT_FONTNAME           = FreeSans
... ...
@@ -257,2 +285,3 @@
257 285
DOTFILE_DIRS           = 
286
MSCFILE_DIRS           =
258 287
DOT_GRAPH_MAX_NODES    = 50
... ...
@@ -263,5 +292,1 @@
263 292
DOT_CLEANUP            = YES
264
#---------------------------------------------------------------------------
265
# Configuration::additions related to the search engine   
266
#---------------------------------------------------------------------------
267
SEARCHENGINE           = NO
Ignore white space 6 line context
... ...
@@ -4,20 +4,20 @@
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>
Ignore white space 2 line context
... ...
@@ -19,3 +19,3 @@
19 19
/**
20
\mainpage LEMON Documentation
20
\mainpage @PACKAGE_NAME@ @PACKAGE_VERSION@ Documentation
21 21

	
0 comments (0 inline)