From f8086b037dec60a82aa6890f19dbc3f73af46c98 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Mon, 21 Aug 2006 23:34:46 +0000 Subject: [PATCH] build docs for avahi-core only if --enable-core-docs was passed to configure. Build GLIb docs only when glib is enabled, same for qt3/qt4 git-svn-id: file:///home/lennart/svn/public/avahi/trunk@1253 941a03a8-eaeb-0310-b9a0-b1bbd8fe43fe --- Makefile.am | 46 +++++++++++++++++++++++++++++------------ avahi-client/client.h | 3 --- avahi-glib/glib-watch.h | 3 +++ configure.ac | 11 ++++++++++ 4 files changed, 47 insertions(+), 16 deletions(-) diff --git a/Makefile.am b/Makefile.am index 3c75e1e..d09f75a 100644 --- a/Makefile.am +++ b/Makefile.am @@ -71,33 +71,53 @@ SUBDIRS = \ DX_INPUT = \ - $(srcdir)/avahi-core/core.h \ - $(srcdir)/avahi-core/lookup.h \ - $(srcdir)/avahi-core/publish.h \ $(srcdir)/avahi-common/address.h \ - $(srcdir)/avahi-core/rr.h \ $(srcdir)/avahi-common/strlst.h \ $(srcdir)/avahi-common/alternative.h \ - $(srcdir)/avahi-core/log.h \ $(srcdir)/avahi-common/defs.h \ - $(srcdir)/avahi-client/client.h \ - $(srcdir)/avahi-client/lookup.h \ - $(srcdir)/avahi-client/publish.h \ $(srcdir)/avahi-common/error.h \ $(srcdir)/avahi-common/malloc.h \ $(srcdir)/avahi-common/domain.h \ $(srcdir)/avahi-common/watch.h \ $(srcdir)/avahi-common/simple-watch.h \ $(srcdir)/avahi-common/thread-watch.h \ - $(srcdir)/avahi-glib/glib-watch.h \ - $(srcdir)/avahi-glib/glib-malloc.h \ - $(srcdir)/avahi-common/timeval.h \ - $(srcdir)/avahi-qt/qt-watch.h + $(srcdir)/avahi-common/timeval.h DX_EXAMPLE_PATH = $(srcdir)/examples - DX_EXAMPLE_PATTERNS = *.c +if HAVE_QT3 +DX_INPUT += \ + $(srcdir)/avahi-qt/qt-watch.h +else +if HAVE_QT4 +DX_INPUT += \ + $(srcdir)/avahi-qt/qt-watch.h +endif +endif + +if HAVE_GLIB +DX_INPUT += \ + $(srcdir)/avahi-glib/glib-watch.h \ + $(srcdir)/avahi-glib/glib-malloc.h +endif + +if HAVE_DBUS +DX_INPUT += \ + $(srcdir)/avahi-client/client.h \ + $(srcdir)/avahi-client/lookup.h \ + $(srcdir)/avahi-client/publish.h +endif + +if ENABLE_CORE_DOCS +DX_INPUT += \ + $(srcdir)/avahi-core/core.h \ + $(srcdir)/avahi-core/lookup.h \ + $(srcdir)/avahi-core/publish.h \ + $(srcdir)/avahi-core/rr.h \ + $(srcdir)/avahi-core/log.h +endif + pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = avahi-core.pc diff --git a/avahi-client/client.h b/avahi-client/client.h index 16fde91..e15c130 100644 --- a/avahi-client/client.h +++ b/avahi-client/client.h @@ -33,9 +33,6 @@ /** \file client.h Definitions and functions for the client API over D-Bus */ -/** \example glib-integration.c Example of how to integrate - * avahi use with GLIB/GTK applications */ - AVAHI_C_DECL_BEGIN /** A connection context */ diff --git a/avahi-glib/glib-watch.h b/avahi-glib/glib-watch.h index 0abc291..6035cf8 100644 --- a/avahi-glib/glib-watch.h +++ b/avahi-glib/glib-watch.h @@ -24,6 +24,9 @@ /** \file glib-watch.h GLib main loop adapter */ +/** \example yglib-integration.c Example of how to integrate + * avahi use with GLIB/GTK applications */ + #include #include diff --git a/configure.ac b/configure.ac index ae38e5b..deac981 100644 --- a/configure.ac +++ b/configure.ac @@ -709,6 +709,16 @@ DX_PDF_FEATURE(OFF) DX_PS_FEATURE(OFF) DX_INIT_DOXYGEN(avahi, doxygen.cfg, doxygen) +AC_ARG_ENABLE(core-docs, + AS_HELP_STRING([--enable-core-docs],[Enable building of documentation for avahi-core]), +[case "${enableval}" in + yes) ENABLE_CORE_DOCS=yes ;; + no) ENABLE_CORE_DOCS=no ;; + *) AC_MSG_ERROR([bad value ${enableval} for --enable-core-docs]) ;; +esac],[ENABLE_CORE_DOCS=no]) + +AM_CONDITIONAL([ENABLE_CORE_DOCS], [test "x$ENABLE_CORE_DOCS" = xyes]) + # # Build and Install man pages # @@ -902,4 +912,5 @@ echo "\ Building avahi-compat-libdns_sd: ${ENABLE_COMPAT_LIBDNS_SD} Building avahi-compat-howl: ${ENABLE_COMPAT_HOWL} Building tests: ${ENABLE_TESTS} + Building avahi-core documentation: ${ENABLE_CORE_DOCS} " -- 2.39.5