diff options
| author | Lennart Poettering <lennart@poettering.net> | 2005-08-24 22:43:54 +0000 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2005-08-24 22:43:54 +0000 |
| commit | 6ef503e1e642082a3024ce8a33dcca378987b8e8 (patch) | |
| tree | fed81b0d3fa382f64ff20b4778ba8254401fd517 | |
| parent | 45f27583e2d6e4a9d8f491e6413ee39e3fa785fb (diff) | |
* merge patch from trent lloyd
git-svn-id: file:///home/lennart/svn/public/libdaemon/trunk@87 153bfa13-eec0-0310-be40-b0cb6a0e1b4b
| -rw-r--r-- | Makefile.am | 12 | ||||
| -rwxr-xr-x | bootstrap.sh | 8 | ||||
| -rw-r--r-- | doc/Makefile.am | 6 | ||||
| -rw-r--r-- | examples/testd.c | 3 |
4 files changed, 20 insertions, 9 deletions
diff --git a/Makefile.am b/Makefile.am index 061d70e..8ac5005 100644 --- a/Makefile.am +++ b/Makefile.am @@ -16,19 +16,25 @@ # along with libdaemon; if not, write to the Free Software Foundation, # Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. -EXTRA_DIST=bootstrap.sh README LICENSE libdaemon.spec +EXTRA_DIST=bootstrap.sh LICENSE libdaemon.spec SUBDIRS=libdaemon doc examples -MAINTAINERCLEANFILES = README libdaemon.spec -noinst_DATA = README libdaemon.spec +MAINTAINERCLEANFILES = libdaemon.spec +noinst_DATA = libdaemon.spec pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = libdaemon.pc +if USE_LYNX +noinst_DATA += README +EXTRA_DIST += README +MAINTAINERCLEANFILES += README + README: rm -f README $(MAKE) -C doc README ln -s doc/README README +endif doxygen: $(MAKE) -C doc doxygen diff --git a/bootstrap.sh b/bootstrap.sh index 5fddd25..42bcffe 100755 --- a/bootstrap.sh +++ b/bootstrap.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/sh # $Id$ # This file is part of libdaemon. @@ -27,7 +27,7 @@ run_versioned() { if [ "x$1" = "xam" ] ; then set -ex - run_versioned automake 1.7 -a -c + run_versioned automake 1.9 -a -c ./config.status else set -ex @@ -35,10 +35,10 @@ else rm -rf autom4te.cache rm -f config.cache - run_versioned aclocal 1.7 + run_versioned aclocal 1.9 libtoolize -c --force autoheader - run_versioned automake 1.7 -a -c + run_versioned automake 1.9 -a -c autoconf -Wall ./configure --sysconfdir=/etc "$@" diff --git a/doc/Makefile.am b/doc/Makefile.am index bc5b2c9..ef8c6ca 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -16,10 +16,10 @@ # 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 +noinst_DATA = README.html EXTRA_DIST = $(noinst_DATA) style.css README.html.in -MAINTAINERCLEANFILES = README README.html +MAINTAINERCLEANFILES = README.html CLEANFILES = doxygen: doxygen.conf @@ -29,6 +29,8 @@ maintainer-clean-local: rm -rf reference if USE_LYNX +noinst_DATA += README +MAINTAINERCLEANFILES += README README: README.html lynx --dump $^ | sed 's,file://localhost/.*/doc/README.html,README,' | sed 's,file://localhost/.*/doc/reference/,reference/,' > $@ diff --git a/examples/testd.c b/examples/testd.c index 7d97f6c..2402120 100644 --- a/examples/testd.c +++ b/examples/testd.c @@ -21,6 +21,9 @@ #include <signal.h> #include <errno.h> #include <string.h> +#include <sys/types.h> +#include <sys/time.h> +#include <sys/unistd.h> #include <sys/select.h> #include <libdaemon/dfork.h> |