From be9e8bf7b105f1f423f01a92f5b243de58da4693 Mon Sep 17 00:00:00 2001 From: fyodor Date: Sat, 30 Aug 2008 22:01:45 +0000 Subject: [PATCH] o Fixed a Makefile problem (race condition) which could lead to build failures when launching make in parallel mode (e.g. -j4). [Michal Januszewski] --- CHANGELOG | 4 ++++ Makefile.in | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/CHANGELOG b/CHANGELOG index a391d563b..8389bd97d 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,5 +1,9 @@ # Nmap Changelog ($Id$); -*-text-*- +o Fixed a Makefile problem (race condition) which could lead to build + failures when launching make in parallel mode (e.g. -j4). [Michal + Januszewski] + o Added new addrow() function to NSE tab library. It allows developers to add a whole row at once rather than doing a separate add() call for each column in a row. [Sven Klemm] diff --git a/Makefile.in b/Makefile.in index 423684e2c..3ba63bf08 100644 --- a/Makefile.in +++ b/Makefile.in @@ -100,7 +100,7 @@ nbase_build: $(NBASEDIR)/Makefile @echo Compiling libnbase; cd $(NBASEDIR) && $(MAKE) -nsock_build: $(NSOCKDIR)/src/Makefile +nsock_build: $(NSOCKDIR)/src/Makefile nbase_build @echo Compiling libnsock; cd $(NSOCKDIR)/src && $(MAKE)