1
0
mirror of https://github.com/nmap/nmap.git synced 2025-12-06 12:41:29 +00:00

normalized *_build target to build-* target

This commit is contained in:
gio
2015-08-20 19:50:29 +00:00
parent 0044e8bad1
commit 3b42a41f44
10 changed files with 44 additions and 47 deletions

View File

@@ -113,10 +113,10 @@ OBJS = charpool.o FingerPrintResults.o FPEngine.o FPModel.o idle_scan.o MACLooku
# large for field of 2 bytes". Disable debugging for this one file.
FPModel.o: CXXFLAGS += -g0
all: @LUA_BUILD@ @LIBLINEAR_BUILD@ @PCAP_BUILD@ @PCRE_BUILD@ @DNET_BUILD@ @NBASE_BUILD@ @NSOCK_BUILD@ @NCAT_BUILD@ @NMAP_UPDATE_BUILD@ netutil_build
$(MAKE) $(TARGET) $(BUILDZENMAP) $(BUILDNDIFF) $(BUILDNPING)
all: $(TARGET) @LUA_BUILD@ @LIBLINEAR_BUILD@ @PCAP_BUILD@ @PCRE_BUILD@ @DNET_BUILD@ @NBASE_BUILD@ @NSOCK_BUILD@ @NCAT_BUILD@ @NMAP_UPDATE_BUILD@ build-netutil
$(MAKE) $(BUILDZENMAP) $(BUILDNDIFF) $(BUILDNPING)
$(TARGET): netutil_build @NSOCK_BUILD@ @NBASE_BUILD@ @DNET_BUILD@ @LUA_BUILD@ \
$(TARGET): build-netutil @NSOCK_BUILD@ @NBASE_BUILD@ @DNET_BUILD@ @LUA_BUILD@ \
@LUA_DEPENDS@ @LIBLINEAR_DEPENDS@ @PCAP_DEPENDS@ @PCRE_DEPENDS@ \
@DNET_DEPENDS@ $(NBASEDIR)/libnbase.a $(NSOCKDIR)/src/libnsock.a \
libnetutil/libnetutil.a $(OBJS) main.o
@@ -124,34 +124,31 @@ $(TARGET): netutil_build @NSOCK_BUILD@ @NBASE_BUILD@ @DNET_BUILD@ @LUA_BUILD@ \
rm -f $@
$(CXX) $(LDFLAGS) -o $@ $(OBJS) main.o $(LIBS)
build-%: %/Makefile
cd $* && $(MAKE)
pcre_build: $(LIBPCREDIR)/Makefile
build-pcre: $(LIBPCREDIR)/Makefile
@echo Compiling libpcre; cd $(LIBPCREDIR) && $(MAKE)
dnet_build: $(LIBDNETDIR)/Makefile
build-dnet: $(LIBDNETDIR)/Makefile
@echo Compiling libdnet; cd $(LIBDNETDIR) && $(MAKE)
pcap_build: $(LIBPCAPDIR)/Makefile
build-pcap: $(LIBPCAPDIR)/Makefile
@echo Compiling libpcap; cd $(LIBPCAPDIR) && $(MAKE)
nbase_build: $(NBASEDIR)/Makefile
build-nbase: $(NBASEDIR)/Makefile
@echo Compiling libnbase;
cd $(NBASEDIR) && $(MAKE)
nsock_build: $(NSOCKDIR)/src/Makefile nbase_build
build-nsock: $(NSOCKDIR)/src/Makefile build-nbase
@echo Compiling libnsock;
cd $(NSOCKDIR)/src && $(MAKE)
netutil_build: libnetutil/Makefile
build-netutil: libnetutil/Makefile
@echo Compiling libnetutil;
cd libnetutil && $(MAKE)
ncat_build: $(NCATDIR)/Makefile nbase_build nsock_build $(NCATDIR)/ncat.h @PCAP_BUILD@
build-ncat: $(NCATDIR)/Makefile build-nbase build-nsock $(NCATDIR)/ncat.h @PCAP_BUILD@
cd $(NCATDIR) && $(MAKE)
lua_build: $(LIBLUADIR)/Makefile
build-lua: $(LIBLUADIR)/Makefile
@echo Compiling liblua; cd $(LIBLUADIR) && $(MAKE) liblua.a CC="$(CC)" MYCFLAGS="$(CFLAGS) @LUA_CFLAGS@"
liblinear_build: $(LIBLINEARDIR)/Makefile
@@ -160,9 +157,9 @@ liblinear_build: $(LIBLINEARDIR)/Makefile
build-nmap-update: nmap-update/default_channel.h
#$(LIBPCAPDIR)/Makefile:
# @echo Configuring libpcap; cd $(LIBPCAPDIR); ./configure
# This is the last one to ensure specific build targets are preferred
build-%: %/Makefile
cd $* && $(MAKE)
# Make a statically compiled binary for portability between distributions
static:
@@ -335,7 +332,7 @@ install-zenmap: $(ZENMAPDIR)/setup.py
build-ndiff:
cd $(NDIFFDIR) && $(PYTHON) setup.py build $(if $(DESTDIR),--executable "$(DEFAULT_PYTHON_PATH)")
build-nping: $(NPINGDIR)/Makefile nbase_build nsock_build netutil_build $(NPINGDIR)/nping.h @DNET_BUILD@ @PCAP_BUILD@
build-nping: $(NPINGDIR)/Makefile build-nbase build-nsock build-netutil $(NPINGDIR)/nping.h @DNET_BUILD@ @PCAP_BUILD@
@cd $(NPINGDIR) && $(MAKE)
install-ndiff:

16
configure vendored
View File

@@ -6290,7 +6290,7 @@ if test $have_libpcap != yes; then
fi
LIBPCAP_LIBS='$(LIBPCAPDIR)/libpcap.a'
PCAP_DEPENDS='$(LIBPCAPDIR)/libpcap.a'
PCAP_BUILD="pcap_build"
PCAP_BUILD="build-pcap"
PCAP_CLEAN="pcap_clean"
PCAP_DIST_CLEAN="pcap_dist_clean"
@@ -6480,7 +6480,7 @@ if test $have_pcre != yes ; then
CPPFLAGS="-I\$(top_srcdir)/$LIBPCREDIR $CPPFLAGS"
LIBPCRE_LIBS="$LIBPCREDIR/libpcre.a"
PCRE_DEPENDS="$LIBPCREDIR/libpcre.a"
PCRE_BUILD="pcre_build"
PCRE_BUILD="build-pcre"
PCRE_CLEAN="pcre_clean"
PCRE_DIST_CLEAN="pcre_dist_clean"
@@ -6549,7 +6549,7 @@ 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="dnet_build"
DNET_BUILD="build-dnet"
DNET_CLEAN="dnet_clean"
DNET_DIST_CLEAN="dnet_dist_clean"
@@ -6587,7 +6587,7 @@ if test "${with_liblua+set}" = set; then :
CPPFLAGS="-I\$(top_srcdir)/$LIBLUADIR $CPPFLAGS"
LIBLUA_LIBS="\$(top_srcdir)/$LIBLUADIR/liblua.a"
LUA_DEPENDS="\$(top_srcdir)/$LIBLUADIR/liblua.a"
LUA_BUILD="lua_build"
LUA_BUILD="build-lua"
LUA_CLEAN="lua_clean"
LUA_DIST_CLEAN="lua_dist_clean"
have_lua="yes"
@@ -6866,7 +6866,7 @@ $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="lua_build"
LUA_BUILD="build-lua"
LUA_CLEAN="lua_clean"
LUA_DIST_CLEAN="lua_dist_clean"
@@ -7483,7 +7483,7 @@ if test "${with_libnbase+set}" = set; then :
;;
esac
else
NBASE_BUILD="nbase_build"
NBASE_BUILD="build-nbase"
NBASEDIR="nbase"
fi
@@ -7501,7 +7501,7 @@ subdirs="$subdirs nbase"
NSOCKDIR="nsock"
NSOCK_BUILD="nsock_build"
NSOCK_BUILD="build-nsock"
NSOCK_CHECK="nsock_check"
# Check whether --with-libnsock was given.
@@ -7552,7 +7552,7 @@ if test "$with_ncat" = "no"; then
NCAT_DIST_CLEAN=""
else
trace_use="$trace_use ncat"
NCAT_BUILD="ncat_build"
NCAT_BUILD="build-ncat"
NCAT_CHECK="ncat_check"
NCAT_INSTALL="install-ncat"
NCAT_UNINSTALL="uninstall-ncat"

View File

@@ -461,7 +461,7 @@ if test $have_libpcap != yes; then
fi
LIBPCAP_LIBS='$(LIBPCAPDIR)/libpcap.a'
PCAP_DEPENDS='$(LIBPCAPDIR)/libpcap.a'
PCAP_BUILD="pcap_build"
PCAP_BUILD="build-pcap"
PCAP_CLEAN="pcap_clean"
PCAP_DIST_CLEAN="pcap_dist_clean"
AC_DEFINE(PCAP_INCLUDED, 1, [Using included libpcap])
@@ -521,7 +521,7 @@ if test $have_pcre != yes ; then
CPPFLAGS="-I\$(top_srcdir)/$LIBPCREDIR $CPPFLAGS"
LIBPCRE_LIBS="$LIBPCREDIR/libpcre.a"
PCRE_DEPENDS="$LIBPCREDIR/libpcre.a"
PCRE_BUILD="pcre_build"
PCRE_BUILD="build-pcre"
PCRE_CLEAN="pcre_clean"
PCRE_DIST_CLEAN="pcre_dist_clean"
AC_DEFINE(PCRE_INCLUDED, 1, [Using included libpcre])
@@ -574,7 +574,7 @@ 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="dnet_build"
DNET_BUILD="build-dnet"
DNET_CLEAN="dnet_clean"
DNET_DIST_CLEAN="dnet_dist_clean"
AC_DEFINE(DNET_INCLUDED, 1, [Use included libdnet])
@@ -611,7 +611,7 @@ AC_HELP_STRING([--without-liblua], [Compile without lua (this will exclude all o
CPPFLAGS="-I\$(top_srcdir)/$LIBLUADIR $CPPFLAGS"
LIBLUA_LIBS="\$(top_srcdir)/$LIBLUADIR/liblua.a"
LUA_DEPENDS="\$(top_srcdir)/$LIBLUADIR/liblua.a"
LUA_BUILD="lua_build"
LUA_BUILD="build-lua"
LUA_CLEAN="lua_clean"
LUA_DIST_CLEAN="lua_dist_clean"
have_lua="yes"
@@ -672,7 +672,7 @@ else
CPPFLAGS="-I\$(top_srcdir)/$LIBLUADIR $CPPFLAGS"
LIBLUA_LIBS="\$(top_srcdir)/$LIBLUADIR/liblua.a"
LUA_DEPENDS="\$(top_srcdir)/$LIBLUADIR/liblua.a"
LUA_BUILD="lua_build"
LUA_BUILD="build-lua"
LUA_CLEAN="lua_clean"
LUA_DIST_CLEAN="lua_dist_clean"
AC_DEFINE(LUA_INCLUDED, 1, [Using included liblua])
@@ -838,7 +838,7 @@ AC_HELP_STRING([--with-libnbase=DIR], [Look for nbase include/libs in DIR]),
NBASE_BUILD=""
;;
esac],
NBASE_BUILD="nbase_build"
NBASE_BUILD="build-nbase"
NBASEDIR="nbase"
)
@@ -853,7 +853,7 @@ AC_SUBST(LIBNBASE_LIBS)
AC_CONFIG_SUBDIRS(nbase)
NSOCKDIR="nsock"
NSOCK_BUILD="nsock_build"
NSOCK_BUILD="build-nsock"
NSOCK_CHECK="nsock_check"
AC_ARG_WITH(libnsock,
AC_HELP_STRING([--with-libnsock=DIR], [Compile and link to libnsock in DIR]),
@@ -894,7 +894,7 @@ if test "$with_ncat" = "no"; then
NCAT_DIST_CLEAN=""
else
trace_use="$trace_use ncat"
NCAT_BUILD="ncat_build"
NCAT_BUILD="build-ncat"
NCAT_CHECK="ncat_check"
NCAT_INSTALL="install-ncat"
NCAT_UNINSTALL="uninstall-ncat"

View File

@@ -92,7 +92,7 @@ stage-nmap: export-$(NMAP_BUILD_DIR)
stage-ncat: export-$(NCAT_BUILD_DIR)
cd $(NCAT_BUILD_DIR) && ./configure --without-zenmap --with-ncat --without-ndiff --without-nping --without-nmap-update --with-openssl="$(MACPORTS_PREFIX)" $(CONFIGURE_ARGS)
make -d -C $(NCAT_BUILD_DIR) ncat_build OPENSSL_LIBS="$(OPENSSL_STATIC)"
make -d -C $(NCAT_BUILD_DIR) build-ncat OPENSSL_LIBS="$(OPENSSL_STATIC)"
rm -rf $(NCAT_STAGING_DIR)
make -d -C $(NCAT_BUILD_DIR) install-ncat DESTDIR="`pwd`/$(NCAT_STAGING_DIR)"

View File

@@ -112,7 +112,7 @@ all: $(TARGET)
$(LIBLUADIR)/liblua.a: @LUA_BUILD@
lua_build: $(LIBLUADIR)/Makefile
build-lua: $(LIBLUADIR)/Makefile
@echo Compiling liblua; cd $(LIBLUADIR) && $(MAKE) liblua.a CC="$(CC)" MYCFLAGS="$(CFLAGS) $(LUA_CFLAGS)"
@@ -150,7 +150,7 @@ test/test-cmdline-split: test/test-cmdline-split.o ncat_posix.o ncat_core.o sys_
test/test-wildcard: test/test-wildcard.o ncat_core.o ncat_ssl.o sys_wrap.o util.o ncat_posix.o $(LUA_OBJS) @LUA_DEPENDS@
$(CC) -o $@ $(CFLAGS) $(LDFLAGS) $^ $(NSOCKLIB) $(NBASELIB) $(OPENSSL_LIBS) $(PCAP_LIBS) $(LUA_LIBS) $(LIBS)
.PHONY: uninstall all clean distclean lua_build
.PHONY: uninstall all clean distclean build-lua
../libnetutil/libnetutil.a: ../libnetutil/Makefile
@echo Compiling libnetutil;

6
ncat/configure vendored
View File

@@ -5015,7 +5015,7 @@ else
CPPFLAGS="$CPPFLAGS -I$libpcapdir"
fi
PCAP_DEPENDS='$(LIBPCAPDIR)/libpcap.a'
PCAP_BUILD="pcap_build"
PCAP_BUILD="build-pcap"
PCAP_CLEAN="pcap_clean"
PCAP_DIST_CLEAN="pcap_dist_clean"
fi
@@ -5184,7 +5184,7 @@ if test "${with_liblua+set}" = set; then :
CPPFLAGS="-I\$(top_srcdir)/$LIBLUADIR $CPPFLAGS"
LIBLUA_LIBS="\$(top_srcdir)/$LIBLUADIR/liblua.a"
LUA_DEPENDS="\$(top_srcdir)/$LIBLUADIR/liblua.a"
LUA_BUILD="lua_build"
LUA_BUILD="build-lua"
LUA_CLEAN="lua_clean"
LUA_DIST_CLEAN="lua_dist_clean"
have_lua="yes"
@@ -5663,7 +5663,7 @@ $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="lua_build"
LUA_BUILD="build-lua"
LUA_CLEAN="lua_clean"
LUA_DIST_CLEAN="lua_dist_clean"
$as_echo "#define LUA_INCLUDED 1" >>confdefs.h

View File

@@ -185,7 +185,7 @@ else
CPPFLAGS="$CPPFLAGS -I$libpcapdir"
fi
PCAP_DEPENDS='$(LIBPCAPDIR)/libpcap.a'
PCAP_BUILD="pcap_build"
PCAP_BUILD="build-pcap"
PCAP_CLEAN="pcap_clean"
PCAP_DIST_CLEAN="pcap_dist_clean"
fi
@@ -223,7 +223,7 @@ AC_HELP_STRING([--without-liblua], [Compile without lua (this will exclude all o
CPPFLAGS="-I\$(top_srcdir)/$LIBLUADIR $CPPFLAGS"
LIBLUA_LIBS="\$(top_srcdir)/$LIBLUADIR/liblua.a"
LUA_DEPENDS="\$(top_srcdir)/$LIBLUADIR/liblua.a"
LUA_BUILD="lua_build"
LUA_BUILD="build-lua"
LUA_CLEAN="lua_clean"
LUA_DIST_CLEAN="lua_dist_clean"
have_lua="yes"
@@ -282,7 +282,7 @@ else
CPPFLAGS="-I\$(top_srcdir)/$LIBLUADIR $CPPFLAGS"
LIBLUA_LIBS="\$(top_srcdir)/$LIBLUADIR/liblua.a"
LUA_DEPENDS="\$(top_srcdir)/$LIBLUADIR/liblua.a"
LUA_BUILD="lua_build"
LUA_BUILD="build-lua"
LUA_CLEAN="lua_clean"
LUA_DIST_CLEAN="lua_dist_clean"
AC_DEFINE(LUA_INCLUDED)

2
nping/configure vendored
View File

@@ -5342,7 +5342,7 @@ if test $have_libpcap != yes; then
fi
LIBPCAP_LIBS='$(LIBPCAPDIR)/libpcap.a'
PCAP_DEPENDS='$(LIBPCAPDIR)/libpcap.a'
PCAP_BUILD="pcap_build"
PCAP_BUILD="build-pcap"
PCAP_CLEAN="pcap_clean"
PCAP_DIST_CLEAN="pcap_dist_clean"
else

View File

@@ -247,7 +247,7 @@ if test $have_libpcap != yes; then
fi
LIBPCAP_LIBS='$(LIBPCAPDIR)/libpcap.a'
PCAP_DEPENDS='$(LIBPCAPDIR)/libpcap.a'
PCAP_BUILD="pcap_build"
PCAP_BUILD="build-pcap"
PCAP_CLEAN="pcap_clean"
PCAP_DIST_CLEAN="pcap_dist_clean"
else
@@ -301,7 +301,7 @@ if test $have_dnet != yes ; then
CPPFLAGS="-I$LIBDNETDIR/include $CPPFLAGS"
LIBDNET_LIBS="$LIBDNETDIR/src/.libs/libdnet.a"
DNET_DEPENDS="$LIBDNETDIR/src/.libs/libdnet.a"
DNET_BUILD="dnet_build"
DNET_BUILD="build-dnet"
DNET_CLEAN="dnet_clean"
DNET_DIST_CLEAN="dnet_dist_clean"
else

View File

@@ -3481,7 +3481,7 @@ o [Ncat] We should probably make it work without OpenSSL. When I try
ncat_main.c:646: error: struct options has no member named sslkey
make[2]: *** [ncat_main.o] Error 1
make[2]: Leaving directory `/mondo/fyodor/nmap/ncat'
make[1]: *** [ncat_build] Error 2
make[1]: *** [build-ncat] Error 2
make[1]: Leaving directory `/mondo/fyodor/nmap'
make: *** [static] Error 2