Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
7 changes: 0 additions & 7 deletions INSTALL
Original file line number Diff line number Diff line change
Expand Up @@ -83,13 +83,6 @@ $ ./configure --help
or
$ ./autogen.sh --help

BUILDING DOCUMENTATION
----------------------

Specify --enable-docs=all (or =pdf or =html) to build the documentation as well during compilation.

The necessary tools will be checked by the configure script.

INSTALLATION INSTRUCTIONS
-------------------------

Expand Down
12 changes: 1 addition & 11 deletions Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ LCOV_FLAGS = $(if $(filter-out 0,$(V)),,-q)

SUBDIRS = libcompat libutils libcfnet $(NOVA_LIB_SUBDIRS) libpromises \
$(NOVA_BIN_SUBDIRS) cf-agent cf-execd cf-gendoc cf-key cf-monitord \
cf-promises cf-runagent cf-serverd ext docs examples masterfiles \
cf-promises cf-runagent cf-serverd ext examples masterfiles \
tests $(ENTERPRISE_API_SUBDIR) $(CFMOD_SUBDIR) $(NOVA_DOC_SUBDIR) \
$(NOVA_SUBDIR)

Expand Down Expand Up @@ -67,16 +67,6 @@ install-data-local:
$(MKDIR_P) -m 700 $(DESTDIR)$(workdir)/ppkeys


#
# Documentation
#

html:
$(MAKE) -C docs $(AM_MAKEFLAGS) html

pdf:
$(MAKE) -C docs $(AM_MAKEFLAGS) pdf

#
# Code coverage
#
Expand Down
33 changes: 0 additions & 33 deletions configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -1019,33 +1019,6 @@ if test "x$use_coverage" = "xyes"; then
LDFLAGS="$LDFLAGS -lgcov"
fi

dnl
dnl Documentation generation
dnl

AC_ARG_ENABLE(docs, AC_HELP_STRING([--enable-docs=html|pdf|all],
[Enable generation of documentation in specified formats]),
[use_docs=$enableval], [use_docs=no])

if test "x$use_docs" != "xno"; then
if test "x$use_docs" = "xhtml" || test "x$use_docs" = "xall"; then
if test "$MAKEINFO" = "${am_missing_run}makeinfo"; then
AC_MSG_ERROR([makeinfo tool is required for HTML documentation generation])
fi
fi

if test "x$use_docs" = "xpdf" || test "x$use_docs" = "xall"; then
AC_CHECK_PROG(TEXI2PDF, texi2pdf, texi2pdf)

if test -z "$TEXI2PDF"; then
AC_MSG_ERROR([texi2pdf tool is required for PDF documentation generation])
fi
fi
fi

AM_CONDITIONAL(HTML_DOCS, test "x$use_docs" = "xhtml" || test "x$use_docs" = "xall")
AM_CONDITIONAL(PDF_DOCS, test "x$use_docs" = "xpdf" || test "x$use_docs" = "xall")

#
# Populate contents of config.post.h
#
Expand Down Expand Up @@ -1130,12 +1103,6 @@ AC_CONFIG_FILES([Makefile
cf-runagent/Makefile
cf-serverd/Makefile
ext/Makefile
docs/Makefile
docs/guides/Makefile
docs/manpages/Makefile
docs/reference/Makefile
docs/tools/Makefile
docs/tex-include/Makefile
examples/Makefile
masterfiles/Makefile
tests/Makefile
Expand Down
10 changes: 1 addition & 9 deletions docs/Makefile.am
Original file line number Diff line number Diff line change
@@ -1,9 +1 @@
SUBDIRS = manpages tools guides reference tex-include

html:
$(MAKE) -C guides $(AM_MAKEFLAGS) html
$(MAKE) -C reference $(AM_MAKEFLAGS) html

pdf:
$(MAKE) -C guides $(AM_MAKEFLAGS) pdf
$(MAKE) -C reference $(AM_MAKEFLAGS) pdf
SUBDIRS = manpages
68 changes: 0 additions & 68 deletions docs/STYLE.md

This file was deleted.

Binary file removed docs/guides/BDMA_model.png
Binary file not shown.
Binary file removed docs/guides/CFEngineFrontPage.pdf
Binary file not shown.
Loading