diff options
| author | Trent Lloyd <lathiat@bur.st> | 2005-06-07 14:18:20 +0000 |
|---|---|---|
| committer | Trent Lloyd <lathiat@bur.st> | 2005-06-07 14:18:20 +0000 |
| commit | 1f2b8ac4ae09b15a0a6d1f7633f888654fd271dd (patch) | |
| tree | 2dee241973ca232da09865cc3833fc7eb642b808 | |
| parent | a355be1c7ab89eb0ace82ce703b37ff30e081492 (diff) | |
* Patch by ross burton to allow make dist to pass (Closes: #3480)
* Move to doxygen in the default build, make --enable-doxygen=no to bypass, this also makes distcheck pass
git-svn-id: file:///home/lennart/svn/public/avahi/trunk@106 941a03a8-eaeb-0310-b9a0-b1bbd8fe43fe
| -rw-r--r-- | Makefile.am | 4 | ||||
| -rw-r--r-- | avahi-core/Makefile.am | 4 | ||||
| -rw-r--r-- | configure.ac | 11 | ||||
| -rw-r--r-- | doxygen/Makefile.am | 4 |
4 files changed, 20 insertions, 3 deletions
diff --git a/Makefile.am b/Makefile.am index d95030c..7de82c2 100644 --- a/Makefile.am +++ b/Makefile.am @@ -17,8 +17,8 @@ # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 # USA. -EXTRA_DIST = bootstrap.sh LICENSE doxygen/Makefile.am doxygen/Makefile.in doxygen/doxygen.conf.in libtool.m4 -SUBDIRS = avahi-common avahi-core avahi-discover avahi-client avahi-daemon +EXTRA_DIST = bootstrap.sh LICENSE doxygen/Makefile.am doxygen/Makefile.in doxygen/doxygen.conf.in +SUBDIRS = avahi-common avahi-core avahi-discover avahi-client avahi-daemon doxygen pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = avahi-core.pc diff --git a/avahi-core/Makefile.am b/avahi-core/Makefile.am index 6920e8c..6fb0839 100644 --- a/avahi-core/Makefile.am +++ b/avahi-core/Makefile.am @@ -65,7 +65,9 @@ libavahi_core_la_SOURCES = \ browse-service-type.c \ browse-service.c \ resolve-service.c \ - dns.c dns.h + dns.c dns.h \ + core.h \ + llist.h prioq_test_SOURCES = \ prioq-test.c \ diff --git a/configure.ac b/configure.ac index e17692d..b5492c5 100644 --- a/configure.ac +++ b/configure.ac @@ -89,6 +89,17 @@ if test "x$ENABLE_GTK" = "xyes"; then fi AM_CONDITIONAL(ENABLE_GTK, test "x$ENABLE_GTK" = "xyes") +AC_ARG_ENABLE(doxygen, + AC_HELP_STRING([--enable-doxygen],[use doxygen to generate API docs (default=yes)]), + [case "${enableval}" in + yes) ENABLE_DOXYGEN=yes ;; + no) ENABLE_DOXYGEN=no ;; + *) AC_MSG_ERROR(bad value ${enableval} for --enable-gtk) ;; + esac], + [ENABLE_DOXYGEN=yes]) dnl Default value + +AM_CONDITIONAL(ENABLE_DOXYGEN, test "x$ENABLE_DOXYGEN" = "xyes") + # If using GCC specify some additional parameters if test "x$GCC" = "xyes" ; then CFLAGS="$CFLAGS -pipe -W -Wall -pedantic" diff --git a/doxygen/Makefile.am b/doxygen/Makefile.am index 4d085ef..caf338e 100644 --- a/doxygen/Makefile.am +++ b/doxygen/Makefile.am @@ -17,6 +17,10 @@ # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 # USA. +if ENABLE_DOXYGEN +all: doxygen +endif + doxygen: doxygen.conf doxygen $< |