diff options
| -rw-r--r-- | configure.in | 7 | ||||
| -rw-r--r-- | epan/Makefile.am | 15 | ||||
| -rw-r--r-- | gtk/Makefile.am | 17 |
3 files changed, 35 insertions, 4 deletions
diff --git a/configure.in b/configure.in index 062a461ee4..40a20a2ab2 100644 --- a/configure.in +++ b/configure.in @@ -1,4 +1,4 @@ -# $Id: configure.in,v 1.264 2004/05/26 12:08:15 jmayer Exp $ +# $Id: configure.in,v 1.265 2004/06/09 03:08:12 gerald Exp $ # AC_INIT(etypes.h) @@ -39,6 +39,11 @@ AC_SUBST(LEX) AC_SUBST(FLEX_PATH) AC_SUBST(PYTHON) +# Check for doxygen +AC_PATH_PROG(DOXYGEN, doxygen) +AC_CHECK_PROG(HAVE_DOXYGEN, doxygen, "yes", "no") +AM_CONDITIONAL(HAVE_DOXYGEN, test x$HAVE_DOXYGEN = xyes) + # Check for packaging utilities # For now, we check to see if the various packaging utilites are in our # path. I'm too lazy to write code to go hunt for them. - Gerald diff --git a/epan/Makefile.am b/epan/Makefile.am index 2737cf6ce4..fb6ac24ebc 100644 --- a/epan/Makefile.am +++ b/epan/Makefile.am @@ -2,7 +2,7 @@ # Automake file for the EPAN library # (Ethereal Protocol ANalyzer Library) # -# $Id: Makefile.am,v 1.48 2004/05/11 11:19:26 guy Exp $ +# $Id: Makefile.am,v 1.49 2004/06/09 03:08:12 gerald Exp $ # # Ethereal - Network traffic analyzer # By Gerald Combs <gerald@ethereal.com> @@ -125,7 +125,7 @@ MAINTAINERCLEANFILES = \ # Add the object files for missing routines, if any. # libethereal_la_LIBADD = @INET_ATON_O@ @INET_PTON_O@ @INET_NTOP_O@ dfilter/libdfilter.la ftypes/libftypes.la @KRB5_LIBS@ -libethereal_la_DEPENDENCIES = @INET_ATON_O@ @INET_PTON_O@ @INET_NTOP_O@ dfilter/libdfilter.la ftypes/libftypes.la +libethereal_la_DEPENDENCIES = @INET_ATON_O@ @INET_PTON_O@ @INET_NTOP_O@ dfilter/libdfilter.la ftypes/libftypes.la doxygen ../packet-ncp2222.c : $(srcdir)/../ncp2222.py $(PYTHON) $(srcdir)/../ncp2222.py -o $@ @@ -249,3 +249,14 @@ plugin_src = endif # HAVE_PLUGINS +# Doxygen +doxygen.tmp: ../config.nmake doxygen.cfg + sed -e s/@VERSION@/$(VERSION)/ \ + < doxygen.cfg > $@ + +doxygen-run: +if HAVE_DOXYGEN + $(DOXYGEN) doxygen.tmp +endif # HAVE_DOXYGEN + +doxygen: doxygen.tmp doxygen-run diff --git a/gtk/Makefile.am b/gtk/Makefile.am index 639e3591ca..9f6c71bdb4 100644 --- a/gtk/Makefile.am +++ b/gtk/Makefile.am @@ -1,7 +1,7 @@ # Makefile.am # Automake file for the GTK interface routines for Ethereal # -# $Id: Makefile.am,v 1.100 2004/06/03 21:46:27 guy Exp $ +# $Id: Makefile.am,v 1.101 2004/06/09 03:08:13 gerald Exp $ # # Ethereal - Network traffic analyzer # By Gerald Combs <gerald@ethereal.com> @@ -102,6 +102,8 @@ libui_a_SOURCES = \ $(ETHEREAL_TAP_SRC) endif +libui_a_DEPENDENCIES = doxygen + EXTRA_DIST = \ doxygen.cfg \ Makefile.common \ @@ -111,3 +113,16 @@ EXTRA_DIST = \ # Common headers AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/wiretap + +# Doxygen +doxygen.tmp: ../config.nmake doxygen.cfg + sed -e s/@VERSION@/$(VERSION)/ \ + < doxygen.cfg > $@ + +doxygen-run: +if HAVE_DOXYGEN + $(DOXYGEN) doxygen.tmp +endif # HAVE_DOXYGEN + +doxygen: doxygen.tmp doxygen-run + |