1 |
wally |
108292 |
--- ./common.mak.make_makeup~ 2010-02-13 23:32:28.000000000 +0100 |
2 |
|
|
+++ ./common.mak 2011-06-16 17:33:15.000000000 +0200 |
3 |
kharec |
1183 |
@@ -31,16 +31,16 @@ COMMON_CFLAGS += -DCYGWIN |
4 |
|
|
endif |
5 |
|
|
|
6 |
|
|
ifeq ($(SQLITE), true) |
7 |
|
|
- COMMON_CFLAGS += -I/usr/local/include -DHAVE_SQLITE |
8 |
|
|
+ COMMON_CFLAGS += $(shell pkg-config --cflags sqlite3) -DHAVE_SQLITE -DHAVE_REGEXP |
9 |
|
|
else |
10 |
|
|
ifeq ($(sqlite), true) |
11 |
|
|
- COMMON_CFLAGS += -I/usr/local/include -DHAVE_SQLITE |
12 |
|
|
+ COMMON_CFLAGS += $(shell pkg-config --cflags sqlite3) -DHAVE_SQLITE -DHAVE_REGEXP |
13 |
|
|
else |
14 |
|
|
ifeq ($(SQLITE), TRUE) |
15 |
|
|
- COMMON_CFLAGS += -I/usr/local/include -DHAVE_SQLITE |
16 |
|
|
+ COMMON_CFLAGS += $(shell pkg-config --cflags sqlite3) -DHAVE_SQLITE -DHAVE_REGEXP |
17 |
|
|
else |
18 |
|
|
ifeq ($(sqlite), TRUE) |
19 |
|
|
- COMMON_CFLAGS += -I/usr/local/include -DHAVE_SQLITE |
20 |
|
|
+ COMMON_CFLAGS += $(shell pkg-config --cflags sqlite3) -DHAVE_SQLITE -DHAVE_REGEXP |
21 |
|
|
endif |
22 |
|
|
endif |
23 |
|
|
endif |
24 |
|
|
@@ -66,15 +66,15 @@ AR = $(TOOL_PREFIX)ar |
25 |
|
|
REVISION = $(shell $(AC_ROOT)/evalrev) |
26 |
|
|
REVFLAGS = -D_REVISION=$(REVISION) |
27 |
|
|
|
28 |
|
|
-OPTFLAGS = -D_FILE_OFFSET_BITS=64 |
29 |
|
|
+OPTFLAGS = $(shell getconf LFS_CFLAGS) |
30 |
|
|
CFLAGS ?= -g -W -Wall -Werror -O3 |
31 |
|
|
CFLAGS += $(OPTFLAGS) $(REVFLAGS) $(COMMON_CFLAGS) |
32 |
|
|
|
33 |
|
|
prefix = /usr/local |
34 |
|
|
bindir = $(prefix)/bin |
35 |
|
|
sbindir = $(prefix)/sbin |
36 |
|
|
-mandir = $(prefix)/man/man1 |
37 |
|
|
+mandir = $(prefix)/man |
38 |
|
|
datadir = $(prefix)/share |
39 |
|
|
docdir = $(datadir)/doc/aircrack-ng |
40 |
|
|
libdir = $(prefix)/lib |
41 |
|
|
-etcdir = $(prefix)/etc/aircrack-ng |
42 |
|
|
\ No newline at end of file |
43 |
|
|
+etcdir = $(prefix)/etc/aircrack-ng |
44 |
wally |
108292 |
--- ./manpages/Makefile.make_makeup~ 2009-02-20 18:43:30.000000000 +0100 |
45 |
|
|
+++ ./manpages/Makefile 2011-06-16 17:33:15.000000000 +0200 |
46 |
kharec |
1183 |
@@ -47,13 +47,13 @@ all: |
47 |
|
|
@echo Nothing to do |
48 |
|
|
|
49 |
|
|
install: uninstall |
50 |
|
|
- install -d $(DESTDIR)$(mandir) |
51 |
|
|
- install -m 644 $(MP_FILES) $(DESTDIR)$(mandir) |
52 |
|
|
+ install -d $(DESTDIR)$(mandir)/man1 |
53 |
|
|
+ install -m 644 $(MP_FILES) $(DESTDIR)$(mandir)/man1 |
54 |
|
|
|
55 |
|
|
uninstall: |
56 |
|
|
- @-$(foreach CUR_MP,$(MP_FILES), rm -f $(DESTDIR)$(mandir)/$(CUR_MP); echo rm -f $(DESTDIR)$(mandir)/$(CUR_MP); ) |
57 |
|
|
- -rm -f $(DESTDIR)$(mandir)/airolib-ng.1 |
58 |
|
|
- -rm -f $(DESTDIR)$(mandir)/wesside-ng.1 |
59 |
|
|
- -rm -f $(DESTDIR)$(mandir)/tkiptun-ng.1 |
60 |
|
|
- -rm -f $(DESTDIR)$(mandir)/buddy-ng.1 |
61 |
|
|
- -rm -f $(DESTDIR)$(mandir)/easside-ng.1 |
62 |
|
|
+ @-$(foreach CUR_MP,$(MP_FILES), rm -f $(DESTDIR)$(mandir)/man1/$(CUR_MP); echo rm -f $(DESTDIR)$(mandir)/man1/$(CUR_MP); ) |
63 |
|
|
+ -rm -f $(DESTDIR)$(mandir)/man1/airolib-ng.1 |
64 |
|
|
+ -rm -f $(DESTDIR)$(mandir)/man1/wesside-ng.1 |
65 |
|
|
+ -rm -f $(DESTDIR)$(mandir)/man1/tkiptun-ng.1 |
66 |
|
|
+ -rm -f $(DESTDIR)$(mandir)/man1/buddy-ng.1 |
67 |
|
|
+ -rm -f $(DESTDIR)$(mandir)/man1/easside-ng.1 |
68 |
wally |
108292 |
--- ./scripts/airgraph-ng/common.mak.make_makeup~ 2009-02-10 06:05:30.000000000 +0100 |
69 |
|
|
+++ ./scripts/airgraph-ng/common.mak 2011-06-16 17:33:15.000000000 +0200 |
70 |
kharec |
1183 |
@@ -1,6 +1,6 @@ |
71 |
|
|
prefix = /usr/local
|
72 |
|
|
bindir = $(prefix)/bin
|
73 |
|
|
-mandir = $(prefix)/man/man1
|
74 |
|
|
+mandir = $(prefix)/man
|
75 |
|
|
datadir = $(prefix)/share
|
76 |
|
|
docdir = $(datadir)/doc/airgraph-ng
|
77 |
|
|
libdir = $(prefix)/lib
|
78 |
wally |
108292 |
--- ./src/Makefile.make_makeup~ 2010-02-13 23:32:28.000000000 +0100 |
79 |
|
|
+++ ./src/Makefile 2011-06-16 17:38:09.000000000 +0200 |
80 |
|
|
@@ -90,25 +90,25 @@ OBJS_TT = tkiptun-ng.o common.o crypto. |
81 |
|
|
|
82 |
|
|
|
83 |
|
|
OSD = osdep |
84 |
|
|
-LIBS = -L$(OSD) -l$(OSD) $(LIBPCAP) $(LDFLAGS) |
85 |
|
|
+LIBS = -L$(OSD) -l$(OSD) $(LIBPCAP) |
86 |
|
|
ifeq ($(OSNAME), cygwin) |
87 |
|
|
LIBS += -liphlpapi -lsetupapi -luuid |
88 |
kharec |
1183 |
endif |
89 |
|
|
LIBOSD = $(OSD)/lib$(OSD).a |
90 |
|
|
|
91 |
|
|
-LIBSSL = -lssl -lcrypto $(LDFLAGS) |
92 |
|
|
+LIBSSL = $(shell pkg-config --libs openssl) |
93 |
|
|
LIBSQL = |
94 |
|
|
ifeq ($(SQLITE), true) |
95 |
|
|
- LIBSQL = -L/usr/local/lib -lsqlite3 |
96 |
|
|
+ LIBSQL = $(shell pkg-config --libs sqlite3) |
97 |
|
|
else |
98 |
|
|
ifeq ($(sqlite), true) |
99 |
|
|
- LIBSQL = -L/usr/local/lib -lsqlite3 |
100 |
|
|
+ LIBSQL = $(shell pkg-config --libs sqlite3) |
101 |
|
|
else |
102 |
|
|
ifeq ($(SQLITE), TRUE) |
103 |
|
|
- LIBSQL = -L/usr/local/lib -lsqlite3 |
104 |
|
|
+ LIBSQL = $(shell pkg-config --libs sqlite3) |
105 |
|
|
else |
106 |
|
|
ifeq ($(sqlite), TRUE) |
107 |
|
|
- LIBSQL = -L/usr/local/lib -lsqlite3 |
108 |
|
|
+ LIBSQL = $(shell pkg-config --libs sqlite3) |
109 |
|
|
endif |
110 |
|
|
endif |
111 |
|
|
endif |
112 |
wally |
108292 |
@@ -140,55 +140,55 @@ aircrack-ng-opt-prof_use: $(SRC_AC) |
113 |
|
|
aircrack-ng-opt-prof -lpthread $(LIBSQL) |
114 |
kharec |
1183 |
|
115 |
wally |
108292 |
aircrack-ng$(EXE): $(OBJS_AC) |
116 |
|
|
- $(CC) $(CFLAGS) $(OBJS_AC) $(ASM_AC) -o $(@) -lpthread $(LIBSSL) $(LIBSQL) |
117 |
|
|
+ $(CC) $(CFLAGS) $(LDFLAGS) $(OBJS_AC) $(ASM_AC) -o $(@) -lpthread $(LIBSSL) $(LIBSQL) |
118 |
|
|
|
119 |
|
|
airdecap-ng$(EXE): $(OBJS_AD) |
120 |
|
|
- $(CC) $(CFLAGS) $(OBJS_AD) -o $(@) $(LIBSSL) |
121 |
|
|
+ $(CC) $(CFLAGS) $(LDFLAGS) $(OBJS_AD) -o $(@) $(LIBSSL) |
122 |
|
|
|
123 |
|
|
packetforge-ng$(EXE): $(OBJS_PF) |
124 |
|
|
- $(CC) $(CFLAGS) $(OBJS_PF) -o $(@) $(LIBSSL) |
125 |
|
|
+ $(CC) $(CFLAGS) $(LDFLAGS) $(OBJS_PF) -o $(@) $(LIBSSL) |
126 |
|
|
|
127 |
|
|
aireplay-ng$(EXE): $(OBJS_AR) $(LIBOSD) |
128 |
|
|
- $(CC) $(CFLAGS) $(OBJS_AR) -o $(@) $(LIBS) $(LIBSSL) |
129 |
|
|
+ $(CC) $(CFLAGS) $(LDFLAGS) $(OBJS_AR) -o $(@) $(LIBS) $(LIBSSL) |
130 |
|
|
|
131 |
|
|
airodump-ng$(EXE): $(OBJS_ADU) $(LIBOSD) |
132 |
|
|
- $(CC) $(CFLAGS) $(OBJS_ADU) -o $(@) $(LIBS) $(LIBSSL) -lpthread |
133 |
|
|
+ $(CC) $(CFLAGS) $(LDFLAGS) $(OBJS_ADU) -o $(@) $(LIBS) $(LIBSSL) -lpthread |
134 |
|
|
|
135 |
|
|
airserv-ng$(EXE): $(OBJS_AS) $(LIBOSD) |
136 |
|
|
- $(CC) $(CFLAGS) $(OBJS_AS) -o $(@) $(LIBS) $(LIBPCAP) |
137 |
|
|
+ $(CC) $(CFLAGS) $(LDFLAGS) $(OBJS_AS) -o $(@) $(LIBS) $(LIBPCAP) |
138 |
|
|
|
139 |
|
|
airtun-ng$(EXE): $(OBJS_AT) $(LIBOSD) |
140 |
|
|
- $(CC) $(CFLAGS) $(OBJS_AT) -o $(@) $(LIBS) $(LIBSSL) |
141 |
|
|
+ $(CC) $(CFLAGS) $(LDFLAGS) $(OBJS_AT) -o $(@) $(LIBS) $(LIBSSL) |
142 |
|
|
|
143 |
|
|
ivstools$(EXE): $(OBJS_IV) |
144 |
|
|
- $(CC) $(CFLAGS) $(OBJS_IV) -o $(@) $(LIBSSL) |
145 |
|
|
+ $(CC) $(CFLAGS) $(LDFLAGS) $(OBJS_IV) -o $(@) $(LIBSSL) |
146 |
|
|
|
147 |
|
|
kstats$(EXE): kstats.o |
148 |
|
|
- $(CC) $(CFLAGS) kstats.o -o $(@) |
149 |
|
|
+ $(CC) $(CFLAGS) $(LDFLAGS) kstats.o -o $(@) |
150 |
|
|
|
151 |
|
|
wesside-ng$(EXE): $(OBJS_WS) $(LIBOSD) |
152 |
|
|
- $(CC) $(CFLAGS) $(OBJS_WS) -o $(@) $(LIBS) $(LIBSSL) -lz |
153 |
|
|
+ $(CC) $(CFLAGS) $(LDFLAGS) $(OBJS_WS) -o $(@) $(LIBS) $(LIBSSL) -lz |
154 |
|
|
|
155 |
|
|
easside-ng$(EXE): $(OBJS_ES) $(LIBOSD) |
156 |
|
|
- $(CC) $(CFLAGS) $(OBJS_ES) -o $(@) $(LIBS) -lz |
157 |
|
|
+ $(CC) $(CFLAGS) $(LDFLAGS) $(OBJS_ES) -o $(@) $(LIBS) -lz |
158 |
|
|
|
159 |
|
|
buddy-ng$(EXE): $(OBJS_BUDDY) |
160 |
|
|
- $(CC) $(CFLAGS) $(OBJS_BUDDY) -o $(@) |
161 |
|
|
+ $(CC) $(CFLAGS) $(LDFLAGS) $(OBJS_BUDDY) -o $(@) |
162 |
|
|
|
163 |
|
|
makeivs-ng$(EXE): $(OBJS_MI) |
164 |
|
|
- $(CC) $(CFLAGS) $(OBJS_MI) -o $(@) |
165 |
|
|
+ $(CC) $(CFLAGS) $(LDFLAGS) $(OBJS_MI) -o $(@) |
166 |
|
|
|
167 |
kharec |
1183 |
airolib-ng$(EXE): $(OBJS_AL) |
168 |
|
|
- $(CC) $(CFLAGS) $(OBJS_AL) -o $(@) $(LIBSSL) -DHAVE_REGEXP $(LIBSQL) |
169 |
wally |
108292 |
+ $(CC) $(CFLAGS) $(LDFLAGS) $(OBJS_AL) -o $(@) $(LIBSSL) $(LIBSQL) |
170 |
kharec |
1183 |
|
171 |
|
|
airbase-ng$(EXE): $(OBJS_AB) $(LIBOSD) |
172 |
wally |
108292 |
- $(CC) $(CFLAGS) $(OBJS_AB) -o $(@) $(LIBS) $(LIBSSL) -lpthread |
173 |
|
|
+ $(CC) $(CFLAGS) $(LDFLAGS) $(OBJS_AB) -o $(@) $(LIBS) $(LIBSSL) -lpthread |
174 |
|
|
|
175 |
|
|
airdecloak-ng$(EXE): $(OBJS_AU) |
176 |
|
|
- $(CC) $(CFLAGS) $(OBJS_AU) -o $(@) |
177 |
|
|
+ $(CC) $(CFLAGS) $(LDFLAGS) $(OBJS_AU) -o $(@) |
178 |
|
|
|
179 |
|
|
tkiptun-ng$(EXE): $(OBJS_TT) $(LIBOSD) |
180 |
|
|
- $(CC) $(CFLAGS) $(OBJS_TT) -o $(@) $(LIBS) $(LIBSSL) |
181 |
|
|
+ $(CC) $(CFLAGS) $(LDFLAGS) $(OBJS_TT) -o $(@) $(LIBS) $(LIBSSL) |
182 |
|
|
|
183 |
|
|
strip: $(BINFILES) $(SBINFILES) |
184 |
|
|
strip $(BINFILES) $(SBINFILES) |