wl500g deluxe cleanups and wl500g wan port dies fixes

[openwrt.git] / package / nmap / Makefile

diff --git a/package/nmap/Makefile b/package/nmap/Makefile
index 69cc925..8c01084 100644 (file)
--- a/package/nmap/Makefile
+++ b/package/nmap/Makefile
@@ -48,20 +48,20 @@ $(PKG_BUILD_DIR)/.configured:
                  $(DISABLE_LARGEFILE) \
                  $(DISABLE_NLS) \
                  --without-openssl \
+                 --without-nmapfe \
                  --with-libpcap="$(STAGING_DIR)/usr" \
                  --with-libpcre="$(STAGING_DIR)/usr" \
        );
-       touch $(PKG_BUILD_DIR)/.configured
+       touch $@
 
 $(PKG_BUILD_DIR)/.built:
-       $(MAKE) -C $(PKG_BUILD_DIR) \
-               $(TARGET_CONFIGURE_OPTS) \
-               CCOPT="-fno-builtin -nostdinc++ -nodefaultlibs $(TARGET_CFLAGS)"
        mkdir -p $(PKG_INSTALL_DIR)
        $(MAKE) -C $(PKG_BUILD_DIR) \
+               $(TARGET_CONFIGURE_OPTS) \
+               CCOPT="-fno-builtin -nostdinc++ -nodefaultlibs $(TARGET_CFLAGS)" \
                DESTDIR="$(PKG_INSTALL_DIR)" \
-               install
-       touch $(PKG_BUILD_DIR)/.built
+               all install
+       touch $@
 
 $(IPKG_NMAP):
        install -d -m0755 $(IDIR_NMAP)/usr/share/nmap
@@ -72,3 +72,7 @@ $(IPKG_NMAP):
        cp -fpR $(PKG_INSTALL_DIR)/usr/bin/nmap $(IDIR_NMAP)/usr/bin/
        $(RSTRIP) $(IDIR_NMAP)
        $(IPKG_BUILD) $(IDIR_NMAP) $(PACKAGE_DIR)
+
+mostlyclean:
+       $(MAKE) -C $(PKG_BUILD_DIR) clean
+       rm $(PKG_BUILD_DIR)/.built