[PPL-devel] [GIT] ppl/ppl(master): New configuration option `--disable-documentation'.
Roberto Bagnara
bagnara at cs.unipr.it
Sun Jun 12 10:53:51 CEST 2011
Module: ppl/ppl
Branch: master
Commit: daba0d9b281e8c1881fafd335184cc3f8313754b
URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=daba0d9b281e8c1881fafd335184cc3f8313754b
Author: Roberto Bagnara <bagnara at cs.unipr.it>
Date: Sun Jun 12 10:53:36 2011 +0200
New configuration option `--disable-documentation'.
---
NEWS | 4 ++++
Watchdog/configure.ac | 19 +++++++++++++++++++
Watchdog/doc/Makefile.am | 21 ++++++++++++++++++---
configure.ac | 18 ++++++++++++++++++
doc/Makefile.am | 21 ++++++++++++++++++---
5 files changed, 77 insertions(+), 6 deletions(-)
diff --git a/NEWS b/NEWS
index efa276a..8d7d78c 100644
--- a/NEWS
+++ b/NEWS
@@ -16,6 +16,10 @@ NEWS for version 0.12 (release date to be decided)
New and Changed Features
========================
+o New configuration option `--disable-documentation'. When specified
+ no new documentation is built: only the documentation already present
+ in the source tree is installed upon `make install'.
+
o The resolution process for PIP_Problem now better exploits the
integrality of parameters to simplify the newly generated tautological
constraints, the splitting constraints of decision nodes, and the
diff --git a/Watchdog/configure.ac b/Watchdog/configure.ac
index f7ce496..b791f9a 100644
--- a/Watchdog/configure.ac
+++ b/Watchdog/configure.ac
@@ -355,6 +355,25 @@ esac
AC_MSG_RESULT($build_watchdog_library)
AM_CONDITIONAL(BUILD_WATCHDOG_LIBRARY, test x"$build_watchdog_library" = xyes)
+enableval=yes
+AC_MSG_CHECKING([whether to build the PWL documentation])
+AC_ARG_ENABLE(documentation,
+ AS_HELP_STRING([--enable-documentation], [build the PWL documentation]))
+case "${enableval}" in
+yes)
+ AC_MSG_RESULT(yes)
+ ;;
+no)
+ AC_MSG_RESULT(no)
+ ;;
+*)
+ AC_MSG_ERROR([bad value ${enableval} for --enable-documentation, needs yes or no])
+ ;;
+esac
+build_documentation=$enableval
+AM_CONDITIONAL(BUILD_DOCUMENTATION, test x"$build_documentation" = xyes)
+
+
if test x"$build_watchdog_library" = xyes
then
# Checks for header files.
diff --git a/Watchdog/doc/Makefile.am b/Watchdog/doc/Makefile.am
index db20a64..00bf544 100644
--- a/Watchdog/doc/Makefile.am
+++ b/Watchdog/doc/Makefile.am
@@ -144,10 +144,23 @@ uninstall-pdf \
uninstall-ps \
uninstall-txt
+
+if BUILD_DOCUMENTATION
+
+CONTINUE_IF_NO_DOC = true
+
+else !BUILD_DOCUMENTATION
+
+CONTINUE_IF_NO_DOC = continue
+
+endif !BUILD_DOCUMENTATION
+
+
# Installation and uninstallation of HTML documentation.
install-html:
for ball in $(DIST_HTML_DOCS); do \
- test -f $$ball || test -f $(srcdir)/$$ball || $(MAKE) $$ball; \
+ test -f $$ball || test -f $(srcdir)/$$ball \
+ || $(CONTINUE_IF_NO_DOC) || $(MAKE) $$ball; \
dir=`basename $$ball .tar.gz`; \
$(mkinstalldirs) $(DESTDIR)$(htmldir)/$$dir; \
gunzip -c `if test -f $$ball; then echo .; else echo $(srcdir); fi`/$$ball | tar xf - ; \
@@ -172,7 +185,8 @@ uninstall-html:
install-pdf:
$(mkinstalldirs) $(DESTDIR)$(pdfdir)
for file in $(DIST_PDF_DOCS); do \
- test -f $$file || test -f $(srcdir)/$$file || $(MAKE) $$file; \
+ test -f $$file || test -f $(srcdir)/$$file \
+ || $(CONTINUE_IF_NO_DOC) || $(MAKE) $$file; \
$(INSTALL_DATA) `if test -f $$file; then echo .; else echo $(srcdir); fi`/$$file $(DESTDIR)$(pdfdir)/$$file; \
done
@@ -189,7 +203,8 @@ uninstall-pdf:
install-ps: install-pdf
$(mkinstalldirs) $(DESTDIR)$(psdir)
for file in $(DIST_PS_DOCS); do \
- test -f $$file || test -f $(srcdir)/$$file || $(MAKE) $$file; \
+ test -f $$file || test -f $(srcdir)/$$file \
+ || $(CONTINUE_IF_NO_DOC) || $(MAKE) $$file; \
$(INSTALL_DATA) `if test -f $$file; then echo .; else echo $(srcdir); fi`/$$file $(DESTDIR)$(psdir)/$$file; \
done
diff --git a/configure.ac b/configure.ac
index 32a7756..ae70865 100644
--- a/configure.ac
+++ b/configure.ac
@@ -860,6 +860,24 @@ esac
build_ppl_pips=$enableval
AM_CONDITIONAL(BUILD_PPL_PIPS, test x"$build_ppl_pips" = xyes)
+enableval=yes
+AC_MSG_CHECKING([whether to build the PPL documentation])
+AC_ARG_ENABLE(documentation,
+ AS_HELP_STRING([--enable-documentation], [build the PPL documentation]))
+case "${enableval}" in
+yes)
+ AC_MSG_RESULT(yes)
+ ;;
+no)
+ AC_MSG_RESULT(no)
+ ;;
+*)
+ AC_MSG_ERROR([bad value ${enableval} for --enable-documentation, needs yes or no])
+ ;;
+esac
+build_documentation=$enableval
+AM_CONDITIONAL(BUILD_DOCUMENTATION, test x"$build_documentation" = xyes)
+
# Define lists of available interfaces: lowercase and blank-separated.
non_prolog_interfaces="cxx c ocaml java"
prolog_interfaces="ciao_prolog gnu_prolog sicstus_prolog swi_prolog xsb_prolog yap_prolog"
diff --git a/doc/Makefile.am b/doc/Makefile.am
index 398fead..1eb82ac 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -721,10 +721,23 @@ uninstall-pdf \
uninstall-ps \
uninstall-txt
+
+if BUILD_DOCUMENTATION
+
+CONTINUE_IF_NO_DOC = true
+
+else !BUILD_DOCUMENTATION
+
+CONTINUE_IF_NO_DOC = continue
+
+endif !BUILD_DOCUMENTATION
+
+
# Installation and uninstallation of HTML documentation.
install-html:
for ball in $(INSTALL_HTML_DOCS); do \
- test -f $$ball || test -f $(srcdir)/$$ball || $(MAKE) $$ball; \
+ test -f $$ball || test -f $(srcdir)/$$ball \
+ || $(CONTINUE_IF_NO_DOC) || $(MAKE) $$ball; \
dir=`basename $$ball .tar.gz`; \
$(mkinstalldirs) $(DESTDIR)$(htmldir)/$$dir; \
gunzip -c `if test -f $$ball; then echo .; else echo $(srcdir); fi`/$$ball | tar xf - ; \
@@ -756,7 +769,8 @@ uninstall-html:
install-pdf:
$(mkinstalldirs) $(DESTDIR)$(pdfdir)
for file in $(INSTALL_PDF_DOCS); do \
- test -f $$file || test -f $(srcdir)/$$file || $(MAKE) $$file; \
+ test -f $$file || test -f $(srcdir)/$$file \
+ || $(CONTINUE_IF_NO_DOC) || $(MAKE) $$file; \
$(INSTALL_DATA) `if test -f $$file; then echo .; else echo $(srcdir); fi`/$$file $(DESTDIR)$(pdfdir)/$$file; \
done
@@ -775,7 +789,8 @@ uninstall-pdf:
install-ps: install-pdf
$(mkinstalldirs) $(DESTDIR)$(psdir)
for file in $(INSTALL_PS_DOCS); do \
- test -f $$file || test -f $(srcdir)/$$file || $(MAKE) $$file; \
+ test -f $$file || test -f $(srcdir)/$$file \
+ || $(CONTINUE_IF_NO_DOC) || $(MAKE) $$file; \
$(INSTALL_DATA) `if test -f $$file; then echo .; else echo $(srcdir); fi`/$$file $(DESTDIR)$(psdir)/$$file; \
done
More information about the PPL-devel
mailing list