Commit b5fb8b48 authored by jhugues's avatar jhugues

* Propagate --enable-doc flag to runtimes

git-svn-id: https://tecsw.estec.esa.int/svn/taste/trunk/ocarina@6218 129961e7-ef38-4bb5-a8f7-c9a525a55882
parent 71831dd4
......@@ -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
......
......@@ -5,6 +5,8 @@ property set Taste is
(system, package, device, memory, processor, process, access,
subprogram access, connection, bus, virtual bus);
HWLibraries : list of aadlstring applies to(package);
Data_Transport : enumeration (legacy,asn1) applies to (device, abstract);
Importance: enumeration (low, medium, high) applies to (system, subprogram access, access);
......
......@@ -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 \
......
......@@ -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,7 +76,7 @@ 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) \
$${s_dir}/$${r_dir}/configure $(DEBUG_FLAG) $(DOC_FLAG) \
--with-ocarina-prefix='$(prefix)' --disable-ocarina-version-check
maybe-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
################################################################################
......
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