equal
deleted
inserted
replaced
1 --- nmap-5.21/nbase/Makefile.in 2009-03-25 05:49:32.000000000 -0700 |
|
2 +++ nmap-5.21/nbase/Makefile.in 2010-02-23 10:25:33.136566614 -0800 |
|
3 @@ -6,7 +6,7 @@ |
|
4 srcdir = @srcdir@ |
|
5 |
|
6 CC = @CC@ |
|
7 -AR = ar |
|
8 +CXX = @CXX@ |
|
9 RANLIB = @RANLIB@ |
|
10 CCOPT = |
|
11 DEFS = @DEFS@ |
|
12 @@ -14,12 +14,14 @@ |
|
13 DEFS += -D_FORTIFY_SOURCE=2 |
|
14 CPPFLAGS = @CPPFLAGS@ |
|
15 CFLAGS = @CFLAGS@ $(CCOPT) $(GLIB_CFLAGS) $(DEFS) $(INCLS) |
|
16 +CXXFLAGS = @CXXFLAGS@ |
|
17 STATIC = |
|
18 LDFLAGS = @LDFLAGS@ $(STATIC) |
|
19 LIBS = @LIBS@ |
|
20 SHTOOL = ./shtool |
|
21 INSTALL = $(SHTOOL) install |
|
22 MAKEDEPEND = @MAKEDEPEND@ |
|
23 +AR = /usr/bin/ar cq |
|
24 |
|
25 TARGET = libnbase.a |
|
26 |
|
27 @@ -30,7 +32,7 @@ |
|
28 |
|
29 $(TARGET): $(DEPS) $(OBJS) |
|
30 rm -f $@ |
|
31 - $(AR) cr $@ $(OBJS) |
|
32 + $(AR) $@ $(OBJS) |
|
33 $(RANLIB) $@ |
|
34 |
|
35 clean: |
|
36 @@ -51,8 +53,10 @@ |
|
37 config.status: configure |
|
38 ./config.status --recheck |
|
39 |
|
40 +.c.o: |
|
41 + $(CC) $(CPPFLAGS) $(CFLAGS) -c $< -o $@ |
|
42 .cc.o: |
|
43 - $(CC) -c $(CFLAGS) $*.cc |
|
44 + $(CXX) $(CPPFLAGS) $(CXXFLAGS) -c $< o $@ |
|
45 |
|
46 # DO NOT DELETE -- Needed by makedepend |
|
47 |
|