Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
7
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
Olena
olena
Commits
ee02495a
Commit
ee02495a
authored
Feb 18, 2020
by
Edwin Carlinet
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add option --enable-doc as a switch to build documentation.
parent
3dfc61eb
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
24 additions
and
3 deletions
+24
-3
Makefile.am
Makefile.am
+3
-1
configure.ac
configure.ac
+9
-0
milena/Makefile.am
milena/Makefile.am
+6
-1
scribo/Makefile.am
scribo/Makefile.am
+6
-1
No files found.
Makefile.am
View file @
ee02495a
...
...
@@ -30,7 +30,9 @@ endif ENABLE_SCRIBO
# We rely on Automake to ensure that the documentions are generated in
# the right order. Here, we make sure that the general documentation
# will be generated after Milena's and Scribo's documentation.
SUBDIRS
+=
doc
if
ENABLE_DOC
SUBDIRS
+=
doc
endif
ENABLE_DOC
# Target shortcuts delegating the actual action to milena/Makefile.
LOCAL_RECURSIVE_TARGETS
=
tests
...
...
configure.ac
View file @
ee02495a
...
...
@@ -170,8 +170,15 @@ fi
## Documentation. ##
## --------------- ##
# Switch to enable doc
AC_ARG_ENABLE([doc],
[AS_HELP_STRING([--enable-doc],
[build documentation])])
AM_CONDITIONAL([ENABLE_DOC], [test "x$enable_doc" = xyes])
# Tools used to build the documentation.
# rst2html can have many names, especially in the MacPorts, where
# py-docutils binaries include their version numbers in their names.
AC_ARG_VAR([RST2HTML], [reStructuredText-to-HTML translator])
...
...
@@ -215,6 +222,7 @@ AC_ARG_ENABLE([all],
enable_scribo=yes
enable_apps=yes
enable_tools=yes
enable_doc=yes
fi])
...
...
@@ -733,6 +741,7 @@ Swilena --enable-swilena $enable_swilena
-------------------------------------------------------------------------------
Apps --enable-apps $enable_apps
Tools --enable-tools $enable_tools
Doc --enable-doc $enable_doc
-------------------------------------------------------------------------------
...
...
milena/Makefile.am
View file @
ee02495a
...
...
@@ -15,7 +15,12 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
SUBDIRS
=
.
doc mesh tests
SUBDIRS
=
.
$(DOCDIR)
mesh tests
if
ENABLE_DOC
SUBDIRS
+=
doc
endif
ENABLE_DOC
if
ENABLE_APPS
SUBDIRS
+=
apps
...
...
scribo/Makefile.am
View file @
ee02495a
...
...
@@ -15,7 +15,12 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
SUBDIRS
=
demo doc tests src
SUBDIRS
=
demo
$(DOCDIR)
tests src
if
ENABLE_DOC
SUBDIRS
+=
doc
endif
ENABLE_DOC
.PHONY
:
bin
bin
:
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment