normalized *_[dist]clean target to [dist]clean-* target

Makefile.in

@@ -186,79 +186,106 @@ web:
 	cd $(NMAPDEVDIR) && $(MAKE) web
 
 clean: @LUA_CLEAN@ @LIBLINEAR_CLEAN@ @PCAP_CLEAN@ @PCRE_CLEAN@ @DNET_CLEAN@ \
-nsock_clean nbase_clean netutil_clean @NPING_CLEAN@ @ZENMAP_CLEAN@ \
-@NCAT_CLEAN@ @NMAP_UPDATE_CLEAN@ @NDIFF_CLEAN@ tests/clean
+clean-nsock clean-nbase netutil_clean @NPING_CLEAN@ @ZENMAP_CLEAN@ \
+@NCAT_CLEAN@ @NMAP_UPDATE_CLEAN@ @NDIFF_CLEAN@ clean-tests
 	rm -f $(OBJS) $(TARGET)
 # Who generates dependencies.mk? If it is generated by ./configure and
 # not by make it should be moved to distclean
 	rm -f dependencies.mk
 
-
-clean-%:
-	-cd $* && $(MAKE) clean
-distclean-%: clean-%
-	-cd $* && $(MAKE) distclean
-
-pcap_clean:
-	-cd $(LIBPCAPDIR) && $(MAKE) clean
-pcre_clean:
-	-cd $(LIBPCREDIR) && $(MAKE) clean
-dnet_clean:
-	-cd $(LIBDNETDIR) && $(MAKE) clean
-nbase_clean:
-	-cd $(NBASEDIR) && $(MAKE) clean
-nsock_clean:
-	-cd $(NSOCKDIR)/src && $(MAKE) clean
-netutil_clean:
-	-cd libnetutil && $(MAKE) clean
-ncat_clean:
-	-cd $(NCATDIR) && $(MAKE) clean
-lua_clean:
-	-cd $(LIBLUADIR) && $(MAKE) clean
-liblinear_clean:
-	-cd $(LIBLINEARDIR) && $(MAKE) clean
-zenmap_clean:
-	-cd $(ZENMAPDIR) && $(PYTHON) setup.py clean --all
-	rm -f $(ZENMAPDIR)/zenmapCore/__init__.pyc
-	rm -f $(ZENMAPDIR)/zenmapCore/Version.pyc
-	rm -f $(ZENMAPDIR)/zenmapCore/Name.pyc
-ndiff_clean:
-	-cd $(NDIFFDIR) && $(PYTHON) setup.py clean --all
-nping_clean:
-	-cd $(NPINGDIR) && $(MAKE) clean
-pcap_dist_clean:
-	-cd $(LIBPCAPDIR) && $(MAKE) distclean
-pcre_dist_clean:
-	-cd $(LIBPCREDIR) && $(MAKE) distclean
-dnet_dist_clean:
-	-cd $(LIBDNETDIR) && $(MAKE) distclean
-lua_dist_clean:
-	-cd $(LIBLUADIR) && $(MAKE) clean
-liblinear_dist_clean: liblinear_clean
-nbase_dist_clean:
-	-cd $(NBASEDIR) && $(MAKE) distclean
-nsock_dist_clean:
-	-cd $(NSOCKDIR)/src && $(MAKE) distclean
-netutil_dist_clean:
-	-cd libnetutil && $(MAKE) distclean
-ncat_dist_clean:
-	-cd $(NCATDIR) && $(MAKE) distclean
-zenmap_dist_clean: zenmap_clean
-	-cd $(ZENMAPDIR) && rm -rf MANIFEST build/ dist/ INSTALLED_FILES
-ndiff_dist_clean: ndiff_clean
-	-cd $(NDIFFDIR) && rm -rf build/ dist/
-nping_dist_clean:
-	-cd $(NPINGDIR) && $(MAKE) distclean
 debugclean:
 	rm -f *.gcov *.gcda *.gcno gmon.out
 
 distclean: @LUA_DIST_CLEAN@ @LIBLINEAR_DIST_CLEAN@ @PCAP_DIST_CLEAN@ \
 @PCRE_DIST_CLEAN@ @DNET_DIST_CLEAN@ @NPING_DIST_CLEAN@ @ZENMAP_DIST_CLEAN@ \
-@NCAT_DIST_CLEAN@ @NMAP_UPDATE_DIST_CLEAN@ netutil_dist_clean \
-nsock_dist_clean nbase_dist_clean @NDIFF_DIST_CLEAN@ clean
+@NCAT_DIST_CLEAN@ @NMAP_UPDATE_DIST_CLEAN@ distclean-netutil \
+distclean-nsock distclean-nbase @NDIFF_DIST_CLEAN@ clean debugclean
 	rm -f Makefile Makefile.bak makefile.dep nmap_config.h stamp-h \
 	stamp-h.in config.cache config.log config.status
 
+clean-pcap:
+	-cd $(LIBPCAPDIR) && $(MAKE) clean
+
+clean-pcre:
+	-cd $(LIBPCREDIR) && $(MAKE) clean
+
+clean-dnet:
+	-cd $(LIBDNETDIR) && $(MAKE) clean
+
+clean-nbase:
+	-cd $(NBASEDIR) && $(MAKE) clean
+
+clean-nsock:
+	-cd $(NSOCKDIR)/src && $(MAKE) clean
+
+clean-netutil:
+	-cd libnetutil && $(MAKE) clean
+
+clean-ncat:
+	-cd $(NCATDIR) && $(MAKE) clean
+
+clean-lua:
+	-cd $(LIBLUADIR) && $(MAKE) clean
+
+clean-liblinear:
+	-cd $(LIBLINEARDIR) && $(MAKE) clean
+
+clean-zenmap:
+	-cd $(ZENMAPDIR) && $(PYTHON) setup.py clean --all
+	rm -f $(ZENMAPDIR)/zenmapCore/__init__.pyc
+	rm -f $(ZENMAPDIR)/zenmapCore/Version.pyc
+	rm -f $(ZENMAPDIR)/zenmapCore/Name.pyc
+
+clean-ndiff:
+	-cd $(NDIFFDIR) && $(PYTHON) setup.py clean --all
+
+clean-nping:
+	-cd $(NPINGDIR) && $(MAKE) clean
+
+clean-tests:
+	@rm -f tests/check_dns
+
+distclean-pcap:
+	-cd $(LIBPCAPDIR) && $(MAKE) distclean
+
+distclean-pcre:
+	-cd $(LIBPCREDIR) && $(MAKE) distclean
+
+distclean-dnet:
+	-cd $(LIBDNETDIR) && $(MAKE) distclean
+
+distclean-lua:
+	-cd $(LIBLUADIR) && $(MAKE) clean
+
+distclean-liblinear: clean-liblinear
+
+distclean-nbase:
+	-cd $(NBASEDIR) && $(MAKE) distclean
+
+distclean-nsock:
+	-cd $(NSOCKDIR)/src && $(MAKE) distclean
+
+distclean-netutil:
+	-cd libnetutil && $(MAKE) distclean
+
+distclean-ncat:
+	-cd $(NCATDIR) && $(MAKE) distclean
+
+distclean-zenmap: clean-zenmap
+	-cd $(ZENMAPDIR) && rm -rf MANIFEST build/ dist/ INSTALLED_FILES
+
+distclean-ndiff: clean-ndiff
+	-cd $(NDIFFDIR) && rm -rf build/ dist/
+
+distclean-nping:
+	-cd $(NPINGDIR) && $(MAKE) distclean
+
+clean-%:
+	-cd $* && $(MAKE) clean
+
+distclean-%: clean-%
+	-cd $* && $(MAKE) distclean
+
 install-nmap: $(TARGET)
 	$(INSTALL) -d $(DESTDIR)$(bindir) $(DESTDIR)$(mandir)/man1 $(DESTDIR)$(nmapdatadir)
 	$(INSTALL) -c -m 755 nmap $(DESTDIR)$(bindir)/nmap
@@ -304,9 +331,6 @@ nmap-update/default_channel.h: nmap.h
 tests/check_dns: $(OBJS)
 	 $(CXX) -o $@ $(CPPFLAGS) $(CXXFLAGS) $(LDFLAGS) $^ $(LIBS) tests/nmap_dns_test.cc
 
-tests/clean:
-	@rm -f tests/check_dns
-
 # By default distutils rewrites installed scripts to hardcode the
 # location of the Python interpreter they were built with (something
 # like #!/usr/bin/python2.4). This is the wrong thing to do when

configure

@@ -5780,7 +5780,7 @@ else
   UNINSTALLNDIFF=uninstall-ndiff
   NDIFF_CHECK="ndiff_check"
   NDIFF_CLEAN=ndiff_clean
-  NDIFF_DIST_CLEAN=ndiff_dist_clean
+  NDIFF_DIST_CLEAN=ndiff_distclean
 fi
 
 
@@ -5830,7 +5830,7 @@ else
   UNINSTALLZENMAP=uninstall-zenmap
   ZENMAP_CHECK=zenmap_check
   ZENMAP_CLEAN=zenmap_clean
-  ZENMAP_DIST_CLEAN=zenmap_dist_clean
+  ZENMAP_DIST_CLEAN=zenmap_distclean
 fi
 
 
@@ -5864,8 +5864,8 @@ else
   BUILDNPING=build-nping
   INSTALLNPING=install-nping
   UNINSTALLNPING=uninstall-nping
-  NPING_CLEAN=nping_clean
-  NPING_DIST_CLEAN=nping_dist_clean
+  NPING_CLEAN=clean-nping
+  NPING_DIST_CLEAN=distclean-nping
 
 
 subdirs="$subdirs nping"
@@ -6291,8 +6291,8 @@ if test $have_libpcap != yes; then
   LIBPCAP_LIBS='$(LIBPCAPDIR)/libpcap.a'
   PCAP_DEPENDS='$(LIBPCAPDIR)/libpcap.a'
   PCAP_BUILD="build-pcap"
-  PCAP_CLEAN="pcap_clean"
-  PCAP_DIST_CLEAN="pcap_dist_clean"
+  PCAP_CLEAN="clean-pcap"
+  PCAP_DIST_CLEAN="pcap_distclean"
 
 $as_echo "#define PCAP_INCLUDED 1" >>confdefs.h
 
@@ -6482,7 +6482,7 @@ if test $have_pcre != yes ; then
   PCRE_DEPENDS="$LIBPCREDIR/libpcre.a"
   PCRE_BUILD="build-pcre"
   PCRE_CLEAN="pcre_clean"
-  PCRE_DIST_CLEAN="pcre_dist_clean"
+  PCRE_DIST_CLEAN="pcre_distclean"
 
 $as_echo "#define PCRE_INCLUDED 1" >>confdefs.h
 
@@ -6551,7 +6551,7 @@ if test $have_dnet != yes ; then
   DNET_DEPENDS="\$(top_srcdir)/$LIBDNETDIR/src/.libs/libdnet.a"
   DNET_BUILD="build-dnet"
   DNET_CLEAN="dnet_clean"
-  DNET_DIST_CLEAN="dnet_dist_clean"
+  DNET_DIST_CLEAN="dnet_distclean"
 
 $as_echo "#define DNET_INCLUDED 1" >>confdefs.h
 
@@ -6589,7 +6589,7 @@ if test "${with_liblua+set}" = set; then :
     LUA_DEPENDS="\$(top_srcdir)/$LIBLUADIR/liblua.a"
     LUA_BUILD="build-lua"
     LUA_CLEAN="lua_clean"
-    LUA_DIST_CLEAN="lua_dist_clean"
+    LUA_DIST_CLEAN="lua_distclean"
       have_lua="yes"
 
   ;;
@@ -6868,7 +6868,7 @@ $as_echo "no" >&6; }
     LUA_DEPENDS="\$(top_srcdir)/$LIBLUADIR/liblua.a"
     LUA_BUILD="build-lua"
     LUA_CLEAN="lua_clean"
-    LUA_DIST_CLEAN="lua_dist_clean"
+    LUA_DIST_CLEAN="lua_distclean"
 
 $as_echo "#define LUA_INCLUDED 1" >>confdefs.h
 
@@ -6908,7 +6908,7 @@ if test "${with_liblinear+set}" = set; then :
     LIBLINEAR_DEPENDS="\$(top_srcdir)/$LIBLINEARDIR/liblinear.a"
     LIBLINEAR_BUILD="liblinear_build"
     LIBLINEAR_CLEAN="liblinear_clean"
-    LIBLINEAR_DIST_CLEAN="liblinear_dist_clean"
+    LIBLINEAR_DIST_CLEAN="liblinear_distclean"
     have_liblinear=yes
   ;;
   *)
@@ -6991,7 +6991,7 @@ $as_echo "no" >&6; }
   LIBLINEAR_DEPENDS="\$(top_srcdir)/$LIBLINEARDIR/liblinear.a"
   LIBLINEAR_BUILD="liblinear_build"
   LIBLINEAR_CLEAN="liblinear_clean"
-  LIBLINEAR_DIST_CLEAN="liblinear_dist_clean"
+  LIBLINEAR_DIST_CLEAN="liblinear_distclean"
 
 $as_echo "#define LIBLINEAR_INCLUDED 1" >>confdefs.h
 
@@ -7557,7 +7557,7 @@ else
   NCAT_INSTALL="install-ncat"
   NCAT_UNINSTALL="uninstall-ncat"
   NCAT_CLEAN="ncat_clean"
-  NCAT_DIST_CLEAN="ncat_dist_clean"
+  NCAT_DIST_CLEAN="ncat_distclean"
   subdirs="$subdirs ncat"
 
 fi

configure.ac

@@ -257,7 +257,7 @@ else
   UNINSTALLNDIFF=uninstall-ndiff
   NDIFF_CHECK="ndiff_check"
   NDIFF_CLEAN=ndiff_clean
-  NDIFF_DIST_CLEAN=ndiff_dist_clean
+  NDIFF_DIST_CLEAN=ndiff_distclean
 fi
 AC_SUBST(NDIFFDIR)
 AC_SUBST(BUILDNDIFF)
@@ -296,7 +296,7 @@ else
   UNINSTALLZENMAP=uninstall-zenmap
   ZENMAP_CHECK=zenmap_check
   ZENMAP_CLEAN=zenmap_clean
-  ZENMAP_DIST_CLEAN=zenmap_dist_clean
+  ZENMAP_DIST_CLEAN=zenmap_distclean
 fi
 AC_SUBST(ZENMAPDIR)
 AC_SUBST(BUILDZENMAP)
@@ -323,8 +323,8 @@ else
   BUILDNPING=build-nping
   INSTALLNPING=install-nping
   UNINSTALLNPING=uninstall-nping
-  NPING_CLEAN=nping_clean
-  NPING_DIST_CLEAN=nping_dist_clean
+  NPING_CLEAN=clean-nping
+  NPING_DIST_CLEAN=distclean-nping
   AC_CONFIG_SUBDIRS(nping)
 fi
 AC_SUBST(NPINGDIR)
@@ -462,8 +462,8 @@ if test $have_libpcap != yes; then
   LIBPCAP_LIBS='$(LIBPCAPDIR)/libpcap.a'
   PCAP_DEPENDS='$(LIBPCAPDIR)/libpcap.a'
   PCAP_BUILD="build-pcap"
-  PCAP_CLEAN="pcap_clean"
-  PCAP_DIST_CLEAN="pcap_dist_clean"
+  PCAP_CLEAN="clean-pcap"
+  PCAP_DIST_CLEAN="pcap_distclean"
   AC_DEFINE(PCAP_INCLUDED, 1, [Using included libpcap])
 else
   # We assume our included libpcap doesn't need this check-and-define
@@ -523,7 +523,7 @@ if test $have_pcre != yes ; then
   PCRE_DEPENDS="$LIBPCREDIR/libpcre.a"
   PCRE_BUILD="build-pcre"
   PCRE_CLEAN="pcre_clean"
-  PCRE_DIST_CLEAN="pcre_dist_clean"
+  PCRE_DIST_CLEAN="pcre_distclean"
   AC_DEFINE(PCRE_INCLUDED, 1, [Using included libpcre])
 else
 # We only need to check for and use this if we are NOT using included pcre
@@ -576,7 +576,7 @@ if test $have_dnet != yes ; then
   DNET_DEPENDS="\$(top_srcdir)/$LIBDNETDIR/src/.libs/libdnet.a"
   DNET_BUILD="build-dnet"
   DNET_CLEAN="dnet_clean"
-  DNET_DIST_CLEAN="dnet_dist_clean"
+  DNET_DIST_CLEAN="dnet_distclean"
   AC_DEFINE(DNET_INCLUDED, 1, [Use included libdnet])
 else
   LIBDNET_LIBS="-ldnet"
@@ -613,7 +613,7 @@ AC_HELP_STRING([--without-liblua], [Compile without lua (this will exclude all o
     LUA_DEPENDS="\$(top_srcdir)/$LIBLUADIR/liblua.a"
     LUA_BUILD="build-lua"
     LUA_CLEAN="lua_clean"
-    LUA_DIST_CLEAN="lua_dist_clean"
+    LUA_DIST_CLEAN="lua_distclean"
       have_lua="yes"
 
   ;;
@@ -674,7 +674,7 @@ else
     LUA_DEPENDS="\$(top_srcdir)/$LIBLUADIR/liblua.a"
     LUA_BUILD="build-lua"
     LUA_CLEAN="lua_clean"
-    LUA_DIST_CLEAN="lua_dist_clean"
+    LUA_DIST_CLEAN="lua_distclean"
     AC_DEFINE(LUA_INCLUDED, 1, [Using included liblua])
   else
     AC_MSG_RESULT(yes)
@@ -711,7 +711,7 @@ AC_HELP_STRING([--with-liblinear=included], [Use the liblinear version included
     LIBLINEAR_DEPENDS="\$(top_srcdir)/$LIBLINEARDIR/liblinear.a"
     LIBLINEAR_BUILD="liblinear_build"
     LIBLINEAR_CLEAN="liblinear_clean"
-    LIBLINEAR_DIST_CLEAN="liblinear_dist_clean"
+    LIBLINEAR_DIST_CLEAN="liblinear_distclean"
     have_liblinear=yes
   ;;
   *)
@@ -742,7 +742,7 @@ if test $have_liblinear != yes; then
   LIBLINEAR_DEPENDS="\$(top_srcdir)/$LIBLINEARDIR/liblinear.a"
   LIBLINEAR_BUILD="liblinear_build"
   LIBLINEAR_CLEAN="liblinear_clean"
-  LIBLINEAR_DIST_CLEAN="liblinear_dist_clean"
+  LIBLINEAR_DIST_CLEAN="liblinear_distclean"
   AC_DEFINE(LIBLINEAR_INCLUDED, 1, [Using included liblinear])
 else
   AC_MSG_RESULT(yes)
@@ -899,7 +899,7 @@ else
   NCAT_INSTALL="install-ncat"
   NCAT_UNINSTALL="uninstall-ncat"
   NCAT_CLEAN="ncat_clean"
-  NCAT_DIST_CLEAN="ncat_dist_clean"
+  NCAT_DIST_CLEAN="ncat_distclean"
   AC_CONFIG_SUBDIRS(ncat)
 fi
 

ncat/Makefile.in

@@ -186,10 +186,10 @@ ncat_clean:
 
 clean: ncat_clean @LUA_CLEAN@
 
-lua_clean:
+clean-lua:
 	-cd $(LIBLUADIR) && $(MAKE) clean
 
-lua_dist_clean:
+distclean-lua:
 	-cd $(LIBLUADIR) && $(MAKE) clean
 
 distclean: clean @LUA_DIST_CLEAN@

ncat/configure

@@ -5017,7 +5017,7 @@ else
   PCAP_DEPENDS='$(LIBPCAPDIR)/libpcap.a'
   PCAP_BUILD="build-pcap"
   PCAP_CLEAN="pcap_clean"
-  PCAP_DIST_CLEAN="pcap_dist_clean"
+  PCAP_DIST_CLEAN="pcap_distclean"
 fi
 
 
@@ -5186,7 +5186,7 @@ if test "${with_liblua+set}" = set; then :
     LUA_DEPENDS="\$(top_srcdir)/$LIBLUADIR/liblua.a"
     LUA_BUILD="build-lua"
     LUA_CLEAN="lua_clean"
-    LUA_DIST_CLEAN="lua_dist_clean"
+    LUA_DIST_CLEAN="lua_distclean"
 	have_lua="yes"
 
   ;;
@@ -5665,7 +5665,7 @@ $as_echo "no" >&6; }
     LUA_DEPENDS="\$(top_srcdir)/$LIBLUADIR/liblua.a"
     LUA_BUILD="build-lua"
     LUA_CLEAN="lua_clean"
-    LUA_DIST_CLEAN="lua_dist_clean"
+    LUA_DIST_CLEAN="lua_distclean"
     $as_echo "#define LUA_INCLUDED 1" >>confdefs.h
 
   else

ncat/configure.ac

@@ -186,8 +186,8 @@ else
   fi
   PCAP_DEPENDS='$(LIBPCAPDIR)/libpcap.a'
   PCAP_BUILD="build-pcap"
-  PCAP_CLEAN="pcap_clean"
-  PCAP_DIST_CLEAN="pcap_dist_clean"
+  PCAP_CLEAN="clean-pcap"
+  PCAP_DIST_CLEAN="distclean-pcap"
 fi
 
 AC_SUBST(PCAP_DEPENDS)
@@ -224,8 +224,8 @@ AC_HELP_STRING([--without-liblua], [Compile without lua (this will exclude all o
     LIBLUA_LIBS="\$(top_srcdir)/$LIBLUADIR/liblua.a"
     LUA_DEPENDS="\$(top_srcdir)/$LIBLUADIR/liblua.a"
     LUA_BUILD="build-lua"
-    LUA_CLEAN="lua_clean"
-    LUA_DIST_CLEAN="lua_dist_clean"
+    LUA_CLEAN="clean-lua"
+    LUA_DIST_CLEAN="distclean-lua"
 	have_lua="yes"
 	
   ;;
@@ -283,8 +283,8 @@ else
     LIBLUA_LIBS="\$(top_srcdir)/$LIBLUADIR/liblua.a"
     LUA_DEPENDS="\$(top_srcdir)/$LIBLUADIR/liblua.a"
     LUA_BUILD="build-lua"
-    LUA_CLEAN="lua_clean"
-    LUA_DIST_CLEAN="lua_dist_clean"
+    LUA_CLEAN="clean-lua"
+    LUA_DIST_CLEAN="distclean-lua"
     AC_DEFINE(LUA_INCLUDED)
   else
     AC_MSG_RESULT(yes) 

nping/configure

@@ -5344,7 +5344,7 @@ if test $have_libpcap != yes; then
   PCAP_DEPENDS='$(LIBPCAPDIR)/libpcap.a'
   PCAP_BUILD="build-pcap"
   PCAP_CLEAN="pcap_clean"
-  PCAP_DIST_CLEAN="pcap_dist_clean"
+  PCAP_DIST_CLEAN="pcap_distclean"
 else
   $as_echo "#define HAVE_LIBPCAP 1" >>confdefs.h
 
@@ -5405,7 +5405,7 @@ if test $have_dnet != yes ; then
   DNET_DEPENDS="$LIBDNETDIR/src/.libs/libdnet.a"
   DNET_BUILD="dnet_build"
   DNET_CLEAN="dnet_clean"
-  DNET_DIST_CLEAN="dnet_dist_clean"
+  DNET_DIST_CLEAN="dnet_distclean"
 else
   LIBDNET_LIBS="-ldnet"
   DNET_DEPENDS=""

nping/configure.ac

@@ -248,8 +248,8 @@ if test $have_libpcap != yes; then
   LIBPCAP_LIBS='$(LIBPCAPDIR)/libpcap.a'
   PCAP_DEPENDS='$(LIBPCAPDIR)/libpcap.a'
   PCAP_BUILD="build-pcap"
-  PCAP_CLEAN="pcap_clean"
-  PCAP_DIST_CLEAN="pcap_dist_clean"
+  PCAP_CLEAN="clean-pcap"
+  PCAP_DIST_CLEAN="distclean-pcap"
 else
   AC_DEFINE(HAVE_LIBPCAP)
   LIBPCAP_LIBS="-lpcap"
@@ -302,8 +302,8 @@ if test $have_dnet != yes ; then
   LIBDNET_LIBS="$LIBDNETDIR/src/.libs/libdnet.a"
   DNET_DEPENDS="$LIBDNETDIR/src/.libs/libdnet.a"
   DNET_BUILD="build-dnet"
-  DNET_CLEAN="dnet_clean"
-  DNET_DIST_CLEAN="dnet_dist_clean"
+  DNET_CLEAN="clean-dnet"
+  DNET_DIST_CLEAN="distclean-dnet"
 else
   LIBDNET_LIBS="-ldnet"
   DNET_DEPENDS=""