Commit 993357e9 authored by yoogx's avatar yoogx
Browse files

* Adjustments for distcheck if no doc is built

parent 0ef3564f
...@@ -2,7 +2,7 @@ ACLOCAL_AMFLAGS = -I support ...@@ -2,7 +2,7 @@ ACLOCAL_AMFLAGS = -I support
AUTOMAKE_OPTIONS = no-dependencies AUTOMAKE_OPTIONS = no-dependencies
CLEANFILES = config-stamp svn-commit*.tmp* *~ CLEANFILES = config-stamp svn-commit*.tmp* *~
SUBDIRS = src support tools share include @DOC_DIR@ SUBDIRS = src support tools share include doc
DIST_SUBDIRS = $(SUBDIRS) examples DIST_SUBDIRS = $(SUBDIRS) examples
check-local:: examples check-local:: examples
......
...@@ -144,16 +144,16 @@ AC_SUBST(CYGPATH_U) ...@@ -144,16 +144,16 @@ AC_SUBST(CYGPATH_U)
AC_CHECK_PROGS(TEXI2HTML, texi2html) AC_CHECK_PROGS(TEXI2HTML, texi2html)
DOC_DIR= DOC_TARGETS=
AC_ARG_ENABLE(doc, AC_ARG_ENABLE(doc,
[ --enable-doc Build documentation [default=no]], [ --enable-doc Build documentation [default=no]],
[if [[ "$enableval" = "yes" ]]; then [if [[ "$enableval" = "yes" ]]; then
DOC_DIR=doc DOC_TARGETS=docs
fi], fi],
[]) [])
AC_SUBST(DOC_DIR) AC_SUBST(DOC_TARGETS)
############################################################### ###############################################################
# Force the installation prefix to be equal to the Ocarina one # Force the installation prefix to be equal to the Ocarina one
......
...@@ -55,7 +55,9 @@ polyorb_hi_c_ug_TEXINFOS = $(GUIDE_TEXIFILES) ...@@ -55,7 +55,9 @@ polyorb_hi_c_ug_TEXINFOS = $(GUIDE_TEXIFILES)
SUFFIXES = .c .h .aadl .texi .sed .pdf .html SUFFIXES = .c .h .aadl .texi .sed .pdf .html
all-local: $(GUIDE_TEXIFILES) $(GUIDE).html $(GUIDE).pdf docs: $(GUIDE_TEXIFILES) $(GUIDE).html $(GUIDE).pdf
all-local: @DOC_TARGETS@
############################################################################### ###############################################################################
# The target below are active only in developper mode. In package # The target below are active only in developper mode. In package
...@@ -149,7 +151,8 @@ install-data-local: all ...@@ -149,7 +151,8 @@ install-data-local: all
for f in $(builddir)/$(GUIDE).html/fig/*.png; do \ for f in $(builddir)/$(GUIDE).html/fig/*.png; do \
$(INSTALL_DATA) $$f $(DESTDIR)$(po_hi_doc_dir)/$(GUIDE).html/fig; \ $(INSTALL_DATA) $$f $(DESTDIR)$(po_hi_doc_dir)/$(GUIDE).html/fig; \
done; \ done; \
else \ fi
if [ -r $(srcdir)/$(GUIDE).pdf ]; then \
$(INSTALL_DATA) $(srcdir)/$(GUIDE).pdf $(DESTDIR)$(po_hi_doc_dir); \ $(INSTALL_DATA) $(srcdir)/$(GUIDE).pdf $(DESTDIR)$(po_hi_doc_dir); \
for f in $(srcdir)/$(GUIDE).html/*.html; do \ for f in $(srcdir)/$(GUIDE).html/*.html; do \
$(INSTALL_DATA) $$f $(DESTDIR)$(po_hi_doc_dir)/$(GUIDE).html; \ $(INSTALL_DATA) $$f $(DESTDIR)$(po_hi_doc_dir)/$(GUIDE).html; \
......
#include <drivers/configuration/ip.h> #include <drivers/configuration/ip.h>
__po_hi_c_ip_conf_t pohidrv_device_a = { "eth0", "127.0.0.1", __po_hi_c_ipv4, 1234}; __po_hi_c_ip_conf_t pohidrv_device_a = { "eth0", "127.0.0.1", "","","","",__po_hi_c_ipv4, 1234};
__po_hi_c_ip_conf_t pohidrv_device_b = { "eth0", "127.0.0.1", __po_hi_c_ipv4, 1235}; __po_hi_c_ip_conf_t pohidrv_device_b = { "eth0", "127.0.0.1", "","","","",__po_hi_c_ipv4, 1235};
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