doxygen changes:
authorJörg Mayer <jmayer@loplof.de>
Fri, 25 Jun 2004 07:10:55 +0000 (07:10 -0000)
committerJörg Mayer <jmayer@loplof.de>
Fri, 25 Jun 2004 07:10:55 +0000 (07:10 -0000)
- 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
configure.in
doxygen.cfg.in [moved from doxygen.cfg with 100% similarity]
epan/Makefile.am
epan/Makefile.nmake
epan/doxygen.cfg.in [moved from epan/doxygen.cfg with 100% similarity]
gtk/Makefile.am
gtk/Makefile.nmake
gtk/doxygen.cfg.in [moved from gtk/doxygen.cfg with 100% similarity]

index e324318e3cde09cc3c49203aaa67123d96d73e2e..732c9235e17c1d3c2e6f832973e9dcee1cd7abae 100644 (file)
@@ -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 <gerald@ethereal.com>
@@ -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          \
index 644531314aa66836802caf104012c508ff08a93f..a794ce47bfb5c925cb61ccd6e68aebc7d84df83e 100644 (file)
@@ -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
similarity index 100%
rename from doxygen.cfg
rename to doxygen.cfg.in
index 765a91cd439105624aece6df3678e7343dd7cc28..fee59599e08466ea95998c60fee1d245c056a783 100644 (file)
@@ -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 <gerald@ethereal.com>
@@ -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
index 5127794a390e2e1be7f7a90f80b91947a4ee688b..795f4f4562c128d3f0b5998368f5ff119b3a38a6 100644 (file)
@@ -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 <win32.mak>
@@ -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()"
similarity index 100%
rename from epan/doxygen.cfg
rename to epan/doxygen.cfg.in
index 727a8eae1780007bf4077b35b6e297945c2bfc94..1137879f64781ab8240b52348d8e70963b5a3735 100644 (file)
@@ -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 <gerald@ethereal.com>
@@ -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
-
index dc08fdfbc358466212731b63612e5dc8aca8f466..3a52de789de66bdf978531b79d13b59c7ec8525f 100644 (file)
@@ -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
 
similarity index 100%
rename from gtk/doxygen.cfg
rename to gtk/doxygen.cfg.in