From ed8b7899a02d2721179ea60fe353de30f1cba981 Mon Sep 17 00:00:00 2001
From: fyodor <fyodor@e0a8ed71-7df4-0310-8962-fdc924857419>
Date: Sat, 11 Aug 2007 05:10:24 +0000
Subject: [PATCH] merge soc07 r5073:5077 - renamed listopt(ions?!) to
 listop(erations); removed nse_bitlib.* from the Makefile.in in nselib/;
 removed unused MAKEDEPEND

---
 Makefile.in                        | 8 ++++----
 nselib/{listopt.lua => listop.lua} | 2 +-
 nselib/shortport.lua               | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)
 rename nselib/{listopt.lua => listop.lua} (98%)

diff --git a/Makefile.in b/Makefile.in
index 109556921..1c5b7af33 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -40,7 +40,7 @@ LIBS =  @LIBNBASE_LIBS@ @LIBNSOCK_LIBS@ @LIBPCRE_LIBS@ @LIBPCAP_LIBS@ @OPENSSL_L
 # LIBS =  -lrmalloc @LIBS@
 SHTOOL = ./shtool
 INSTALL = $(SHTOOL) install 
-MAKEDEPEND = @MAKEDEPEND@
+# MAKEDEPEND = @MAKEDEPEND@
 export RPMTDIR=$(HOME)/rpm
 
 
@@ -55,9 +55,9 @@ INSTALLNMAPFE=@INSTALLNMAPFE@
 INSTALLNSE=@INSTALLNSE@
 
 ifneq (@LIBLUA_LIBS@,)
-NSE_SRC=nse_main.cc nse_auxiliar.cc nse_nsock.cc nse_init.cc nse_nmaplib.cc nse_debug.cc nse_pcrelib.cc nse_string.cc nse_bitlib.cc
-NSE_HDRS=nse_main.h nse_auxiliar.h nse_nsock.h nse_init.h nse_nmaplib.h nse_debug.h nse_macros.h nse_pcrelib.h nse_string.h nse_bitlib.h
-NSE_OBJS=nse_main.o nse_auxiliar.o nse_nsock.o nse_init.o nse_nmaplib.o nse_debug.o nse_pcrelib.o nse_string.o nse_bitlib.o
+NSE_SRC=nse_main.cc nse_auxiliar.cc nse_nsock.cc nse_init.cc nse_nmaplib.cc nse_debug.cc nse_pcrelib.cc nse_string.cc 
+NSE_HDRS=nse_main.h nse_auxiliar.h nse_nsock.h nse_init.h nse_nmaplib.h nse_debug.h nse_macros.h nse_pcrelib.h nse_string.h
+NSE_OBJS=nse_main.o nse_auxiliar.o nse_nsock.o nse_init.o nse_nmaplib.o nse_debug.o nse_pcrelib.o nse_string.o
 NSESTDLIB=nsestdlib
 endif
 
diff --git a/nselib/listopt.lua b/nselib/listop.lua
similarity index 98%
rename from nselib/listopt.lua
rename to nselib/listop.lua
index c9335c687..1f3936782 100644
--- a/nselib/listopt.lua
+++ b/nselib/listop.lua
@@ -1,4 +1,4 @@
-module('listopt', package.seeall)
+module(..., package.seeall)
 
 --[[
 --
diff --git a/nselib/shortport.lua b/nselib/shortport.lua
index 57d1133f3..77a06587a 100644
--- a/nselib/shortport.lua
+++ b/nselib/shortport.lua
@@ -1,4 +1,4 @@
-module('shortport', package.seeall)
+module(..., package.seeall)
 
 portnumber = function(port, _proto, _state)
 	local port_table;