mirror of
https://github.com/nmap/nmap.git
synced 2025-12-06 04:31:29 +00:00
Make build of ncat depend on lua_build, should fix occasional build failure with make -j8
This commit is contained in:
@@ -107,7 +107,7 @@ ifneq ($(HAVE_OPENSSL),)
|
||||
TEST_PROGS += test/test-wildcard
|
||||
endif
|
||||
|
||||
all: @LUA_BUILD@ $(TARGET) $(TEST_PROGS)
|
||||
all: $(TARGET) $(TEST_PROGS)
|
||||
|
||||
lua_build: $(LIBLUADIR)/Makefile
|
||||
@echo Compiling liblua; cd $(LIBLUADIR) && $(MAKE) liblua.a CC="$(CC)" MYCFLAGS="$(CFLAGS) $(LUA_CFLAGS)"
|
||||
|
||||
6
ncat/configure
vendored
6
ncat/configure
vendored
@@ -2323,6 +2323,10 @@ ac_config_headers="$ac_config_headers config.h"
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
ac_aux_dir=
|
||||
for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
|
||||
if test -f "$ac_dir/install-sh"; then
|
||||
@@ -5189,7 +5193,7 @@ if test "${with_liblua+set}" = set; then :
|
||||
included)
|
||||
CPPFLAGS="-I\$(top_srcdir)/$LIBLUADIR $CPPFLAGS"
|
||||
LIBLUA_LIBS="\$(top_srcdir)/$LIBLUADIR/liblua.a"
|
||||
LUA_DEPENDS="\$(top_srcdir)/$LIBLUADIR/liblua.a"
|
||||
LUA_DEPENDS="lua_build \$(top_srcdir)/$LIBLUADIR/liblua.a"
|
||||
LUA_BUILD="lua_build"
|
||||
LUA_CLEAN="lua_clean"
|
||||
LUA_DIST_CLEAN="lua_dist_clean"
|
||||
|
||||
@@ -222,7 +222,7 @@ AC_HELP_STRING([--without-liblua], [Compile without lua (this will exclude all o
|
||||
included)
|
||||
CPPFLAGS="-I\$(top_srcdir)/$LIBLUADIR $CPPFLAGS"
|
||||
LIBLUA_LIBS="\$(top_srcdir)/$LIBLUADIR/liblua.a"
|
||||
LUA_DEPENDS="\$(top_srcdir)/$LIBLUADIR/liblua.a"
|
||||
LUA_DEPENDS="lua_build \$(top_srcdir)/$LIBLUADIR/liblua.a"
|
||||
LUA_BUILD="lua_build"
|
||||
LUA_CLEAN="lua_clean"
|
||||
LUA_DIST_CLEAN="lua_dist_clean"
|
||||
|
||||
Reference in New Issue
Block a user