diff options
author | Lennart Poettering <lennart@poettering.net> | 2004-12-18 23:27:16 +0000 |
---|---|---|
committer | Lennart Poettering <lennart@poettering.net> | 2004-12-18 23:27:16 +0000 |
commit | 46be51bbc763d02922da18b1b3d7946aba9ab4ea (patch) | |
tree | 06fc54a8ddd5dbfb9e9bfee209a935043b4c4b48 | |
parent | c73f5e4e6922363cc7cbf4f39f236e310845f9b9 (diff) |
* don't build doxygen docs by default
git-svn-id: file:///home/lennart/svn/public/libdaemon/trunk@70 153bfa13-eec0-0310-be40-b0cb6a0e1b4b
-rw-r--r-- | Makefile.am | 3 | ||||
-rw-r--r-- | configure.ac | 19 | ||||
-rw-r--r-- | doc/Makefile.am | 18 | ||||
-rw-r--r-- | src/daemon.h | 12 | ||||
-rw-r--r-- | src/dexec.h | 2 |
5 files changed, 13 insertions, 41 deletions
diff --git a/Makefile.am b/Makefile.am index e9f2505..379769e 100644 --- a/Makefile.am +++ b/Makefile.am @@ -30,6 +30,9 @@ README: $(MAKE) -C doc README ln -s doc/README README +doxygen: + $(MAKE) -C doc doxygen + homepage: test -d $$HOME/homepage/private mkdir -p $$HOME/homepage/private/projects/libdaemon diff --git a/configure.ac b/configure.ac index 0a7437e..8879e24 100644 --- a/configure.ac +++ b/configure.ac @@ -68,25 +68,6 @@ AC_FUNC_SETPGRP AC_TYPE_SIGNAL AC_TYPE_SIZE_T -# DOXYGEN documentation generation -AC_ARG_ENABLE(doxygen, - AS_HELP_STRING(--disable-doxygen,Turn off doxygen usage for documentation generation), -[case "${enableval}" in - yes) doxygen=yes ;; - no) doxygen=no ;; - *) AC_MSG_ERROR(bad value ${enableval} for --disable-doxygen) ;; -esac],[doxygen=yes]) - -if test x$doxygen = xyes ; then - AC_CHECK_PROG(have_doxygen, doxygen, yes, no) - - if test x$have_doxygen = xno ; then - AC_MSG_ERROR([*** Sorry, you have to install doxygen or use --disable-doxygen ***]) - fi -fi - -AM_CONDITIONAL([USE_DOXYGEN], [test "x$doxygen" = xyes]) - # LYNX documentation generation AC_ARG_ENABLE(lynx, AS_HELP_STRING(--disable-lynx,Turn off lynx usage for documentation generation), diff --git a/doc/Makefile.am b/doc/Makefile.am index adab9fc..bc5b2c9 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -16,24 +16,17 @@ # along with libdaemon; if not, write to the Free Software Foundation, # Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. -noinst_DATA = README.html README reference -EXTRA_DIST = $(noinst_DATA) style.css README.html.in reference +noinst_DATA = README.html README +EXTRA_DIST = $(noinst_DATA) style.css README.html.in MAINTAINERCLEANFILES = README README.html CLEANFILES = -if USE_DOXYGEN -reference: doxygen.conf +doxygen: doxygen.conf doxygen doxygen.conf - touch reference - -doxygen: - touch doxygen.conf - $(MAKE) reference maintainer-clean-local: rm -rf reference -endif if USE_LYNX README: README.html @@ -45,9 +38,4 @@ endif tidy: README.html tidy -e < README.html -if USE_DOXYGEN .PHONY: doxygen tidy -else -.PHONY: tidy -endif - diff --git a/src/daemon.h b/src/daemon.h index 405b4f9..eca859c 100644 --- a/src/daemon.h +++ b/src/daemon.h @@ -26,11 +26,11 @@ * A header file including all other header files part of libdaemon */ -#include "dfork.h" -#include "dlog.h" -#include "dpid.h" -#include "dsignal.h" -#include "dexec.h" -#include "dnonblock.h" +#include <dfork.h> +#include <dlog.h> +#include <dpid.h> +#include <dsignal.h> +#include <dexec.h> +#include <dnonblock.h> #endif diff --git a/src/dexec.h b/src/dexec.h index 831cb9d..d15d49c 100644 --- a/src/dexec.h +++ b/src/dexec.h @@ -31,7 +31,7 @@ extern "C" { * STDERR redirected to syslog */ -/** If this variable is defined to 1 iff daemon_pid_file_kill_wait() is supported.*/ +/** If this variable is defined to 1 iff daemon_exec() is supported.*/ #define DAEMON_EXEC_AVAILABLE 1 /** Run the specified executable with the specified arguments in the |