Have "make clean" clean up umit as well.

Makefile.in

@@ -25,6 +25,8 @@ DBGFLAGS =
 LIBPCAPDIR = @libpcapdir@
 LIBPCREDIR = @LIBPCREDIR@
 export LIBDNETDIR = @LIBDNETDIR@
+UMITDIR = umit
+PYTHON = python
 DEFS = @DEFS@ -DNMAP_NAME=\"$(NMAP_NAME)\" -DNMAP_URL=\"$(NMAP_URL)\" -DNMAP_PLATFORM=\"$(NMAP_PLATFORM)\" -DNMAPDATADIR=\"$(nmapdatadir)\"
 # For mtrace debugging -- see MTRACE define in main.cc for instructions
 # Should only be enabled during debugging and not in any real release.
@@ -133,7 +135,7 @@ distro:
 web:
 	cd $(NMAPDEVDIR) && $(MAKE) web
 
-clean: @LUA_CLEAN@ @PCAP_CLEAN@ @PCRE_CLEAN@ @DNET_CLEAN@ nmapfe_clean nsock_clean nbase_clean my_clean @NSELIB_CLEAN@
+clean: @LUA_CLEAN@ @PCAP_CLEAN@ @PCRE_CLEAN@ @DNET_CLEAN@ nmapfe_clean nsock_clean nbase_clean my_clean @NSELIB_CLEAN@ @UMIT_CLEAN@
 
 my_clean:
 	rm -f dependencies.mk
@@ -154,6 +156,8 @@ lua_clean:
 	-cd $(LIBLUADIR) && $(MAKE) clean
 nselib_clean:
 	-cd nselib && $(MAKE) clean
+umit_clean:
+	-cd $(UMITDIR) && $(PYTHON) setup.py clean --all
 pcap_dist_clean:
 	-cd $(LIBPCAPDIR) && $(MAKE) distclean
 pcre_dist_clean:
@@ -170,10 +174,11 @@ nbase_dist_clean:
 	-cd $(NBASEDIR) && $(MAKE) distclean
 nsock_dist_clean:
 	-cd $(NSOCKDIR)/src && $(MAKE) distclean
+umit_dist_clean: umit_clean
 debugclean:
 	rm -f *.gcov *.gcda *.gcno gmon.out
 
-distclean: my_clean my_distclean @LUA_DIST_CLEAN@ @PCAP_DIST_CLEAN@ @PCRE_DIST_CLEAN@ @DNET_DIST_CLEAN@ nmapfe_dist_clean  @NSELIB_DIST_CLEAN@
+distclean: my_clean my_distclean @LUA_DIST_CLEAN@ @PCAP_DIST_CLEAN@ @PCRE_DIST_CLEAN@ @DNET_DIST_CLEAN@ nmapfe_dist_clean  @NSELIB_DIST_CLEAN@ @UMIT_DIST_CLEAN@
 
 my_distclean:
 	rm -f Makefile Makefile.bak makefile.dep config.h stamp-h stamp-h.in \
@@ -198,8 +203,11 @@ install-nmapfe: $(TARGETNMAPFE)
 	@echo "If the next command fails -- you cannot use the X front end"
 	-test -f nmapfe/nmapfe && $(INSTALL) -c -m 755 -s nmapfe/nmapfe $(DESTDIR)$(bindir)/nmapfe && rm -f $(DESTDIR)$(bindir)/xnmap && $(SHTOOL) mkln -f -s $(DESTDIR)$(bindir)/nmapfe $(DESTDIR)$(bindir)/xnmap && $(INSTALL) -c -m 644 nmapfe.desktop $(DESTDIR)$(deskdir)/nmapfe.desktop && $(INSTALL) -c -m 644 docs/nmapfe.1 $(DESTDIR)$(mandir)/man1/nmapfe.1 && $(INSTALL) -c -m 644 docs/xnmap.1 $(DESTDIR)$(mandir)/man1/xnmap.1
 
-install-umit: umit/install_scripts/unix/setup.py
+$(UMITDIR)/setup.py:
-	cd umit && install_scripts/unix/setup.sh && python setup.py install --prefix $(DESTDIR)$(prefix)
+	cd $(UMITDIR) && install_scripts/unix/setup.sh
+
+install-umit: $(UMITDIR)/setup.py
+	cd $(UMITDIR) && $(PYTHON) setup.py install --prefix $(DESTDIR)$(prefix)
 
 NSE_FILES = scripts/script.db scripts/*.nse
 NSE_LIB_FILES = nselib/*lua nselib/*so

configure

@@ -313,7 +313,7 @@ ac_subdirs_all="$ac_subdirs_all libpcre"
 ac_subdirs_all="$ac_subdirs_all libdnet-stripped"
 ac_subdirs_all="$ac_subdirs_all nselib"
 ac_subdirs_all="$ac_subdirs_all $nmap_cfg_subdirs"
-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS libpcapdir pcredir CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CXX CXXFLAGS ac_ct_CXX CXXPROG COMPAT_OBJS COMPAT_SRCS build build_cpu build_vendor build_os host host_cpu host_vendor host_os LUAFLAGS CPP EGREP TARGETNMAPFE INSTALLNMAPFE INSTALLUMIT OPENSSL_LIBS PCAP_DEPENDS PCAP_CLEAN PCAP_DIST_CLEAN LIBPCAP_LIBS subdirs LIBPCRE_LIBS LIBPCREDIR PCRE_DEPENDS PCRE_CLEAN PCRE_DIST_CLEAN LIBDNET_LIBS LIBDNETDIR DNET_DEPENDS DNET_CLEAN DNET_DIST_CLEAN LIBLUA_LIBS LIBLUADIR LUA_DEPENDS LUA_CLEAN LUA_DIST_CLEAN INSTALLNSE NSELIB_CLEAN NSELIB_DIST_CLEAN NBASEDIR LIBNBASE_LIBS NSOCKDIR LIBNSOCK_LIBS GTK_CONFIG LIBOBJS LTLIBOBJS'
+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS libpcapdir pcredir CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CXX CXXFLAGS ac_ct_CXX CXXPROG COMPAT_OBJS COMPAT_SRCS build build_cpu build_vendor build_os host host_cpu host_vendor host_os LUAFLAGS CPP EGREP TARGETNMAPFE INSTALLNMAPFE INSTALLUMIT UMIT_CLEAN UMIT_DIST_CLEAN OPENSSL_LIBS PCAP_DEPENDS PCAP_CLEAN PCAP_DIST_CLEAN LIBPCAP_LIBS subdirs LIBPCRE_LIBS LIBPCREDIR PCRE_DEPENDS PCRE_CLEAN PCRE_DIST_CLEAN LIBDNET_LIBS LIBDNETDIR DNET_DEPENDS DNET_CLEAN DNET_DIST_CLEAN LIBLUA_LIBS LIBLUADIR LUA_DEPENDS LUA_CLEAN LUA_DIST_CLEAN INSTALLNSE NSELIB_CLEAN NSELIB_DIST_CLEAN NBASEDIR LIBNBASE_LIBS NSOCKDIR LIBNSOCK_LIBS GTK_CONFIG LIBOBJS LTLIBOBJS'
 ac_subst_files=''
 
 # Initialize some variables set by options.
@@ -4034,6 +4034,8 @@ fi;
 
 # Do they want UMIT?
 INSTALLUMIT=install-umit
+UMIT_CLEAN=umit_clean
+UMIT_DIST_CLEAN=umit_dist_clean
 
 # Check whether --with-umit or --without-umit was given.
 if test "${with_umit+set}" = set; then
@@ -4041,6 +4043,8 @@ if test "${with_umit+set}" = set; then
    case "$with_umit" in
    no)
     INSTALLUMIT=""
+    UMIT_CLEAN=""
+    UMIT_DIST_CLEAN=""
     ;;
    esac
 
@@ -4048,6 +4052,8 @@ fi;
 
 
 
+
+
 # We test whether they specified openssl desires explicitly
 use_openssl="yes"
 specialssldir=""
@@ -7738,6 +7744,8 @@ s,@EGREP@,$EGREP,;t t
 s,@TARGETNMAPFE@,$TARGETNMAPFE,;t t
 s,@INSTALLNMAPFE@,$INSTALLNMAPFE,;t t
 s,@INSTALLUMIT@,$INSTALLUMIT,;t t
+s,@UMIT_CLEAN@,$UMIT_CLEAN,;t t
+s,@UMIT_DIST_CLEAN@,$UMIT_DIST_CLEAN,;t t
 s,@OPENSSL_LIBS@,$OPENSSL_LIBS,;t t
 s,@PCAP_DEPENDS@,$PCAP_DEPENDS,;t t
 s,@PCAP_CLEAN@,$PCAP_CLEAN,;t t

configure.ac

@@ -188,14 +188,20 @@ AC_SUBST(INSTALLNMAPFE)
 
 # Do they want UMIT?
 INSTALLUMIT=install-umit
+UMIT_CLEAN=umit_clean
+UMIT_DIST_CLEAN=umit_dist_clean
 AC_ARG_WITH(umit, AC_HELP_STRING([--without-umit], [Skip installation of the UMIT graphical frontend]),
  [ case "$with_umit" in
    no)
     INSTALLUMIT=""
+    UMIT_CLEAN=""
+    UMIT_DIST_CLEAN=""
     ;;
    esac]
 )
 AC_SUBST(INSTALLUMIT)
+AC_SUBST(UMIT_CLEAN)
+AC_SUBST(UMIT_DIST_CLEAN)
 
 
 # We test whether they specified openssl desires explicitly