From 392a0d43c06d489fc8c984fa3e6d0bff4274b846 Mon Sep 17 00:00:00 2001 From: =?utf8?q?J=C3=B6rg=20Mayer?= Date: Fri, 25 Jun 2004 07:10:55 +0000 Subject: [PATCH] doxygen changes: - moved doxygen.cfg to doxygen.cfg.in and let configure to the substitution on unix. Adapted the namke files accordingly. - Don't add doxygen as a dependency for libethereal and libui: As doxygen is an unconditional target, this would cause the applications to be rebuild every time make was called, even when nothing changed in the meantime. This means that by now we need to do "make doxygen" manually in case we want updated documentation. svn path=/trunk/; revision=11238 --- Makefile.am | 4 ++-- configure.in | 5 ++++- doxygen.cfg => doxygen.cfg.in | 0 epan/Makefile.am | 16 +++++----------- epan/Makefile.nmake | 12 ++++++------ epan/{doxygen.cfg => doxygen.cfg.in} | 0 gtk/Makefile.am | 17 +++++------------ gtk/Makefile.nmake | 14 +++++++------- gtk/{doxygen.cfg => doxygen.cfg.in} | 0 9 files changed, 29 insertions(+), 39 deletions(-) rename doxygen.cfg => doxygen.cfg.in (100%) rename epan/{doxygen.cfg => doxygen.cfg.in} (100%) rename gtk/{doxygen.cfg => doxygen.cfg.in} (100%) diff --git a/Makefile.am b/Makefile.am index e324318e3c..732c9235e1 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,7 +1,7 @@ # Makefile.am # Automake file for Ethereal # -# $Id: Makefile.am,v 1.736 2004/06/23 08:39:06 guy Exp $ +# $Id: Makefile.am,v 1.737 2004/06/25 07:10:53 jmayer Exp $ # # Ethereal - Network traffic analyzer # By Gerald Combs @@ -435,7 +435,7 @@ EXTRA_DIST = \ doc/randpkt.txt \ doc/tethereal.pod \ doc/text2pcap.pod \ - doxygen.cfg \ + doxygen.cfg.in \ editcap.c \ epan/libethereal.def \ ethereal_be.py \ diff --git a/configure.in b/configure.in index 644531314a..a794ce47bf 100644 --- a/configure.in +++ b/configure.in @@ -1,4 +1,4 @@ -# $Id: configure.in,v 1.272 2004/06/23 08:39:06 guy Exp $ +# $Id: configure.in,v 1.273 2004/06/25 07:10:53 jmayer Exp $ # AC_INIT(etypes.h) @@ -1137,11 +1137,14 @@ AM_CONFIG_HEADER(config.h) AC_CONFIG_SUBDIRS(wiretap) AC_OUTPUT( Makefile + doxygen.cfg doc/Makefile epan/Makefile + epan/doxygen.cfg epan/dfilter/Makefile epan/ftypes/Makefile gtk/Makefile + gtk/doxygen.cfg help/Makefile packaging/Makefile packaging/nsis/Makefile diff --git a/doxygen.cfg b/doxygen.cfg.in similarity index 100% rename from doxygen.cfg rename to doxygen.cfg.in diff --git a/epan/Makefile.am b/epan/Makefile.am index 765a91cd43..fee59599e0 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.52 2004/06/17 08:53:42 jmayer Exp $ +# $Id: Makefile.am,v 1.53 2004/06/25 07:10:53 jmayer Exp $ # # Ethereal - Network traffic analyzer # By Gerald Combs @@ -108,7 +108,7 @@ EXTRA_DIST = \ Makefile.common \ Makefile.nmake \ tvbtest.c \ - doxygen.cfg + doxygen.cfg.in CLEANFILES = \ libethereal.a \ @@ -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 -libethereal_la_DEPENDENCIES = @INET_ATON_O@ @INET_PTON_O@ @INET_NTOP_O@ dfilter/libdfilter.la ftypes/libftypes.la doxygen +libethereal_la_DEPENDENCIES = @INET_ATON_O@ @INET_PTON_O@ @INET_NTOP_O@ dfilter/libdfilter.la ftypes/libftypes.la ../packet-ncp2222.c : $(srcdir)/../ncp2222.py $(PYTHON) $(srcdir)/../ncp2222.py -o $@ @@ -251,14 +251,8 @@ plugin_src = endif # HAVE_PLUGINS -# Doxygen -doxygen.tmp: doxygen.cfg - sed -e s/@VERSION@/$(VERSION)/ \ - < doxygen.cfg > $@ - -doxygen-run: +doxygen: if HAVE_DOXYGEN - $(DOXYGEN) doxygen.tmp + $(DOXYGEN) doxygen.cfg endif # HAVE_DOXYGEN -doxygen: doxygen.tmp doxygen-run diff --git a/epan/Makefile.nmake b/epan/Makefile.nmake index 5127794a39..795f4f4562 100644 --- a/epan/Makefile.nmake +++ b/epan/Makefile.nmake @@ -1,7 +1,7 @@ ## Makefile for building ethereal.exe with Microsoft C and nmake ## Use: $(MAKE) /$(MAKEFLAGS) -f makefile.nmake # -# $Id: Makefile.nmake,v 1.43 2004/05/13 10:10:28 ulfl Exp $ +# $Id: Makefile.nmake,v 1.44 2004/06/25 07:10:54 jmayer Exp $ include ..\config.nmake include @@ -84,7 +84,7 @@ ethereal.lib : ..\config.h $(OBJECTS) cd epan clean: - rm -f $(OBJECTS) ethereal.lib libethereal.dll libethereal.lib libethereal.exp $(PDB_FILE) doxygen.tmp + rm -f $(OBJECTS) ethereal.lib libethereal.dll libethereal.lib libethereal.exp $(PDB_FILE) doxygen.cfg cd ftypes $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake clean cd ../dfilter @@ -109,16 +109,16 @@ dfilter:: ..\config.h $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake cd .. -doxygen.tmp: ..\config.nmake doxygen.cfg +doxygen.cfg: ..\config.nmake doxygen.cfg.in sed -e s/@VERSION@/$(VERSION)/ \ - < doxygen.cfg > $@ + < doxygen.cfg.in > $@ doxygen-run: !IFDEF DOXYGEN - $(DOXYGEN) doxygen.tmp + $(DOXYGEN) doxygen.cfg !ENDIF -doxygen: doxygen.tmp doxygen-run +doxygen: doxygen.cfg doxygen-run # # Build "register.c", which contains a function "register_all_protocols()" diff --git a/epan/doxygen.cfg b/epan/doxygen.cfg.in similarity index 100% rename from epan/doxygen.cfg rename to epan/doxygen.cfg.in diff --git a/gtk/Makefile.am b/gtk/Makefile.am index 727a8eae17..1137879f64 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.104 2004/06/23 01:38:39 guy Exp $ +# $Id: Makefile.am,v 1.105 2004/06/25 07:10:54 jmayer Exp $ # # Ethereal - Network traffic analyzer # By Gerald Combs @@ -104,10 +104,10 @@ libui_a_SOURCES = \ $(ETHEREAL_TAP_SRC) endif -libui_a_DEPENDENCIES = doxygen +libui_a_DEPENDENCIES = EXTRA_DIST = \ - doxygen.cfg \ + doxygen.cfg.in \ Makefile.common \ Makefile.nmake \ print_mswin.c \ @@ -116,15 +116,8 @@ EXTRA_DIST = \ # Common headers AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/wiretap -# Doxygen -doxygen.tmp: doxygen.cfg - sed -e s/@VERSION@/$(VERSION)/ \ - < doxygen.cfg > $@ - -doxygen-run: +doxygen: if HAVE_DOXYGEN - $(DOXYGEN) doxygen.tmp + $(DOXYGEN) doxygen.cfg endif # HAVE_DOXYGEN -doxygen: doxygen.tmp doxygen-run - diff --git a/gtk/Makefile.nmake b/gtk/Makefile.nmake index dc08fdfbc3..3a52de789d 100644 --- a/gtk/Makefile.nmake +++ b/gtk/Makefile.nmake @@ -1,7 +1,7 @@ ## Makefile for building ethereal.exe with Microsoft C and nmake ## Use: $(MAKE) /$(MAKEFLAGS) -f makefile.nmake # -# $Id: Makefile.nmake,v 1.76 2004/06/04 17:16:57 ulfl Exp $ +# $Id: Makefile.nmake,v 1.77 2004/06/25 07:10:54 jmayer Exp $ include ..\config.nmake @@ -42,21 +42,21 @@ ethereal-tap-register.c: $(ETHEREAL_TAP_SRC) ../make-tapreg-dotc Makefile.common clean: - rm -f $(ETHEREAL_WIN32_GTK_OBJECTS) $(ETHEREAL_TAP_OBJECTS) libui.lib $(PDB_FILE) doxygen.tmp + rm -f $(ETHEREAL_WIN32_GTK_OBJECTS) $(ETHEREAL_TAP_OBJECTS) libui.lib $(PDB_FILE) doxygen.cfg distclean: clean rm -f ethereal-tap-register.c -# convert doxygen.cfg to doxygen.tmp with stamped version info -doxygen.tmp: ..\config.nmake doxygen.cfg +# convert doxygen.cfg.in to doxygen.cfg with stamped version info +doxygen.cfg: ..\config.nmake doxygen.cfg.in !IFDEF DOXYGEN sed -e s/@VERSION@/$(VERSION)/ \ - < doxygen.cfg > $@ + < doxygen.cfg.in > $@ !ENDIF doxygen-run: !IFDEF DOXYGEN - $(DOXYGEN) doxygen.tmp + $(DOXYGEN) doxygen.cfg !ENDIF # MS html help conpiler hhc returns 1 on success, but as nmake expects 0 it would stop here. @@ -66,5 +66,5 @@ doxygen.chm: -1 $(HHC) html\index.hhp !ENDIF -doxygen: doxygen.tmp doxygen-run doxygen.chm +doxygen: doxygen.cfg doxygen-run doxygen.chm diff --git a/gtk/doxygen.cfg b/gtk/doxygen.cfg.in similarity index 100% rename from gtk/doxygen.cfg rename to gtk/doxygen.cfg.in -- 2.34.1