1 --- nmap-5.21/Makefile.in.~1~ 2011-01-12 17:28:52.000000000 -0800 |
|
2 +++ nmap-5.21/Makefile.in 2011-11-03 14:41:18.726644687 -0700 |
|
3 @@ -1,7 +1,9 @@ |
|
4 +SHELL = /bin/bash |
|
5 # Extract the version string from nmap.h. |
|
6 export NMAP_VERSION := $(shell grep '^\#[ \t]*define[ \t]\+NMAP_VERSION' nmap.h | sed -e 's/.*"\(.*\)".*/\1/' -e 'q') |
|
7 +export TOPDIR=$(shell pwd) |
|
8 NMAP_NAME= Nmap |
|
9 -NMAP_URL= http://nmap.org |
|
10 +NMAP_URL= http://nmap.org/ |
|
11 NMAP_PLATFORM=@host@ |
|
12 prefix = @prefix@ |
|
13 exec_prefix = @exec_prefix@ |
|
14 @@ -14,12 +16,12 @@ |
|
15 deskdir = $(prefix)/share/applications |
|
16 NMAPDEVDIR=~/nmap-private-dev |
|
17 |
|
18 -export NBASEDIR=@NBASEDIR@ |
|
19 -export NSOCKDIR=@NSOCKDIR@ |
|
20 -export LIBLUADIR = @LIBLUADIR@ |
|
21 +export NBASEDIR=$(TOPDIR)/@NBASEDIR@ |
|
22 +export NSOCKDIR=$(TOPDIR)/@NSOCKDIR@ |
|
23 +export LIBLUADIR=$(TOPDIR)/@LIBLUADIR@ |
|
24 export NDIR=$(shell pwd) |
|
25 -export LIBLUA_LIBS = @LIBLUA_LIBS@ |
|
26 -export NCATDIR=@NCATDIR@ |
|
27 +export LIBLUA_LIBS=$(TOPDIR)/@LIBLUA_LIBS@ |
|
28 +export NCATDIR=$(TOPDIR)/@NCATDIR@ |
|
29 CC = @CC@ |
|
30 CXX = @CXX@ |
|
31 CCOPT = |
|
32 @@ -27,27 +29,29 @@ |
|
33 STRIP = @STRIP@ |
|
34 LIBPCAPDIR = @libpcapdir@ |
|
35 LIBPCREDIR = @LIBPCREDIR@ |
|
36 -export LIBDNETDIR = @LIBDNETDIR@ |
|
37 -ZENMAPDIR = @ZENMAPDIR@ |
|
38 -NDIFFDIR = @NDIFFDIR@ |
|
39 +export LIBDNETDIR=$(TOPDIR)/@LIBDNETDIR@ |
|
40 +ZENMAPDIR=$(TOPDIR)/zenmap |
|
41 +NDIFFDIR=$(TOPDIR)/ndiff |
|
42 NPINGDIR = @NPINGDIR@ |
|
43 PYTHON = @PYTHON@ |
|
44 +PYTHONDIR = @pythondir@ |
|
45 DEFS = @DEFS@ -DNMAP_NAME=\"$(NMAP_NAME)\" -DNMAP_URL=\"$(NMAP_URL)\" -DNMAP_PLATFORM=\"$(NMAP_PLATFORM)\" -DNMAPDATADIR=\"$(nmapdatadir)\" |
|
46 # With GCC, add extra security checks to source code. |
|
47 # http://gcc.gnu.org/ml/gcc-patches/2004-09/msg02055.html |
|
48 # Level 1 only makes changes that don't affect "conforming" programs, |
|
49 # while level 2 enforces additional restrictions. |
|
50 DEFS += -D_FORTIFY_SOURCE=2 |
|
51 +export CXXFLAGS = @CXXFLAGS@ $(DBGFLAGS) $(CCOPT) $(DEFS) $(INCLS) |
|
52 +export CFLAGS = @CFLAGS@ $(DBGFLAGS) $(CCOPT) $(DEFS) $(INCLS) |
|
53 + |
|
54 # For mtrace debugging -- see MTRACE define in main.cc for instructions |
|
55 # Should only be enabled during debugging and not in any real release. |
|
56 # DEFS += -DMTRACE=1 |
|
57 -CXXFLAGS = @CXXFLAGS@ $(DBGFLAGS) $(CCOPT) |
|
58 CPPFLAGS = @CPPFLAGS@ $(DEFS) |
|
59 -export CFLAGS = $(CXXFLAGS) |
|
60 # CFLAGS = $(DEFS) $(INCLS) |
|
61 STATIC = |
|
62 -LDFLAGS = @LDFLAGS@ $(DBGFLAGS) $(STATIC) |
|
63 -LIBS = @LIBNBASE_LIBS@ @LIBNSOCK_LIBS@ @LIBPCRE_LIBS@ @LIBPCAP_LIBS@ $(OPENSSL_LIBS) libnetutil/libnetutil.a @LIBDNET_LIBS@ @LIBLUA_LIBS@ @LIBS@ |
|
64 +LDFLAGS = @LDFLAGS@ $(DBGFLAGS) $(STATIC) -z ignore |
|
65 +LIBS = @LIBNBASE_LIBS@ @LIBNSOCK_LIBS@ @LIBPCRE_LIBS@ @LIBPCAP_LIBS@ @OPENSSL_LIBS@ @LIBDNET_LIBS@ @LIBLUA_LIBS@ @LIBS@ -lsocket -lnsl -lgen |
|
66 OPENSSL_LIBS = @OPENSSL_LIBS@ |
|
67 # LIBS = -lefence @LIBS@ |
|
68 # LIBS = -lrmalloc @LIBS@ |
|
69 @@ -63,7 +67,7 @@ |
|
70 # environment variable or none of them with --disable-nls. |
|
71 ALL_LINGUAS = de es fr hr hu it jp pl pt_BR pt_PT ro ru sk zh |
|
72 # A space-separated list of language codes requested by the user. |
|
73 -LINGUAS ?= $(ALL_LINGUAS) |
|
74 + |
|
75 |
|
76 |
|
77 # DESTDIR is used by some package maintainers to install Nmap under |
|
78 @@ -93,15 +97,22 @@ |
|
79 endif |
|
80 endif |
|
81 |
|
82 -export SRCS = main.cc nmap.cc targets.cc tcpip.cc nmap_error.cc utils.cc idle_scan.cc osscan.cc osscan2.cc output.cc payload.cc scan_engine.cc timing.cc charpool.cc services.cc protocols.cc nmap_rpc.cc portlist.cc NmapOps.cc TargetGroup.cc Target.cc FingerPrintResults.cc service_scan.cc NmapOutputTable.cc MACLookup.cc nmap_tty.cc nmap_dns.cc traceroute.cc portreasons.cc xml.cc $(NSE_SRC) @COMPAT_SRCS@ |
|
83 +NETUTIL_SRC= netutil.cc |
|
84 +NETUTIL_HDRS= netutil.h |
|
85 +NETUTIL_OBJS=netutil.o |
|
86 |
|
87 -export HDRS = charpool.h FingerPrintResults.h global_structures.h idle_scan.h MACLookup.h nmap_amigaos.h nmap_dns.h nmap_error.h nmap.h NmapOps.h NmapOutputTable.h nmap_rpc.h nmap_tty.h nmap_winconfig.h osscan.h osscan2.h output.h payload.h portlist.h protocols.h scan_engine.h service_scan.h services.h TargetGroup.h Target.h targets.h tcpip.h timing.h utils.h traceroute.h portreasons.h xml.h $(NSE_HDRS) |
|
88 +export SRCS = main.cc nmap.cc targets.cc tcpip.cc nmap_error.cc utils.cc idle_scan.cc osscan.cc osscan2.cc output.cc payload.cc scan_engine.cc timing.cc charpool.cc services.cc protocols.cc nmap_rpc.cc portlist.cc NmapOps.cc TargetGroup.cc Target.cc FingerPrintResults.cc service_scan.cc NmapOutputTable.cc MACLookup.cc nmap_tty.cc nmap_dns.cc traceroute.cc portreasons.cc xml.cc $(NSE_SRC) libnetutil/$(NETUTIL_SRC) @COMPAT_SRCS@ |
|
89 |
|
90 -OBJS = main.o nmap.o targets.o tcpip.o nmap_error.o utils.o idle_scan.o osscan.o osscan2.o output.o payload.o scan_engine.o timing.o charpool.o services.o protocols.o nmap_rpc.o portlist.o NmapOps.o TargetGroup.o Target.o FingerPrintResults.o service_scan.o NmapOutputTable.o MACLookup.o nmap_tty.o nmap_dns.o traceroute.o portreasons.o xml.o $(NSE_OBJS) @COMPAT_OBJS@ |
|
91 +export HDRS = charpool.h FingerPrintResults.h global_structures.h idle_scan.h MACLookup.h nmap_amigaos.h nmap_dns.h nmap_error.h nmap.h NmapOps.h NmapOutputTable.h nmap_rpc.h nmap_tty.h nmap_winconfig.h osscan.h osscan2.h output.h payload.h portlist.h protocols.h scan_engine.h service_scan.h services.h TargetGroup.h Target.h targets.h tcpip.h timing.h utils.h traceroute.h portreasons.h xml.h $(NSE_HDRS) libnetutil/$(NETUTIL_HDRS) |
|
92 + |
|
93 +OBJS = main.o nmap.o targets.o tcpip.o nmap_error.o utils.o idle_scan.o osscan.o osscan2.o output.o payload.o scan_engine.o timing.o charpool.o services.o protocols.o nmap_rpc.o portlist.o NmapOps.o TargetGroup.o Target.o FingerPrintResults.o service_scan.o NmapOutputTable.o MACLookup.o nmap_tty.o nmap_dns.o traceroute.o portreasons.o xml.o $(NSE_OBJS) libnetutil/$(NETUTIL_OBJS) @COMPAT_OBJS@ |
|
94 |
|
95 # %.o : %.cc -- nope this is a GNU extension |
|
96 .cc.o: |
|
97 - $(CXX) -c $(CPPFLAGS) $(CXXFLAGS) $< -o $@ |
|
98 + $(CXX) $(CPPFLAGS) $(CXXFLAGS) -c $< -o $@ |
|
99 + |
|
100 +.c.o: |
|
101 + $(CC) $(CPPFLAGS) $(CFLAGS) -c $< -o $@ |
|
102 |
|
103 all: @LUA_BUILD@ @PCAP_BUILD@ @PCRE_BUILD@ @DNET_BUILD@ @NBASE_BUILD@ @NSOCK_BUILD@ @NCAT_BUILD@ netutil_build |
|
104 $(MAKE) $(TARGET) $(BUILDZENMAP) $(BUILDNDIFF) $(BUILDNPING) |
|
105 @@ -109,7 +120,7 @@ |
|
106 $(TARGET): @LUA_DEPENDS@ @PCAP_DEPENDS@ @PCRE_DEPENDS@ @DNET_DEPENDS@ $(NBASEDIR)/libnbase.a $(NSOCKDIR)/src/libnsock.a libnetutil/libnetutil.a $(OBJS) |
|
107 @echo Compiling nmap |
|
108 rm -f $@ |
|
109 - $(CXX) $(LDFLAGS) -o $@ $(OBJS) $(LIBS) |
|
110 + $(CXX) $(CXXFLAGS) $(LDFLAGS) -o $@ $(OBJS) $(LIBS) |
|
111 |
|
112 pcre_build: $(LIBPCREDIR)/Makefile |
|
113 @echo Compiling libpcre; cd $(LIBPCREDIR) && $(MAKE) |
|
114 @@ -225,7 +236,9 @@ |
|
115 config.cache config.log config.status |
|
116 |
|
117 install-nmap: $(TARGET) |
|
118 - $(INSTALL) -d $(DESTDIR)$(bindir) $(DESTDIR)$(mandir)/man1 $(DESTDIR)$(nmapdatadir) |
|
119 + $(INSTALL) -d $(DESTDIR)$(bindir) |
|
120 + $(INSTALL) -d $(DESTDIR)$(mandir)/man1 |
|
121 + $(INSTALL) -d $(DESTDIR)$(nmapdatadir) |
|
122 $(INSTALL) -c -m 755 nmap $(DESTDIR)$(bindir)/nmap |
|
123 # Use strip -x to avoid stripping dynamically loaded NSE functions. See |
|
124 # http://seclists.org/nmap-dev/2007/q4/0272.html. |
|
125 @@ -277,8 +290,10 @@ |
|
126 cd $(ZENMAPDIR) && $(PYTHON) setup.py build $(if $(DESTDIR),--executable "$(DEFAULT_PYTHON_PATH)") |
|
127 |
|
128 install-zenmap: $(ZENMAPDIR)/setup.py |
|
129 + $(INSTALL) -d $(DESTDIR)$(bindir) |
|
130 + $(INSTALL) -d $(DESTDIR)$(mandir)/man1 |
|
131 $(INSTALL) -d $(DESTDIR)$(bindir) $(DESTDIR)$(mandir)/man1 |
|
132 - cd $(ZENMAPDIR) && $(PYTHON) setup.py --quiet install --prefix "$(prefix)" --force $(if $(DESTDIR),--root "$(DESTDIR)") |
|
133 + cd $(ZENMAPDIR) && $(PYTHON) setup.py --quiet install --prefix "$(prefix)" --force $(if $(DESTDIR),--root "$(DESTDIR)") --install-lib $(PYTHONDIR) |
|
134 $(INSTALL) -c -m 644 docs/zenmap.1 $(DESTDIR)$(mandir)/man1/ |
|
135 # Create a symlink from nmapfe to zenmap if nmapfe doesn't exist or is |
|
136 # already a link. |
|
137 @@ -295,7 +310,7 @@ |
|
138 @cd $(NPINGDIR) && $(MAKE) |
|
139 |
|
140 install-ndiff: |
|
141 - cd $(NDIFFDIR) && $(PYTHON) setup.py install --prefix "$(prefix)" $(if $(DESTDIR),--root "$(DESTDIR)") |
|
142 + cd $(NDIFFDIR) && $(PYTHON) setup.py install --prefix "$(prefix)" $(if $(DESTDIR),--root "$(DESTDIR)") --install-lib $(PYTHONDIR) |
|
143 |
|
144 NSE_FILES = scripts/script.db scripts/*.nse |
|
145 NSE_LIB_LUA_FILES = nselib/*.lua |
|
146 @@ -371,7 +386,7 @@ |
|
147 ./config.status --recheck |
|
148 |
|
149 makefile.dep: |
|
150 - $(CXX) -MM $(CPPFLAGS) $(SRCS) > $@ |
|
151 + $(CXX) $(CPPFLAGS) $(CXXFLAGS) -MM $(CPPFLAGS) $(SRCS) | grep -v '/usr/gnu' | grep -v '/usr/include' | grep -v '/usr/sfw' | nawk 'NR>1 { if ($$0 ~ /^.*\.o:/ && line ~ /\\$$/ ) sub(/ \\$$/, "", line); print line } { line = $$0 } END { sub(/ \\$$/, "", line); print line }' > $@ |
|
152 include makefile.dep |
|
153 |
|
154 # These the old names of scripts that have been renamed or deleted. Any |
|