1
0
mirror of https://github.com/nmap/nmap.git synced 2025-12-25 08:59:01 +00:00

Uniform handling of makefile.dep in makefiles.

"make clean" keeps makefile.dep and "make distclean" deletes it. This
patch is by Michael McTiernan.

http://seclists.org/nmap-dev/2012/q2/827
This commit is contained in:
david
2012-06-19 14:06:49 +00:00
parent e3dc67a44d
commit 7f5d53184c
7 changed files with 13 additions and 9 deletions

View File

@@ -1,5 +1,9 @@
# Nmap Changelog ($Id$); -*-text-*-
o Made the various Makefiles' treatment of makefile.dep uniform:
"make clean" keeps the file and "make distclean" deletes it.
[Michael McTernan]
o [Ncat] --output logging now works in UDP mode. Thanks to Michal
Hlavinka for reporting the bug. [David Fifield]

View File

@@ -186,7 +186,7 @@ web:
clean: @LUA_CLEAN@ @LIBLINEAR_CLEAN@ @PCAP_CLEAN@ @PCRE_CLEAN@ @DNET_CLEAN@ nsock_clean nbase_clean netutil_clean my_clean @NPING_CLEAN@ @ZENMAP_CLEAN@ @NCAT_CLEAN@ @NMAP_UPDATE_CLEAN@
my_clean:
rm -f dependencies.mk makefile.dep
rm -f dependencies.mk
rm -f $(OBJS) $(TARGET) config.cache
clean-%:

View File

@@ -28,7 +28,7 @@ clean:
rm -f $(OBJS) $(TARGET)
distclean: clean
rm -rf Makefile
rm -rf Makefile makefile.dep
Makefile: Makefile.in
cd $(top_srcdir) && ./config.status

View File

@@ -156,12 +156,12 @@ uninstall:
$(RM) -rf $(DESTDIR)$(pkgdatadir)/
ncat_clean:
$(RM) -f *.o test/*.o $(TARGET) $(TEST_PROGS) makefile.dep
$(RM) -f *.o test/*.o $(TARGET) $(TEST_PROGS)
clean: ncat_clean
distclean: clean
-rm -f Makefile $(CONFIG_CLEAN_FILES)
-rm -f Makefile makefile.dep $(CONFIG_CLEAN_FILES)
TESTS = ./test-addrset.sh ./test-cmdline-split ./test-uri
ifneq ($(HAVE_OPENSSL),)

View File

@@ -46,10 +46,10 @@ uninstall:
$(RM) -f $(DESTDIR)$(bindir)/nmap-update
clean:
rm -f nmap-update *.o makefile.dep
rm -f nmap-update *.o
distclean: clean
rm -f Makefile
rm -f Makefile makefile.dep
Makefile: Makefile.in
./config.status

View File

@@ -112,7 +112,7 @@ web:
clean: my_clean
my_clean:
rm -f dependencies.mk makefile.dep
rm -f dependencies.mk
rm -f $(OBJS) $(TARGET) config.cache
debugclean:
rm -f *.gcov *.gcda *.gcno gmon.out

View File

@@ -47,10 +47,10 @@ $(NBASEDIR)/libnbase.a: $(NBASEDIR)/Makefile
cd $(NBASEDIR) && $(MAKE)
clean:
rm -f $(OBJS) $(TARGET) makefile.dep
rm -f $(OBJS) $(TARGET)
distclean: clean
rm -f Makefile config.log config.status nsock_config.h
rm -f Makefile makefile.dep config.log config.status nsock_config.h
depend:
$(MAKEDEPEND) $(INCLS) -s "# DO NOT DELETE" -- $(DEFS) -- $(SRCS)