Strictly use autoconf-generated build targets for nmap dependencies. Fixes #227

Makefile.in

@@ -117,9 +117,7 @@ FPModel.o: CXXFLAGS += -g0
 all: $(TARGET) $(BUILDZENMAP) $(BUILDNDIFF) $(BUILDNPING) $(BUILDNCAT) @NMAP_UPDATE_BUILD@
 
 $(TARGET): build-netutil @LIBLINEAR_BUILD@ @PCAP_BUILD@ @PCRE_BUILD@ @NSOCK_BUILD@ @NBASE_BUILD@ @DNET_BUILD@ @LUA_BUILD@ \
-	@LUA_DEPENDS@ @LIBLINEAR_DEPENDS@ @PCAP_DEPENDS@ @PCRE_DEPENDS@ \
+	$(OBJS) main.o
-	@DNET_DEPENDS@ $(NBASEDIR)/libnbase.a $(NSOCKDIR)/src/libnsock.a \
-	libnetutil/libnetutil.a $(OBJS) main.o
 	@echo Compiling nmap
 	rm -f $@
 	$(CXX) $(LDFLAGS) -o $@ $(OBJS) main.o $(LIBS)

configure

@@ -644,7 +644,6 @@ NBASEDIR
 LIBLINEAR_DIST_CLEAN
 LIBLINEAR_CLEAN
 LIBLINEAR_BUILD
-LIBLINEAR_DEPENDS
 LIBLINEARDIR
 LIBLINEAR_LIBS
 NSE_CHECK
@@ -652,26 +651,22 @@ INSTALLNSE
 LUA_DIST_CLEAN
 LUA_CLEAN
 LUA_BUILD
-LUA_DEPENDS
 LIBLUADIR
 LIBLUA_LIBS
 DNET_DIST_CLEAN
 DNET_CLEAN
 DNET_BUILD
-DNET_DEPENDS
 LIBDNETDIR
 LIBDNET_LIBS
 PCRE_DIST_CLEAN
 PCRE_CLEAN
 PCRE_BUILD
-PCRE_DEPENDS
 LIBPCREDIR
 LIBPCRE_LIBS
 LIBPCAP_LIBS
 PCAP_DIST_CLEAN
 PCAP_CLEAN
 PCAP_BUILD
-PCAP_DEPENDS
 OPENSSL_LIBS
 NPING_DIST_CLEAN
 NPING_CLEAN
@@ -6289,7 +6284,6 @@ if test $have_libpcap != yes; then
     CPPFLAGS="$CPPFLAGS -I\$(top_srcdir)/$libpcapdir"
   fi
   LIBPCAP_LIBS='$(LIBPCAPDIR)/libpcap.a'
-  PCAP_DEPENDS='$(LIBPCAPDIR)/libpcap.a'
   PCAP_BUILD="build-pcap"
   PCAP_CLEAN="clean-pcap"
   PCAP_DIST_CLEAN="distclean-pcap"
@@ -6340,7 +6334,6 @@ $as_echo "$ac_cv_have_pcap_netmask_unknown" >&6; }
 $as_echo "#define HAVE_LIBPCAP 1" >>confdefs.h
 
   LIBPCAP_LIBS="-lpcap"
-  PCAP_DEPENDS=""
   PCAP_BUILD=""
   PCAP_CLEAN=""
   PCAP_DIST_CLEAN=""
@@ -6351,7 +6344,6 @@ fi
 
 
 
-
 have_pcre=no
 requested_included_pcre=no
 LIBPCREDIR=libpcre
@@ -6479,7 +6471,6 @@ if test $have_pcre != yes ; then
 
   CPPFLAGS="-I\$(top_srcdir)/$LIBPCREDIR $CPPFLAGS"
   LIBPCRE_LIBS="$LIBPCREDIR/libpcre.a"
-  PCRE_DEPENDS="$LIBPCREDIR/libpcre.a"
   PCRE_BUILD="build-pcre"
   PCRE_CLEAN="clean-pcre"
   PCRE_DIST_CLEAN="distclean-pcre"
@@ -6501,7 +6492,6 @@ fi
 done
 
   LIBPCRE_LIBS="-lpcre"
-  PCRE_DEPENDS=""
   PCRE_BUILD=""
   PCRE_CLEAN=""
   PCRE_DIST_CLEAN=""
@@ -6513,7 +6503,6 @@ fi
 
 
 
-
 have_dnet=no
 requested_included_dnet=no
 LIBDNETDIR=libdnet-stripped
@@ -6548,7 +6537,6 @@ if test $have_dnet != yes ; then
 
   CPPFLAGS="-I\$(top_srcdir)/$LIBDNETDIR/include $CPPFLAGS"
   LIBDNET_LIBS="\$(top_srcdir)/$LIBDNETDIR/src/.libs/libdnet.a"
-  DNET_DEPENDS="\$(top_srcdir)/$LIBDNETDIR/src/.libs/libdnet.a"
   DNET_BUILD="build-dnet"
   DNET_CLEAN="clean-dnet"
   DNET_DIST_CLEAN="distclean-dnet"
@@ -6557,7 +6545,6 @@ $as_echo "#define DNET_INCLUDED 1" >>confdefs.h
 
 else
   LIBDNET_LIBS="-ldnet"
-  DNET_DEPENDS=""
   DNET_BUILD=""
   DNET_CLEAN=""
   DNET_DIST_CLEAN=""
@@ -6569,7 +6556,6 @@ fi
 
 
 
-
 LIBLUADIR=liblua
 
 have_lua=no
@@ -6586,7 +6572,6 @@ 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_BUILD="build-lua"
     LUA_CLEAN="clean-lua"
     LUA_DIST_CLEAN="distclean-lua"
@@ -6668,7 +6653,6 @@ if test "$no_lua" = "yes"; then
   trace_no_use="$trace_no_use lua"
   CPPFLAGS="-DNOLUA $CPPFLAGS"
   LIBLUA_LIBS=""
-  LUA_DEPENDS=""
   LUA_BUILD=""
   LUA_CLEAN=""
   LUA_DIST_CLEAN=""
@@ -6853,7 +6837,6 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
-    LUA_DEPENDS=""
     LUA_BUILD=""
     LUA_CLEAN=""
     LUA_DIST_CLEAN=""
@@ -6865,7 +6848,6 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 $as_echo "no" >&6; }
     CPPFLAGS="-I\$(top_srcdir)/$LIBLUADIR $CPPFLAGS"
     LIBLUA_LIBS="\$(top_srcdir)/$LIBLUADIR/liblua.a"
-    LUA_DEPENDS="\$(top_srcdir)/$LIBLUADIR/liblua.a"
     LUA_BUILD="build-lua"
     LUA_CLEAN="clean-lua"
     LUA_DIST_CLEAN="distclean-lua"
@@ -6891,7 +6873,6 @@ fi
 
 
 
-
 LIBLINEARDIR=liblinear
 have_liblinear=no
 
@@ -6905,7 +6886,6 @@ if test "${with_liblinear+set}" = set; then :
   included)
     CPPFLAGS="-I\$(top_srcdir)/$LIBLINEARDIR $CPPFLAGS"
     LIBLINEAR_LIBS="\$(top_srcdir)/$LIBLINEARDIR/liblinear.a"
-    LIBLINEAR_DEPENDS="\$(top_srcdir)/$LIBLINEARDIR/liblinear.a"
     LIBLINEAR_BUILD="build-liblinear"
     LIBLINEAR_CLEAN="clean-liblinear"
     LIBLINEAR_DIST_CLEAN="distclean-liblinear"
@@ -6976,7 +6956,6 @@ fi
 done
 
 
-  LIBLINEAR_DEPENDS=""
   LIBLINEAR_BUILD=""
   LIBLINEAR_CLEAN=""
   LIBLINEAR_DIST_CLEAN=""
@@ -6988,7 +6967,6 @@ if test $have_liblinear != yes; then
 $as_echo "no" >&6; }
   CPPFLAGS="-I\$(top_srcdir)/$LIBLINEARDIR $CPPFLAGS"
   LIBLINEAR_LIBS="\$(top_srcdir)/$LIBLINEARDIR/liblinear.a"
-  LIBLINEAR_DEPENDS="\$(top_srcdir)/$LIBLINEARDIR/liblinear.a"
   LIBLINEAR_BUILD="build-liblinear"
   LIBLINEAR_CLEAN="clean-liblinear"
   LIBLINEAR_DIST_CLEAN="distclean-liblinear"
@@ -7007,7 +6985,6 @@ fi
 
 
 
-
 #dnl check endedness
  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether byte ordering is bigendian" >&5
 $as_echo_n "checking whether byte ordering is bigendian... " >&6; }

configure.ac

@@ -460,7 +460,6 @@ if test $have_libpcap != yes; then
     CPPFLAGS="$CPPFLAGS -I\$(top_srcdir)/$libpcapdir"
   fi
   LIBPCAP_LIBS='$(LIBPCAPDIR)/libpcap.a'
-  PCAP_DEPENDS='$(LIBPCAPDIR)/libpcap.a'
   PCAP_BUILD="build-pcap"
   PCAP_CLEAN="clean-pcap"
   PCAP_DIST_CLEAN="distclean-pcap"
@@ -471,13 +470,11 @@ else
 
   AC_DEFINE(HAVE_LIBPCAP, 1, [Have libpcap library])
   LIBPCAP_LIBS="-lpcap"
-  PCAP_DEPENDS=""
   PCAP_BUILD=""
   PCAP_CLEAN=""
   PCAP_DIST_CLEAN=""
 fi
 
-AC_SUBST(PCAP_DEPENDS)
 AC_SUBST(PCAP_BUILD)
 AC_SUBST(PCAP_CLEAN)
 AC_SUBST(PCAP_DIST_CLEAN)
@@ -520,7 +517,6 @@ if test $have_pcre != yes ; then
   AC_CONFIG_SUBDIRS( libpcre )
   CPPFLAGS="-I\$(top_srcdir)/$LIBPCREDIR $CPPFLAGS"
   LIBPCRE_LIBS="$LIBPCREDIR/libpcre.a"
-  PCRE_DEPENDS="$LIBPCREDIR/libpcre.a"
   PCRE_BUILD="build-pcre"
   PCRE_CLEAN="clean-pcre"
   PCRE_DIST_CLEAN="distclean-pcre"
@@ -529,7 +525,6 @@ else
 # We only need to check for and use this if we are NOT using included pcre
   AC_CHECK_HEADERS(pcre/pcre.h)
   LIBPCRE_LIBS="-lpcre"
-  PCRE_DEPENDS=""
   PCRE_BUILD=""
   PCRE_CLEAN=""
   PCRE_DIST_CLEAN=""
@@ -537,7 +532,6 @@ fi
 
 AC_SUBST(LIBPCRE_LIBS)
 AC_SUBST(LIBPCREDIR)
-AC_SUBST(PCRE_DEPENDS)
 AC_SUBST(PCRE_BUILD)
 AC_SUBST(PCRE_CLEAN)
 AC_SUBST(PCRE_DIST_CLEAN)
@@ -573,14 +567,12 @@ if test $have_dnet != yes ; then
   AC_CONFIG_SUBDIRS( libdnet-stripped )
   CPPFLAGS="-I\$(top_srcdir)/$LIBDNETDIR/include $CPPFLAGS"
   LIBDNET_LIBS="\$(top_srcdir)/$LIBDNETDIR/src/.libs/libdnet.a"
-  DNET_DEPENDS="\$(top_srcdir)/$LIBDNETDIR/src/.libs/libdnet.a"
   DNET_BUILD="build-dnet"
   DNET_CLEAN="clean-dnet"
   DNET_DIST_CLEAN="distclean-dnet"
   AC_DEFINE(DNET_INCLUDED, 1, [Use included libdnet])
 else
   LIBDNET_LIBS="-ldnet"
-  DNET_DEPENDS=""
   DNET_BUILD=""
   DNET_CLEAN=""
   DNET_DIST_CLEAN=""
@@ -588,7 +580,6 @@ fi
 
 AC_SUBST(LIBDNET_LIBS)
 AC_SUBST(LIBDNETDIR)
-AC_SUBST(DNET_DEPENDS)
 AC_SUBST(DNET_BUILD)
 AC_SUBST(DNET_CLEAN)
 AC_SUBST(DNET_DIST_CLEAN)
@@ -610,7 +601,6 @@ 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_BUILD="build-lua"
     LUA_CLEAN="clean-lua"
     LUA_DIST_CLEAN="distclean-lua"
@@ -635,7 +625,6 @@ if test "$no_lua" = "yes"; then
   trace_no_use="$trace_no_use lua"
   CPPFLAGS="-DNOLUA $CPPFLAGS"
   LIBLUA_LIBS=""
-  LUA_DEPENDS=""
   LUA_BUILD=""
   LUA_CLEAN=""
   LUA_DIST_CLEAN=""
@@ -660,7 +649,6 @@ else
       have_lua=yes, have_lua=no, AC_MSG_RESULT(cross-compiling -- assuming yes); have_lua=yes)
     AC_LANG_POP(C++)
 
-    LUA_DEPENDS=""
     LUA_BUILD=""
     LUA_CLEAN=""
     LUA_DIST_CLEAN=""
@@ -671,7 +659,6 @@ else
     AC_MSG_RESULT(no)
     CPPFLAGS="-I\$(top_srcdir)/$LIBLUADIR $CPPFLAGS"
     LIBLUA_LIBS="\$(top_srcdir)/$LIBLUADIR/liblua.a"
-    LUA_DEPENDS="\$(top_srcdir)/$LIBLUADIR/liblua.a"
     LUA_BUILD="build-lua"
     LUA_CLEAN="clean-lua"
     LUA_DIST_CLEAN="distclean-lua"
@@ -686,7 +673,6 @@ fi
 
 AC_SUBST(LIBLUA_LIBS)
 AC_SUBST(LIBLUADIR)
-AC_SUBST(LUA_DEPENDS)
 AC_SUBST(LUA_BUILD)
 AC_SUBST(LUA_CLEAN)
 AC_SUBST(LUA_DIST_CLEAN)
@@ -708,7 +694,6 @@ AC_HELP_STRING([--with-liblinear=included], [Use the liblinear version included
   included)
     CPPFLAGS="-I\$(top_srcdir)/$LIBLINEARDIR $CPPFLAGS"
     LIBLINEAR_LIBS="\$(top_srcdir)/$LIBLINEARDIR/liblinear.a"
-    LIBLINEAR_DEPENDS="\$(top_srcdir)/$LIBLINEARDIR/liblinear.a"
     LIBLINEAR_BUILD="build-liblinear"
     LIBLINEAR_CLEAN="clean-liblinear"
     LIBLINEAR_DIST_CLEAN="distclean-liblinear"
@@ -728,7 +713,6 @@ if test $have_liblinear != yes; then
     AC_CHECK_LIB(linear, predict, [have_liblinear=yes; LIBLINEAR_LIBS="-llinear"; break],, [-lm])
   )
 
-  LIBLINEAR_DEPENDS=""
   LIBLINEAR_BUILD=""
   LIBLINEAR_CLEAN=""
   LIBLINEAR_DIST_CLEAN=""
@@ -739,7 +723,6 @@ if test $have_liblinear != yes; then
   AC_MSG_RESULT(no)
   CPPFLAGS="-I\$(top_srcdir)/$LIBLINEARDIR $CPPFLAGS"
   LIBLINEAR_LIBS="\$(top_srcdir)/$LIBLINEARDIR/liblinear.a"
-  LIBLINEAR_DEPENDS="\$(top_srcdir)/$LIBLINEARDIR/liblinear.a"
   LIBLINEAR_BUILD="build-liblinear"
   LIBLINEAR_CLEAN="clean-liblinear"
   LIBLINEAR_DIST_CLEAN="distclean-liblinear"
@@ -750,7 +733,6 @@ fi
 
 AC_SUBST(LIBLINEAR_LIBS)
 AC_SUBST(LIBLINEARDIR)
-AC_SUBST(LIBLINEAR_DEPENDS)
 AC_SUBST(LIBLINEAR_BUILD)
 AC_SUBST(LIBLINEAR_CLEAN)
 AC_SUBST(LIBLINEAR_DIST_CLEAN)