From 3b2a197ca14d7cd76eafe56a86b66ef53e93d589 Mon Sep 17 00:00:00 2001 From: dmiller Date: Thu, 20 Nov 2014 16:19:56 +0000 Subject: [PATCH] Make build of ncat depend on lua_build, should fix occasional build failure with make -j8 --- ncat/Makefile.in | 2 +- ncat/configure | 6 +++++- ncat/configure.ac | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/ncat/Makefile.in b/ncat/Makefile.in index cfd306d5f..207bbf9fd 100644 --- a/ncat/Makefile.in +++ b/ncat/Makefile.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)" diff --git a/ncat/configure b/ncat/configure index 70fec3519..a1ad13d57 100755 --- a/ncat/configure +++ b/ncat/configure @@ -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" diff --git a/ncat/configure.ac b/ncat/configure.ac index efe650c49..d00ef0de7 100644 --- a/ncat/configure.ac +++ b/ncat/configure.ac @@ -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"