Make the "maintainer-clean" rules get rid of some additional generated

files.  Do this with GENERATED_HEADER_FILES, GENERATED_C_FILES, and
GENERATED_FILES macros in Makefile.common files, along the lines of what
wiretap/Makefile.common has.

Clean up "*~" files with "make clean" rather than only "make distclean"
in some additional places.

Add "maintainer-clean" rules to the Makefile.nmake files, paralelling
the ones in the automake-generated Makefile.in files, using the
GENERATED_FILES macros from Makefile.common files.  In some cases, move
the cleanup of files from "make distclean" to "make maintainer-clean",
and in other cases, put in a comment indicating why we're not doing that
(because some files that are distributed in the source tarballs, namely
Flex output, were built with a UN*X Flex and won't compile on Windows,
so we get rid of them with "make distclean" so you can clean up stuff
that *has* to be re-generated for Windows).

Clean up some *CLEANFILES definitions - get rid of ones that no longer
apply as files were moved or that add to the definition a name that's
already there.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@13402 f5534014-38df-0310-8fa8-9805f1628bb7

diff --git a/Makefile.am b/Makefile.am
index a4c5fd5c668311e6b1a09735879368ec7767de00..bb11d6d13cb96b6c416911af5d22382769ab8b6f 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -381,17 +381,27 @@ dftest_LDADD = \
 
 dftest_LDFLAGS = -export-dynamic
 
-CLEANFILES =   \
-       svnversion.h \
-       @rdps_bin@ \
-       idl2eth
+#
+# XXX - "svnversion.h" is distributed in the release tarball; should
+# we be deleting it with "make clean", or should we only do that with
+# "make maintainer-clean"?
+#
+CLEANFILES =           \
+       svnversion.h    \
+       @rdps_bin@      \
+       idl2eth         \
+       *~
 
+#
+# XXX - "ps.c" is distributed in the source tarballs; why is it in the
+# list of files removed by "make distclean"?  (It's deliberately
+# included in that list.)
+#
 DISTCLEANFILES = \
-       ps.c \
-       *~
+       ps.c
 
 MAINTAINERCLEANFILES =         \
-       ps.c
+       $(GENERATED_FILES)
 
 EXTRA_DIST = \
        AUTHORS-SHORT           \

diff --git a/Makefile.common b/Makefile.common
index d47c72d02dbd3627147efa668605103983a405dd..287c8e3856745a2150639189b44d495240781565 100644 (file)
--- a/Makefile.common
+++ b/Makefile.common
@@ -48,10 +48,26 @@ DISSECTOR_SUPPORT_INCLUDES =        \
        x264_prt_id.h
 
 # "BUILT_SOURCES" are built before any "make all" or "make check" targets.
-BUILT_SOURCES =                \
-       svnversion.h \
+BUILT_HEADER_FILES =   \
+       svnversion.h
+
+BUILT_C_FILES =                \
        ps.c
 
+BUILT_SOURCES =        $(BUILT_C_FILES) $(BUILT_HEADER_FILES)
+
+# Header files generated from source files.
+GENERATED_HEADER_FILES = \
+       $(BUILT_HEADER_FILES)
+
+# C source files generated from source files.
+GENERATED_C_FILES = \
+       $(BUILT_C_FILES)        \
+       tethereal-tap-register.c
+
+# All the generated files.
+GENERATED_FILES = $(GENERATED_C_FILES) $(GENERATED_HEADER_FILES)
+
 # sources common for ethereal and tethereal
 ETHEREAL_COMMON_SRC =  \
        $(PLATFORM_SRC) \

diff --git a/Makefile.nmake b/Makefile.nmake
index 8c0f29f84e3d0f865d307592d32209b648d6d30d..fdde302340322a2c62ace34aee2c764d2ecd41cd 100644 (file)
--- a/Makefile.nmake
+++ b/Makefile.nmake
@@ -27,9 +27,6 @@ PLATFORM_SRC = capture-wpcap.c
 
 include Makefile.common
 
-BUILT_SOURCES =        $(BUILT_SOURCES) \
-       svnversion.h
-
 ethereal_OBJECTS = $(ethereal_SOURCES:.c=.obj)
 tethereal_OBJECTS = $(tethereal_SOURCES:.c=.obj)
 dftest_OBJECTS = $(dftest_SOURCES:.c=.obj)
@@ -290,11 +287,10 @@ clean: gtk2_distclean
        $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake clean
        cd ../..
 
-# Call distclean only, if you would like to remove ALL generated files.
-# Be sure to have python and perl installed to regenerate them.
+# "distclean" removes all files not part of the distribution.
+# It does not remove generated files that are part of the distribution.
 distclean: clean gtk2_distclean
-       rm -f $(BUILT_SOURCES) \
-               tethereal-tap-register.c 
+       rm -f config.h $(BUILT_SOURCES)
        cd wiretap
        $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake distclean
        cd ../gtk
@@ -315,6 +311,31 @@ distclean: clean gtk2_distclean
        $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake distclean
        cd ../..
 
+# Make "maintainer-clean" only if you would like to remove ALL generated
+# files.
+# Be sure to have python and perl installed to regenerate them.
+maintainer-clean: distclean
+       rm -f $(GENERATED_FILES)
+       cd wiretap
+       $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake maintainer-clean
+       cd ../gtk
+       $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake maintainer-clean
+       cd ../epan
+       $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake maintainer-clean
+       cd ../plugins
+       $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake maintainer-clean
+       cd ../tools
+       $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake maintainer-clean
+       cd ../image
+       $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake maintainer-clean
+       cd ../doc
+       $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake maintainer-clean
+       cd ../help
+       $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake maintainer-clean
+       cd ../packaging/nsis
+       $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake maintainer-clean
+       cd ../..
+
 tools::
        cd tools
        $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake
@@ -490,4 +511,3 @@ update_plugin_api: config.h
        cd plugins
        $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake xyzzy
        cd ..
-

diff --git a/doc/Makefile.nmake b/doc/Makefile.nmake
index a0d604ae4f9c3dec811a27ced2a966bd3ac60a1a..403737c356fabf3b797d136b11c0d30fb286316f 100644 (file)
--- a/doc/Makefile.nmake
+++ b/doc/Makefile.nmake
@@ -164,3 +164,5 @@ clean:
        rm -f pod2htm*
 
 distclean: clean
+
+maintainer-clean: distclean

diff --git a/epan/Makefile.am b/epan/Makefile.am
index 374a88e303c30c4c974f6c7f6a766855ea24cd39..04fc221af70c2f998e36dd2883cf82daf7c0b032 100644 (file)
--- a/epan/Makefile.am
+++ b/epan/Makefile.am
@@ -61,10 +61,6 @@ CLEANFILES = \
        libethereal.la          \
        *~
 
-MAINTAINERCLEANFILES = \
-       register.c      \
-       ../packet-ncp2222.c
-
 #
 # Add the object files for missing routines, if any.
 #

diff --git a/epan/Makefile.nmake b/epan/Makefile.nmake
index 3c09327b2bf837d65057f8a37e7cb0cae96cf0d8..96a0335ccafce6233aa7bd7a0ea0eab6481aac85 100644 (file)
--- a/epan/Makefile.nmake
+++ b/epan/Makefile.nmake
@@ -93,6 +93,15 @@ distclean: clean
        $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake distclean
        cd ..
 
+maintainer-clean: distclean
+       cd ftypes
+       $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake maintainer-clean
+       cd ../dfilter
+       $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake maintainer-clean
+       cd ../dissectors
+       $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake maintainer-clean
+       cd ..
+
 ftypes:: ..\config.h
        cd ftypes
        $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake

diff --git a/epan/dfilter/Makefile.nmake b/epan/dfilter/Makefile.nmake
index 21038114aa7a14a76bb176d2f7a36f02c3907e9b..8593e39dbeb800dcde04884f5ac1fea172612b31 100644 (file)
--- a/epan/dfilter/Makefile.nmake
+++ b/epan/dfilter/Makefile.nmake
@@ -47,9 +47,20 @@ $(OBJECTS): ..\..\config.h
 clean:
        rm -f $(OBJECTS) dfilter.lib $(PDB_FILE)
 
+#
+# We remove the generated files with "distclean" because one of them,
+# "scanner.c", needs different #includes for UN*X and Windows
+# (UN*X versions of Flex make it include <unistd.h>, but that's a
+# UN*X-only header), so if you're going to build from source, you need
+# to build "scanner.c" from "scanner.l" with Flex.
+# This might not be necessary for "grammar.{c,h}", but we handle them
+# the same for now.
+#
 distclean: clean
        rm -f scanner.c grammar.c grammar.h grammar.out
 
+maintainer-clean: distclean
+
 scanner.c : scanner.l
        $(LEX) -Pdf_ -oscanner.c scanner.l
 

diff --git a/epan/dissectors/Makefile.am b/epan/dissectors/Makefile.am
index 84c9b7513c379d1e6adb7b2b7b362511f4d9a8b2..12a7a8f17be7bec46915cd940bd186429850d843 100644 (file)
--- a/epan/dissectors/Makefile.am
+++ b/epan/dissectors/Makefile.am
@@ -105,13 +105,11 @@ register.c: $(plugin_src) $(DISSECTOR_SRC) $(srcdir)/make-reg-dotc $(srcdir)/mak
 #dist-hook:
 #      @rm -f $(distdir)/register.c
 
-
-MAINTAINERCLEANFILES = \
-       register.c      \
-       packet-ncp2222.c
-
 CLEANFILES = \
        libdissectors.a         \
        libdissectors.la        \
        $(GENERATED_HEADER_FILES)       \
        *~
+
+MAINTAINERCLEANFILES = \
+       $(GENERATED_FILES)

diff --git a/epan/dissectors/Makefile.common b/epan/dissectors/Makefile.common
index 284f0b61fdb742a143e52d4d310cf8845c66bcc4..e486490dd0e77998a4ed91908a3118255da7a9e2 100644 (file)
--- a/epan/dissectors/Makefile.common
+++ b/epan/dissectors/Makefile.common
@@ -23,13 +23,28 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
-#
-# Generated header files that we want in the distribution.
-#
-GENERATED_HEADER_FILES = \
+# "BUILT_SOURCES" are built before any "make all" or "make check" targets.
+BUILT_HEADER_FILES = \
        x11-declarations.h      \
        x11-register-info.h
 
+BUILT_C_FILES = \
+       register.c
+
+BUILT_SOURCES =        $(BUILT_C_FILES) $(BUILT_HEADER_FILES)
+
+# Header files generated from source files.
+GENERATED_HEADER_FILES = \
+       $(BUILT_HEADER_FILES)
+
+# C source files generated from source files.
+GENERATED_C_FILES = \
+       $(BUILT_C_FILES)        \
+       packet-ncp2222.c
+
+# All the generated files.
+GENERATED_FILES = $(GENERATED_HEADER_FILES) $(GENERATED_C_FILES)
+
 # the dissector sources (without any helpers)
 DISSECTOR_SRC =        \
        packet-3g-a11.c \
@@ -791,17 +806,13 @@ DISSECTOR_INCLUDES =      \
        packet-ypxfr.h  \
        $(GENERATED_HEADER_FILES)
 
-# dissector helpers (needed from the dissectors, but not a dissector itself)
+# Dissector helpers.  They're included in the source files in this
+# directory, but they're not dissectors themselves, i.e. they're not
+# used to generate "register.c").
 DISSECTOR_SUPPORT_SRC =        \
        packet-dcerpc-nt.c      \
        register.c
 
-# "BUILT_SOURCES" are built before any "make all" or "make check" targets.
-BUILT_SOURCES =                \
-       register.c      \
-       x11-declarations.h      \
-       x11-register-info.h
-
 # this target needed for distribution only
 noinst_HEADERS =       \
        $(DISSECTOR_INCLUDES)

diff --git a/epan/dissectors/Makefile.nmake b/epan/dissectors/Makefile.nmake
index 28dd4562c30cf61a5097de1d6ef40d95e10706ae..d606401ad932da43eb1d6220566eb7ad986937c5 100644 (file)
--- a/epan/dissectors/Makefile.nmake
+++ b/epan/dissectors/Makefile.nmake
@@ -39,7 +39,6 @@ packet-x11.obj        : packet-x11.c x11-declarations.h x11-register-info.h
 x11-declarations.h x11-register-info.h: x11-fields process-x11-fields.pl
        $(PERL) process-x11-fields.pl <x11-fields
 
-
 #
 # Build "register.c", which contains a function "register_all_protocols()"
 # that calls the register routines for all protocols.
@@ -98,4 +97,6 @@ clean:
                $(DISSECTOR_OBJECTS) $(DISSECTOR_SUPPORT_OBJECTS)
 
 distclean: clean
-       rm -f $(BUILT_SOURCES) packet-ncp2222.c register.c
+
+maintainer-clean: distclean
+       rm -f $(GENERATED_FILES)

diff --git a/epan/ftypes/Makefile.nmake b/epan/ftypes/Makefile.nmake
index e64f9695e86cb5b450d13299ae3a2d740b45e414..9408c4fba680eb8edee3ead1d46f87c6cd6fb2a2 100644 (file)
--- a/epan/ftypes/Makefile.nmake
+++ b/epan/ftypes/Makefile.nmake
@@ -32,8 +32,9 @@ OBJECTS = \
 ftypes.lib     : $(OBJECTS)
        link /lib /out:ftypes.lib $(OBJECTS)
 
-
 clean:
        rm -f $(OBJECTS) ftypes.lib $(PDB_FILE)
 
 distclean: clean
+
+maintainer-clean: distclean

diff --git a/gtk/Makefile.am b/gtk/Makefile.am
index e3e2d1e5b386feb9c6aa151bbe148916fee64c7d..846fd185e938f93b493dd7b3a4f97f38aabee6f2 100644 (file)
--- a/gtk/Makefile.am
+++ b/gtk/Makefile.am
@@ -29,6 +29,9 @@ CLEANFILES = \
        libui.a         \
        *~
 
+MAINTAINERCLEANFILES =         \
+       $(GENERATED_FILES)
+
 ethereal-tap-register.c: $(ETHEREAL_TAP_SRC) $(top_srcdir)/make-tapreg-dotc
        @echo Making ethereal-tap-register.c
        @$(top_srcdir)/make-tapreg-dotc ethereal-tap-register.c $(srcdir) $(ETHEREAL_TAP_SRC)

diff --git a/gtk/Makefile.common b/gtk/Makefile.common
index 3e9519ccb10a0895be0b5571ca84dc5b3c7d333d..23ece7e26863b0107129b66434086523679d0843 100644 (file)
--- a/gtk/Makefile.common
+++ b/gtk/Makefile.common
@@ -23,6 +23,16 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
+# Generated header files that we want in the distribution.
+# (None, so far.)
+GENERATED_HEADER_FILES =
+
+# Generated C source files that we want in the distribution.
+GENERATED_C_FILES = \
+       ethereal-tap-register.c
+
+# All the generated files we want in the distribution.
+GENERATED_FILES = $(GENERATED_HEADER_FILES) $(GENERATED_C_FILES)
 
 #
 # ethclist.obj is not in here because it is currently gtk+-1.2-only

diff --git a/gtk/Makefile.nmake b/gtk/Makefile.nmake
index 139f03b0f8e8b78facb2cb58972bfa3e3a406c9e..31f6bb1d9f71709ee480cd28b8b3af802abcaf74 100644 (file)
--- a/gtk/Makefile.nmake
+++ b/gtk/Makefile.nmake
@@ -47,10 +47,12 @@ 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.cfg html/*.*
-    if exist html rmdir html
+       if exist html rmdir html
 
 distclean: clean
-       rm -f ethereal-tap-register.c
+
+maintainer-clean: distclean
+       rm -f $(GENERATED_FILES)
 
 # convert doxygen.cfg.in to doxygen.cfg with stamped version info
 doxygen.cfg: ..\config.nmake doxygen.cfg.in

diff --git a/help/Makefile.nmake b/help/Makefile.nmake
index 8ec24259ef8b34f3d71df8b098cd597ba484977b..e9e29b6b75fe43e78bea57c441af5603ffd1d220 100644 (file)
--- a/help/Makefile.nmake
+++ b/help/Makefile.nmake
@@ -10,3 +10,5 @@ include ..\config.nmake
 clean:
 
 distclean: clean
+
+maintainer-clean: distclean

diff --git a/image/Makefile.nmake b/image/Makefile.nmake
index 9c76df1a0d300612386ad0568e7055e1a8192759..cef58145a077a5c8a7b0bdaf9fb3559c533631d2 100644 (file)
--- a/image/Makefile.nmake
+++ b/image/Makefile.nmake
@@ -51,3 +51,5 @@ clean :
        rm -f $(ALL_RC)
 
 distclean: clean
+
+maintainer-clean: distclean

diff --git a/packaging/nsis/Makefile.nmake b/packaging/nsis/Makefile.nmake
index 643c533d73d9301942aa1f27fae63e514ffde9f2..c5f9c694093c95868c9b4ce4e6f39f1ebd5506ae 100644 (file)
--- a/packaging/nsis/Makefile.nmake
+++ b/packaging/nsis/Makefile.nmake
@@ -137,6 +137,8 @@ clean:
 
 distclean: clean
 
+maintainer-clean: distclean
+
 $(DOC):
        cd ../../doc
        $(MAKE) -f makefile.nmake

diff --git a/plugins/Makefile.nmake b/plugins/Makefile.nmake
index 8b1f9a1790bb82a82602904dee8a95d38e16cd7b..3c1d849d4c2d473e400c5cde53ed885f93f4db8f 100644 (file)
--- a/plugins/Makefile.nmake
+++ b/plugins/Makefile.nmake
@@ -219,3 +219,45 @@ distclean: clean
        $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake distclean
        cd ..
 
+maintainer-clean: distclean
+       cd acn
+       $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake maintainer-clean
+       cd ../artnet
+       $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake maintainer-clean
+       cd ../asn1
+       $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake maintainer-clean
+       cd ../ciscosm
+       $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake maintainer-clean
+       cd ../docsis
+       $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake maintainer-clean
+       cd ../enttec
+       $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake maintainer-clean
+       cd ../giop
+       $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake maintainer-clean
+       cd ../gryphon
+       $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake maintainer-clean
+       cd ../irda
+       $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake maintainer-clean
+       cd ../lwres
+       $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake maintainer-clean
+       cd ../mate
+       $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake maintainer-clean
+       cd ../megaco
+       $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake maintainer-clean
+       cd ../mgcp
+       $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake maintainer-clean
+       cd ../opsi
+       $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake maintainer-clean
+       cd ../pcli
+       $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake maintainer-clean
+       cd ../rdm
+       $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake maintainer-clean
+       cd ../rlm
+       $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake maintainer-clean
+       cd ../rtnet
+       $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake maintainer-clean
+       cd ../rudp
+       $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake maintainer-clean
+       cd ../v5ua
+       $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake maintainer-clean
+       cd ..

diff --git a/plugins/acn/Makefile.nmake b/plugins/acn/Makefile.nmake
index 4ceba3aed137511ff9d2301f753bde7eba6edc1b..4412be937e3803f6ac87ce91058c55b3fd222c11 100644 (file)
--- a/plugins/acn/Makefile.nmake
+++ b/plugins/acn/Makefile.nmake
@@ -28,3 +28,5 @@ clean:
        rm -f $(OBJECTS) acn.dll acn.exp acn.lib *.pdb
 
 distclean: clean
+
+maintainer-clean: distclean

diff --git a/plugins/agentx/Makefile.nmake b/plugins/agentx/Makefile.nmake
index 8b6f4f37d6c1d993459111182dfdf0c0b04eca41..007631800005eb1eb74cb3720867a6ce1ab490b8 100644 (file)
--- a/plugins/agentx/Makefile.nmake
+++ b/plugins/agentx/Makefile.nmake
@@ -28,3 +28,5 @@ clean:
        rm -f $(OBJECTS) agentx.dll agentx.exp agentx.lib *.pdb
 
 distclean: clean
+
+maintainer-clean: distclean

diff --git a/plugins/artnet/Makefile.nmake b/plugins/artnet/Makefile.nmake
index 4e9da257d01683a9af23e057f9a6bed3423147f7..28128cef5fc35cf5a4a2142c0302c1184ff1d386 100644 (file)
--- a/plugins/artnet/Makefile.nmake
+++ b/plugins/artnet/Makefile.nmake
@@ -28,3 +28,5 @@ clean:
        rm -f $(OBJECTS) artnet.dll artnet.exp artnet.lib *.pdb
 
 distclean: clean
+
+maintainer-clean: distclean

diff --git a/plugins/asn1/Makefile.nmake b/plugins/asn1/Makefile.nmake
index 73f83e74de129e29ec90e8c1d2ca389a19ba7420..397bbf5e2ca872ae9b6179d6dcd3d91f05b4a899 100644 (file)
--- a/plugins/asn1/Makefile.nmake
+++ b/plugins/asn1/Makefile.nmake
@@ -28,3 +28,5 @@ clean:
        rm -f $(OBJECTS) asn1.dll asn1.exp asn1.lib *.pdb
 
 distclean: clean
+
+maintainer-clean: distclean

diff --git a/plugins/ciscosm/Makefile.nmake b/plugins/ciscosm/Makefile.nmake
index 9fa83fa1a6ec9a9a99002b9d04e888b879f2df3f..f71e97c2ebb0f9c7cfd129d097eb6ab58684d91d 100644 (file)
--- a/plugins/ciscosm/Makefile.nmake
+++ b/plugins/ciscosm/Makefile.nmake
@@ -28,3 +28,5 @@ clean:
        rm -f $(OBJECTS) ciscosm.dll ciscosm.exp ciscosm.lib *.pdb
 
 distclean: clean
+
+maintainer-clean: distclean

diff --git a/plugins/docsis/Makefile.nmake b/plugins/docsis/Makefile.nmake
index 79114fe5715ff476fc1ba4258dae2dbe0813decb..e565427852c69443c29a794b67e70b67c3ecf4b3 100644 (file)
--- a/plugins/docsis/Makefile.nmake
+++ b/plugins/docsis/Makefile.nmake
@@ -40,3 +40,5 @@ clean:
        rm -f $(OBJECTS) docsis.dll docsis.exp docsis.lib *.pdb
 
 distclean: clean
+
+maintainer-clean: distclean

diff --git a/plugins/enttec/Makefile.nmake b/plugins/enttec/Makefile.nmake
index 48e8132bedf027c01e4e7ad0cdecbee428713343..ef0c579037a239a42d4e2eabb9bea8d161133085 100644 (file)
--- a/plugins/enttec/Makefile.nmake
+++ b/plugins/enttec/Makefile.nmake
@@ -28,3 +28,5 @@ clean:
        rm -f $(OBJECTS) enttec.dll enttec.exp enttec.lib *.pdb
 
 distclean: clean
+
+maintainer-clean: distclean

diff --git a/plugins/giop/Makefile.nmake b/plugins/giop/Makefile.nmake
index 1a9bbde5c70a1a52dae1d1f16b5f10567ce5ecaf..333de09bb6f6c3e3ead2bd7b7ff74b672794cfb4 100644 (file)
--- a/plugins/giop/Makefile.nmake
+++ b/plugins/giop/Makefile.nmake
@@ -35,3 +35,5 @@ clean:
                coseventcomm.dll coseventcomm.exp coseventcomm.lib *.pdb
 
 distclean: clean
+
+maintainer-clean: distclean

diff --git a/plugins/gryphon/Makefile.nmake b/plugins/gryphon/Makefile.nmake
index 3ccaecd68af6fec09a8ba92743ae73492482ae06..7ad5c9bf70de36053706a296457c0af4a89c1c3a 100644 (file)
--- a/plugins/gryphon/Makefile.nmake
+++ b/plugins/gryphon/Makefile.nmake
@@ -28,3 +28,5 @@ clean:
        rm -f $(OBJECTS) gryphon.dll gryphon.exp gryphon.lib *.pdb
 
 distclean: clean
+
+maintainer-clean: distclean

diff --git a/plugins/irda/Makefile.nmake b/plugins/irda/Makefile.nmake
index 94fd393261f469dce23b27b2f0559a9ca9b3bf87..03b950c98899dcfd819ad38253c35f41dbe0edbd 100644 (file)
--- a/plugins/irda/Makefile.nmake
+++ b/plugins/irda/Makefile.nmake
@@ -28,3 +28,5 @@ clean:
        rm -f $(OBJECTS) irda.dll irda.exp irda.lib *.pdb
 
 distclean: clean
+
+maintainer-clean: distclean

diff --git a/plugins/lwres/Makefile.nmake b/plugins/lwres/Makefile.nmake
index b89d11154a4587688857af24ac85de026cbae78c..686bc2fe4868860ccf640efb145a31344a9ccd82 100644 (file)
--- a/plugins/lwres/Makefile.nmake
+++ b/plugins/lwres/Makefile.nmake
@@ -28,3 +28,5 @@ clean:
        rm -f $(OBJECTS) lwres.dll lwres.exp lwres.lib *.pdb
 
 distclean: clean
+
+maintainer-clean: distclean

diff --git a/plugins/mate/Makefile.nmake b/plugins/mate/Makefile.nmake
index 9dbb83ddf13c53b6a77d3ccec40b8a462d36cd99..b08d92c1117659a8fd5bb2b7d52b1a4b9025aef8 100644 (file)
--- a/plugins/mate/Makefile.nmake
+++ b/plugins/mate/Makefile.nmake
@@ -32,3 +32,5 @@ clean:
        rm -f $(OBJECTS) mate.dll mate.exp mate.lib *.pdb
 
 distclean: clean
+
+maintainer-clean: distclean

diff --git a/plugins/megaco/Makefile.nmake b/plugins/megaco/Makefile.nmake
index 19efb9dc40c9a64e2996c7854ac52d6e8c496375..356d4bfbd55f2a4181ffa37c2362089ef833514c 100644 (file)
--- a/plugins/megaco/Makefile.nmake
+++ b/plugins/megaco/Makefile.nmake
@@ -28,3 +28,5 @@ clean:
        rm -f $(OBJECTS) megaco.dll megaco.exp megaco.lib *.pdb
 
 distclean: clean
+
+maintainer-clean: distclean

diff --git a/plugins/mgcp/Makefile.nmake b/plugins/mgcp/Makefile.nmake
index ff575af6cda34438b191282ca46313672eff4a0b..f44c35cf3f5a37e55c639ac0870ba63d3c416d67 100644 (file)
--- a/plugins/mgcp/Makefile.nmake
+++ b/plugins/mgcp/Makefile.nmake
@@ -28,3 +28,5 @@ clean:
        rm -f $(OBJECTS) mgcp.dll mgcp.exp mgcp.lib *.pdb
 
 distclean: clean
+
+maintainer-clean: distclean

diff --git a/plugins/opsi/Makefile.nmake b/plugins/opsi/Makefile.nmake
index 9840c8e090fb9f72460b7cdf1b656f86ac2d784c..47f8cef88b39a6a80cbb603e47b9d5431d014ad6 100644 (file)
--- a/plugins/opsi/Makefile.nmake
+++ b/plugins/opsi/Makefile.nmake
@@ -28,3 +28,5 @@ clean:
        rm -f $(OBJECTS) opsi.dll opsi.exp opsi.lib *.pdb
 
 distclean: clean
+
+maintainer-clean: distclean

diff --git a/plugins/pcli/Makefile.nmake b/plugins/pcli/Makefile.nmake
index c0cbc55661ad5a363154afb7217886781aa43201..3e8119e05a198722747000c879c509cc1250e47c 100644 (file)
--- a/plugins/pcli/Makefile.nmake
+++ b/plugins/pcli/Makefile.nmake
@@ -28,3 +28,5 @@ clean:
        rm -f $(OBJECTS) pcli.dll pcli.exp pcli.lib *.pdb
 
 distclean: clean
+
+maintainer-clean: distclean

diff --git a/plugins/rdm/Makefile.nmake b/plugins/rdm/Makefile.nmake
index 803243cd36e38a829b42568eb4e683afc57d4c6f..541b4fae2060f5f18edbb64ec69930c74b8694d8 100644 (file)
--- a/plugins/rdm/Makefile.nmake
+++ b/plugins/rdm/Makefile.nmake
@@ -28,3 +28,5 @@ clean:
        rm -f $(OBJECTS) rdm.dll rdm.exp rdm.lib *.pdb
 
 distclean: clean
+
+maintainer-clean: distclean

diff --git a/plugins/rlm/Makefile.nmake b/plugins/rlm/Makefile.nmake
index a8aef8fa7d8d8ed8f2c853288a5aeea441b1bfc3..41c22fd2ed9f660b04c8ef5cc340478637df2cfd 100644 (file)
--- a/plugins/rlm/Makefile.nmake
+++ b/plugins/rlm/Makefile.nmake
@@ -28,3 +28,5 @@ clean:
        rm -f $(OBJECTS) rlm.dll rlm.exp rlm.lib *.pdb
 
 distclean: clean
+
+maintainer-clean: distclean

diff --git a/plugins/rtnet/Makefile.nmake b/plugins/rtnet/Makefile.nmake
index f3bf512ede9df5e42d1f442db0daa125eda5f8c2..c91e3a98a18462c38b0c1acc719ed9e7108b8ba3 100644 (file)
--- a/plugins/rtnet/Makefile.nmake
+++ b/plugins/rtnet/Makefile.nmake
@@ -28,3 +28,5 @@ clean:
        rm -f $(OBJECTS) rtnet.dll rtnet.exp rtnet.lib *.pdb
 
 distclean: clean
+
+maintainer-clean: distclean

diff --git a/plugins/rudp/Makefile.nmake b/plugins/rudp/Makefile.nmake
index c61f23555110f518384103a815a76c2010e7c301..db99178c7d8209714c0f7aba9caace53254c87f0 100644 (file)
--- a/plugins/rudp/Makefile.nmake
+++ b/plugins/rudp/Makefile.nmake
@@ -28,3 +28,5 @@ clean:
        rm -f $(OBJECTS) rudp.dll rudp.exp rudp.lib *.pdb
 
 distclean: clean
+
+maintainer-clean: distclean

diff --git a/plugins/v5ua/Makefile.nmake b/plugins/v5ua/Makefile.nmake
index bf04762ca2c617807152a4596c80091c9f832fe1..cea88f8a1244bc2b2b2ed5e12e1ad6a90cff428b 100644 (file)
--- a/plugins/v5ua/Makefile.nmake
+++ b/plugins/v5ua/Makefile.nmake
@@ -28,3 +28,5 @@ clean:
        rm -f $(OBJECTS) v5ua.dll v5ua.exp v5ua.lib *.pdb
 
 distclean: clean
+
+maintainer-clean: distclean

diff --git a/tools/Makefile.nmake b/tools/Makefile.nmake
index 018733d60c63d105871d2694c37957255ba870c4..fa6e388e971cec60a72a7cba68cd68f3af170ab2 100755 (executable)
--- a/tools/Makefile.nmake
+++ b/tools/Makefile.nmake
@@ -15,6 +15,11 @@ distclean: clean
        $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake distclean
        cd ..
 
+maintainer-clean: distclean
+       cd lemon
+       $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake maintainer-clean
+       cd ..
+
 lemon::
        cd lemon
        $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake

diff --git a/tools/lemon/Makefile.nmake b/tools/lemon/Makefile.nmake
index bbbc7244b8ba75203746f3e4e58fb035db8fd94f..51d54a65946f418fb0eaf7d8c9924dc8840b7b7e 100644 (file)
--- a/tools/lemon/Makefile.nmake
+++ b/tools/lemon/Makefile.nmake
@@ -16,3 +16,5 @@ clean:
        rm -f lemon.obj lemon.exe lemon.ilk $(PDB_FILE) lemon.pdb
 
 distclean: clean
+
+maintainer-clean: distclean

diff --git a/wiretap/Makefile.nmake b/wiretap/Makefile.nmake
index 9b8071734d733d5f7e7da6a864ece60a33945856..a5191794e8c20559a1142a60b0f480c9e4eba23f 100644 (file)
--- a/wiretap/Makefile.nmake
+++ b/wiretap/Makefile.nmake
@@ -59,5 +59,16 @@ clean :
                wiretap-$(WTAP_VERSION).dll \
                $(PDB_FILE)
 
+#
+# We remove the generated files with "distclean" because one of them,
+# "ascend-scanner.c", needs different #includes for UN*X and Windows
+# (UN*X versions of Flex make it include <unistd.h>, but that's a
+# UN*X-only header), so if you're going to build from source, you need
+# to build "ascend-scanner.c" from "ascend-scanner.l" with Flex.
+# This might not be necessary for "ascend-grammar.{c,h}", but as
+# long as you need Flex, you might as well get Bison....
+#
 distclean: clean
-       rm -f config.h ascend-grammar.c ascend-grammar.h ascend-scanner.c
+       rm -f config.h $(GENERATED_FILES)
+
+maintainer-clean: distclean