Commit 92b0aff3 authored by yoogx's avatar yoogx

* Propagate --enable-doc flag to runtimes

parent 71831dd4
......@@ -31,7 +31,7 @@ AC_CHECK_PROG(GNATLS, gnatls, gnatls)
AC_EXEEXT
AM_PATH_PYTHON
dnl we need a GNU flavoured sed
dnl we need a GNU flavoured sed
AC_CHECK_PROG(HAVE_GNUSED,gnused,yes,no)
AC_CHECK_PROG(HAVE_GSED,gsed,yes,no)
AC_CHECK_PROG(HAVE_SED,sed,yes,no)
......@@ -232,7 +232,7 @@ AS_HELP_STRING([--with-ocarina-runtimes=x], [enumerate runtimes]),
AM_CONDITIONAL(PO_HI_C, false)
AM_CONDITIONAL(PO_QOS_ADA, false)
;;
pok )
if test -d ${root}/resources/runtime/${R}
then
......@@ -367,15 +367,18 @@ AC_SUBST(CYGPATH_U)
AC_CHECK_PROGS(TEXI2HTML, texi2html)
DOC_DIR=
DOC_FLAG=
AC_ARG_ENABLE(doc,
[ --enable-doc Build documentation [default=no]],
[if [[ "$enableval" = "yes" ]]; then
DOC_DIR=doc
DOC_FLAG=--enable-doc
fi],
[])
AC_SUBST(DOC_DIR)
AC_SUBST(DOC_FLAG)
##########################################
# Output generated files
......@@ -383,7 +386,7 @@ AC_SUBST(DOC_DIR)
dnl Important! One file per line, nothing before
dnl or after except whitespace! This section
dnl may, one day, be edited automatically to remove
dnl may, one day, be edited automatically to remove
dnl some entries.
AC_OUTPUT([
......
......@@ -59,7 +59,7 @@ install-data-local:
$(INSTALL_DATA) $$file $(DESTDIR)$(datadir)/ocarina/AADLv1 || exit 1; \
done
rm -f $(DESTDIR)$(datadir)/ocarina/AADLv2/ocarina_components.aadl
for file in ./AADLv2/components/*.aadl; do \
for file in $(srcdir)/AADLv2/components/*.aadl; do \
cat $$file >> $(DESTDIR)$(datadir)/ocarina/AADLv2/ocarina_components.aadl || exit 1; \
done
for file in $(srcdir)/AADLv2/components/devices/*.aadl; do \
......
......@@ -41,7 +41,7 @@ reconfig-polyorb-qos-ada:
maybe-configure-pok:
@POK_TRUE@maybe-configure-pok: configure-pok
configure-pok:
configure-pok:
r_dir='pok'; \
test -f $${r_dir}/Makefile || exit 0; \
cd $${r_dir} && $(MAKE) configure
......@@ -54,7 +54,7 @@ configure-polyorb-hi-ada: reconfig-polyorb-hi-ada
test -f $${r_dir}/Makefile && exit 0 || true; \
test -x $(srcdir)/$${r_dir}/configure || exit 0; \
$(mkdir_p) $${r_dir} && cd $${r_dir} || exit 1; \
$${s_dir}/$${r_dir}/configure $(DEBUG_FLAG) \
$${s_dir}/$${r_dir}/configure $(DEBUG_FLAG) $(DOC_FLAG) \
--with-ocarina-prefix='$(prefix)' --disable-ocarina-version-check
maybe-configure-polyorb-hi-c:
......@@ -65,7 +65,7 @@ configure-polyorb-hi-c: reconfig-polyorb-hi-c
test -f $${r_dir}/Makefile && exit 0 || true; \
test -x $(srcdir)/$${r_dir}/configure || exit 0; \
$(mkdir_p) $${r_dir} && cd $${r_dir} || exit 1; \
$${s_dir}/$${r_dir}/configure $(DEBUG_FLAG) \
$${s_dir}/$${r_dir}/configure $(DEBUG_FLAG) $(DOC_FLAG) \
--with-ocarina-prefix='$(prefix)' --disable-ocarina-version-check
maybe-configure-polyorb-hi-java:
......@@ -76,8 +76,8 @@ configure-polyorb-hi-java: reconfig-polyorb-hi-java
test -f $${r_dir}/Makefile && exit 0 || true; \
test -x $(srcdir)/$${r_dir}/configure || exit 0; \
$(mkdir_p) $${r_dir} && cd $${r_dir} || exit 1; \
$${s_dir}/$${r_dir}/configure $(DEBUG_FLAG) \
--with-ocarina-prefix='$(prefix)' --disable-ocarina-version-check
$${s_dir}/$${r_dir}/configure $(DEBUG_FLAG) $(DOC_FLAG) \
--with-ocarina-prefix='$(prefix)' --disable-ocarina-version-check
maybe-configure-polyorb-qos-ada:
@PO_QOS_ADA_TRUE@maybe-configure-polyorb-qos-ada: configure-polyorb-qos-ada
......@@ -87,7 +87,7 @@ configure-polyorb-qos-ada: reconfig-polyorb-qos-ada
test -f $${r_dir}/Makefile && exit 0 || true; \
test -x $(srcdir)/$${r_dir}/configure || exit 0; \
$(mkdir_p) $${r_dir} && cd $${r_dir} || exit 1; \
$${s_dir}/$${r_dir}/configure $(DEBUG_FLAG) \
$${s_dir}/$${r_dir}/configure $(DEBUG_FLAG) $(DOC_FLAG) \
--with-ocarina-prefix='$(prefix)' --disable-ocarina-version-check
################################################################################
......@@ -353,7 +353,7 @@ dist-polyorb-hi-ada: configure-polyorb-hi-ada
maybe-dist-polyorb-hi-c:
@PO_HI_C_TRUE@maybe-dist-polyorb-hi-c: dist-polyorb-hi-c
dist-polyorb-hi-c: configure-polyorb-hi-c
dist-polyorb-hi-c: configure-polyorb-hi-c
r_dir='polyorb-hi-c'; \
d_dir='polyorb-hi-c-dist'; \
test -f $${r_dir}/Makefile || exit 0; \
......@@ -400,7 +400,7 @@ dvi: \
maybe-dvi-polyorb-hi-ada \
maybe-dvi-polyorb-hi-c \
maybe-dvi-polyorb-hi-java \
maybe-dvi-polyorb-qos-ada
maybe-dvi-polyorb-qos-ada
install-data-local: \
maybe-install-polyorb-hi-ada \
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment