1 |
nerdboy 09/08/01 20:00:23 |
2 |
|
3 |
Added: duma-2.5.15-GNUmakefile.patch |
4 |
Log: |
5 |
Updated to latest version using new ebuild (closes bug #275011). |
6 |
(Portage version: 2.2_rc33/cvs/Linux x86_64) |
7 |
|
8 |
Revision Changes Path |
9 |
1.1 dev-util/duma/files/duma-2.5.15-GNUmakefile.patch |
10 |
|
11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/duma/files/duma-2.5.15-GNUmakefile.patch?rev=1.1&view=markup |
12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/duma/files/duma-2.5.15-GNUmakefile.patch?rev=1.1&content-type=text/plain |
13 |
|
14 |
Index: duma-2.5.15-GNUmakefile.patch |
15 |
=================================================================== |
16 |
Rename CPPFLAGS to CXXFLAGS and DUMA_OPTIONS to CPPFLAGS as that's intended for the preprocessor AFAIK. Respect users AR, LD, CC, CXX, CXXFLAGS, CFLAGS, LDFLAGSand RANLIB. Fix building with GLIBC 2.10+ by working around the souce fortifying. |
17 |
|
18 |
diff -ur duma_2_5_15.orig/comparisons/ex11/Makefile duma_2_5_15/comparisons/ex11/Makefile |
19 |
--- duma_2_5_15.orig/comparisons/ex11/Makefile 2009-06-22 05:27:53.000000000 +0300 |
20 |
+++ duma_2_5_15/comparisons/ex11/Makefile 2009-06-22 05:35:37.000000000 +0300 |
21 |
@@ -1,6 +1,6 @@ |
22 |
|
23 |
DUMADIR=../.. |
24 |
-CFLAGS=-g -O0 -I$(DUMADIR) -include stdlib.h -include duma.h |
25 |
+CFLAGS +=-I$(DUMADIR) -include stdlib.h -include duma.h |
26 |
LFLAGS=$(DUMADIR)/libduma.a |
27 |
ifeq ($(OS), Windows_NT) |
28 |
LIBS= |
29 |
@@ -8,8 +8,8 @@ |
30 |
LIBS=-lpthread |
31 |
endif |
32 |
|
33 |
-CC=gcc |
34 |
-CXX=g++ |
35 |
+CC ?= gcc |
36 |
+CXX ?= g++ |
37 |
|
38 |
BIN=wrong1 |
39 |
OBJ=$(BIN).o |
40 |
@@ -21,8 +21,8 @@ |
41 |
- rm -f $(OBJ) $(BIN) |
42 |
|
43 |
$(BIN): $(OBJ) |
44 |
- $(CC) $(OBJ) $(LFLAGS) $(LIBS) -o $(BIN) |
45 |
+ $(CC) $(LDFLAGS) $(CFLAGS) $(CPPFLAGS) $(OBJ) $(LFLAGS) $(LIBS) -o $(BIN) |
46 |
|
47 |
.c.o: |
48 |
- $(CC) $(CFLAGS) -c $< -o $@ |
49 |
+ $(CC) $(LDFLAGS) $(CFLAGS) $(CPPFLAGS) -c $< -o $@ |
50 |
|
51 |
diff -ur duma_2_5_15.orig/comparisons/ex12/Makefile duma_2_5_15/comparisons/ex12/Makefile |
52 |
--- duma_2_5_15.orig/comparisons/ex12/Makefile 2009-06-22 05:27:53.000000000 +0300 |
53 |
+++ duma_2_5_15/comparisons/ex12/Makefile 2009-06-22 05:35:37.000000000 +0300 |
54 |
@@ -1,6 +1,6 @@ |
55 |
|
56 |
DUMADIR=../.. |
57 |
-CFLAGS=-g -O0 -I$(DUMADIR) -include stdlib.h -include duma.h |
58 |
+CFLAGS +=-I$(DUMADIR) -include stdlib.h -include duma.h |
59 |
LFLAGS=$(DUMADIR)/libduma.a |
60 |
ifeq ($(OS), Windows_NT) |
61 |
LIBS= |
62 |
@@ -8,8 +8,8 @@ |
63 |
LIBS=-lpthread |
64 |
endif |
65 |
|
66 |
-CC=gcc |
67 |
-CXX=g++ |
68 |
+CC ?= gcc |
69 |
+CXX ?= g++ |
70 |
|
71 |
BIN=wrong3 |
72 |
OBJ=$(BIN).o |
73 |
@@ -21,8 +21,8 @@ |
74 |
- rm -f $(OBJ) $(BIN) |
75 |
|
76 |
$(BIN): $(OBJ) |
77 |
- $(CC) $(OBJ) $(LFLAGS) $(LIBS) -o $(BIN) |
78 |
+ $(CC) $(LDFLAGS) $(CFLAGS) $(CPPFLAGS) $(OBJ) $(LFLAGS) $(LIBS) -o $(BIN) |
79 |
|
80 |
.c.o: |
81 |
- $(CC) $(CFLAGS) -c $< -o $@ |
82 |
+ $(CC) $(LDFLAGS) $(CFLAGS) $(CPPFLAGS) -c $< -o $@ |
83 |
|
84 |
diff -ur duma_2_5_15.orig/comparisons/ex13/Makefile duma_2_5_15/comparisons/ex13/Makefile |
85 |
--- duma_2_5_15.orig/comparisons/ex13/Makefile 2009-06-22 05:27:53.000000000 +0300 |
86 |
+++ duma_2_5_15/comparisons/ex13/Makefile 2009-06-22 05:35:37.000000000 +0300 |
87 |
@@ -1,6 +1,6 @@ |
88 |
|
89 |
DUMADIR=../.. |
90 |
-CFLAGS=-g -O0 -I$(DUMADIR) -include stdlib.h -include duma.h |
91 |
+CFLAGS +=-I$(DUMADIR) -include stdlib.h -include duma.h |
92 |
LFLAGS=$(DUMADIR)/libduma.a |
93 |
ifeq ($(OS), Windows_NT) |
94 |
LIBS= |
95 |
@@ -8,8 +8,8 @@ |
96 |
LIBS=-lpthread |
97 |
endif |
98 |
|
99 |
-CC=gcc |
100 |
-CXX=g++ |
101 |
+CC ?= gcc |
102 |
+CXX ?= g++ |
103 |
|
104 |
BIN=wrong6 |
105 |
OBJ=$(BIN).o |
106 |
@@ -21,8 +21,8 @@ |
107 |
- rm -f $(OBJ) $(BIN) |
108 |
|
109 |
$(BIN): $(OBJ) |
110 |
- $(CC) $(OBJ) $(LFLAGS) $(LIBS) -o $(BIN) |
111 |
+ $(CC) $(LDFLAGS) $(CFLAGS) $(CPPFLAGS) $(OBJ) $(LFLAGS) $(LIBS) -o $(BIN) |
112 |
|
113 |
.c.o: |
114 |
- $(CC) $(CFLAGS) -c $< -o $@ |
115 |
+ $(CC) $(LDFLAGS) $(CFLAGS) $(CPPFLAGS) -c $< -o $@ |
116 |
|
117 |
diff -ur duma_2_5_15.orig/comparisons/ex14/Makefile duma_2_5_15/comparisons/ex14/Makefile |
118 |
--- duma_2_5_15.orig/comparisons/ex14/Makefile 2009-06-22 05:27:53.000000000 +0300 |
119 |
+++ duma_2_5_15/comparisons/ex14/Makefile 2009-06-22 05:35:37.000000000 +0300 |
120 |
@@ -1,6 +1,6 @@ |
121 |
|
122 |
DUMADIR=../.. |
123 |
-CFLAGS=-g -O0 -I$(DUMADIR) -include stdlib.h -include duma.h |
124 |
+CFLAGS +=-I$(DUMADIR) -include stdlib.h -include duma.h |
125 |
LFLAGS=$(DUMADIR)/libduma.a |
126 |
ifeq ($(OS), Windows_NT) |
127 |
LIBS= |
128 |
@@ -8,8 +8,8 @@ |
129 |
LIBS=-lpthread |
130 |
endif |
131 |
|
132 |
-CC=gcc |
133 |
-CXX=g++ |
134 |
+CC ?= gcc |
135 |
+CXX ?= g++ |
136 |
|
137 |
BIN=wrong7 |
138 |
OBJ=$(BIN).o |
139 |
@@ -21,8 +21,8 @@ |
140 |
- rm -f $(OBJ) $(BIN) |
141 |
|
142 |
$(BIN): $(OBJ) |
143 |
- $(CC) $(OBJ) $(LFLAGS) $(LIBS) -o $(BIN) |
144 |
+ $(CC) $(LDFLAGS) $(CFLAGS) $(CPPFLAGS) $(OBJ) $(LFLAGS) $(LIBS) -o $(BIN) |
145 |
|
146 |
.c.o: |
147 |
- $(CC) $(CFLAGS) -c $< -o $@ |
148 |
+ $(CC) $(LDFLAGS) $(CFLAGS) $(CPPFLAGS) -c $< -o $@ |
149 |
|
150 |
diff -ur duma_2_5_15.orig/comparisons/ex15/Makefile duma_2_5_15/comparisons/ex15/Makefile |
151 |
--- duma_2_5_15.orig/comparisons/ex15/Makefile 2009-06-22 05:27:53.000000000 +0300 |
152 |
+++ duma_2_5_15/comparisons/ex15/Makefile 2009-06-22 05:35:37.000000000 +0300 |
153 |
@@ -1,6 +1,6 @@ |
154 |
|
155 |
DUMADIR=../.. |
156 |
-CFLAGS=-g -O0 -I$(DUMADIR) -include stdlib.h -include duma.h |
157 |
+CFLAGS +=-I$(DUMADIR) -include stdlib.h -include duma.h |
158 |
LFLAGS=$(DUMADIR)/libduma.a |
159 |
ifeq ($(OS), Windows_NT) |
160 |
LIBS= |
161 |
@@ -8,8 +8,8 @@ |
162 |
LIBS=-lpthread |
163 |
endif |
164 |
|
165 |
-CC=gcc |
166 |
-CXX=g++ |
167 |
+CC ?= gcc |
168 |
+CXX ?= g++ |
169 |
|
170 |
BIN=leak1 |
171 |
OBJ=$(BIN).o |
172 |
@@ -21,8 +21,8 @@ |
173 |
- rm -f $(OBJ) $(BIN) |
174 |
|
175 |
$(BIN): $(OBJ) |
176 |
- $(CC) $(OBJ) $(LFLAGS) $(LIBS) -o $(BIN) |
177 |
+ $(CC) $(LDFLAGS) $(CFLAGS) $(CPPFLAGS) $(OBJ) $(LFLAGS) $(LIBS) -o $(BIN) |
178 |
|
179 |
.c.o: |
180 |
- $(CC) $(CFLAGS) -c $< -o $@ |
181 |
+ $(CC) $(LDFLAGS) $(CFLAGS) $(CPPFLAGS) -c $< -o $@ |
182 |
|
183 |
diff -ur duma_2_5_15.orig/comparisons/ex16/Makefile duma_2_5_15/comparisons/ex16/Makefile |
184 |
--- duma_2_5_15.orig/comparisons/ex16/Makefile 2009-06-22 05:27:53.000000000 +0300 |
185 |
+++ duma_2_5_15/comparisons/ex16/Makefile 2009-06-22 05:35:37.000000000 +0300 |
186 |
@@ -1,6 +1,6 @@ |
187 |
|
188 |
DUMADIR=../.. |
189 |
-CFLAGS=-g -O0 -I$(DUMADIR) -include stdlib.h -include duma.h |
190 |
+CFLAGS +=-I$(DUMADIR) -include stdlib.h -include duma.h |
191 |
LFLAGS=$(DUMADIR)/libduma.a |
192 |
ifeq ($(OS), Windows_NT) |
193 |
LIBS= |
194 |
@@ -8,8 +8,8 @@ |
195 |
LIBS=-lpthread |
196 |
endif |
197 |
|
198 |
-CC=gcc |
199 |
-CXX=g++ |
200 |
+CC ?= gcc |
201 |
+CXX ?= g++ |
202 |
|
203 |
BIN=leak2 |
204 |
OBJ=$(BIN).o |
205 |
@@ -21,8 +21,8 @@ |
206 |
- rm -f $(OBJ) $(BIN) |
207 |
|
208 |
$(BIN): $(OBJ) |
209 |
- $(CC) $(OBJ) $(LFLAGS) $(LIBS) -o $(BIN) |
210 |
+ $(CC) $(LDFLAGS) $(CFLAGS) $(CPPFLAGS) $(OBJ) $(LFLAGS) $(LIBS) -o $(BIN) |
211 |
|
212 |
.c.o: |
213 |
- $(CC) $(CFLAGS) -c $< -o $@ |
214 |
+ $(CC) $(LDFLAGS) $(CFLAGS) $(CPPFLAGS) -c $< -o $@ |
215 |
|
216 |
diff -ur duma_2_5_15.orig/comparisons/ex17/Makefile duma_2_5_15/comparisons/ex17/Makefile |
217 |
--- duma_2_5_15.orig/comparisons/ex17/Makefile 2009-06-22 05:27:53.000000000 +0300 |
218 |
+++ duma_2_5_15/comparisons/ex17/Makefile 2009-06-22 05:35:37.000000000 +0300 |
219 |
@@ -1,6 +1,6 @@ |
220 |
|
221 |
DUMADIR=../.. |
222 |
-CFLAGS=-g -O0 -I$(DUMADIR) -include stdlib.h -include duma.h |
223 |
+CFLAGS +=-I$(DUMADIR) -include stdlib.h -include duma.h |
224 |
LFLAGS=$(DUMADIR)/libduma.a |
225 |
ifeq ($(OS), Windows_NT) |
226 |
LIBS= |
227 |
@@ -8,8 +8,8 @@ |
228 |
LIBS=-lpthread |
229 |
endif |
230 |
|
231 |
-CC=gcc |
232 |
-CXX=g++ |
233 |
+CC ?= gcc |
234 |
+CXX ?= g++ |
235 |
|
236 |
BIN=ok5 |
237 |
OBJ=$(BIN).o |
238 |
@@ -21,8 +21,8 @@ |
239 |
- rm -f $(OBJ) $(BIN) |
240 |
|
241 |
$(BIN): $(OBJ) |
242 |
- $(CC) $(OBJ) $(LFLAGS) $(LIBS) -o $(BIN) |
243 |
+ $(CC) $(LDFLAGS) $(CFLAGS) $(CPPFLAGS) $(OBJ) $(LFLAGS) $(LIBS) -o $(BIN) |
244 |
|
245 |
.c.o: |
246 |
- $(CC) $(CFLAGS) -c $< -o $@ |
247 |
+ $(CC) $(LDFLAGS) $(CFLAGS) $(CPPFLAGS) -c $< -o $@ |
248 |
|
249 |
diff -ur duma_2_5_15.orig/comparisons/ex21/Makefile duma_2_5_15/comparisons/ex21/Makefile |
250 |
--- duma_2_5_15.orig/comparisons/ex21/Makefile 2009-06-22 05:27:53.000000000 +0300 |
251 |
+++ duma_2_5_15/comparisons/ex21/Makefile 2009-06-22 05:35:37.000000000 +0300 |
252 |
@@ -1,6 +1,6 @@ |
253 |
|
254 |
DUMADIR=../.. |
255 |
-CPPFLAGS=-g -O0 -I$(DUMADIR) -include stdlib.h -include new -include dumapp.h |
256 |
+CXXFLAGS += -I$(DUMADIR) -include stdlib.h -include new -include dumapp.h |
257 |
LFLAGS=$(DUMADIR)/libduma.a |
258 |
ifeq ($(OS), Windows_NT) |
259 |
LIBS= |
260 |
@@ -8,8 +8,8 @@ |
261 |
LIBS=-lpthread |
262 |
endif |
263 |
|
264 |
-CC=gcc |
265 |
-CXX=g++ |
266 |
+CC ?= gcc |
267 |
+CXX ?= g++ |
268 |
|
269 |
BIN=wrong1 |
270 |
OBJ=$(BIN).o |
271 |
@@ -21,7 +21,7 @@ |
272 |
- rm -f $(OBJ) $(BIN) |
273 |
|
274 |
$(BIN): $(OBJ) |
275 |
- $(CXX) $(OBJ) $(LFLAGS) $(LIBS) -o $(BIN) |
276 |
+ $(CXX) $(LDFLAGS) $(CXXFLAGS) $(CPPFLAGS) $(OBJ) $(LFLAGS) $(LIBS) -o $(BIN) |
277 |
|
278 |
.cc.o: |
279 |
$(CXX) $(LDFLAGS) $(CXXFLAGS) -c $< -o $@ |
280 |
diff -ur duma_2_5_15.orig/comparisons/ex22/Makefile duma_2_5_15/comparisons/ex22/Makefile |
281 |
--- duma_2_5_15.orig/comparisons/ex22/Makefile 2009-06-22 05:27:53.000000000 +0300 |
282 |
+++ duma_2_5_15/comparisons/ex22/Makefile 2009-06-22 05:35:37.000000000 +0300 |
283 |
@@ -1,6 +1,6 @@ |
284 |
|
285 |
DUMADIR=../.. |
286 |
-CPPFLAGS=-g -O0 -I$(DUMADIR) -include stdlib.h -include new -include dumapp.h |
287 |
+CXXFLAGS += -I$(DUMADIR) -include stdlib.h -include new -include dumapp.h |
288 |
LFLAGS=$(DUMADIR)/libduma.a |
289 |
ifeq ($(OS), Windows_NT) |
290 |
LIBS= |
291 |
@@ -8,8 +8,8 @@ |
292 |
LIBS=-lpthread |
293 |
endif |
294 |
|
295 |
-CC=gcc |
296 |
-CXX=g++ |
297 |
+CC ?= gcc |
298 |
+CXX ?= g++ |
299 |
|
300 |
BIN=wrong2 |
301 |
OBJ=$(BIN).o |
302 |
@@ -21,7 +21,7 @@ |
303 |
- rm -f $(OBJ) $(BIN) |
304 |
|
305 |
$(BIN): $(OBJ) |
306 |
- $(CXX) $(OBJ) $(LFLAGS) $(LIBS) -o $(BIN) |
307 |
+ $(CXX) $(LDFLAGS) $(CXXFLAGS) $(CPPFLAGS) $(OBJ) $(LFLAGS) $(LIBS) -o $(BIN) |
308 |
|
309 |
.cc.o: |
310 |
$(CXX) $(LDFLAGS) $(CXXFLAGS) -c $< -o $@ |
311 |
diff -ur duma_2_5_15.orig/comparisons/ex23/Makefile duma_2_5_15/comparisons/ex23/Makefile |
312 |
--- duma_2_5_15.orig/comparisons/ex23/Makefile 2009-06-22 05:27:53.000000000 +0300 |
313 |
+++ duma_2_5_15/comparisons/ex23/Makefile 2009-06-22 05:35:37.000000000 +0300 |
314 |
@@ -1,6 +1,6 @@ |
315 |
|
316 |
DUMADIR=../.. |
317 |
-CPPFLAGS=-g -O0 -I$(DUMADIR) -include stdlib.h -include new -include dumapp.h |
318 |
+CXXFLAGS += -I$(DUMADIR) -include stdlib.h -include new -include dumapp.h |
319 |
LFLAGS=$(DUMADIR)/libduma.a |
320 |
ifeq ($(OS), Windows_NT) |
321 |
LIBS= |
322 |
@@ -8,8 +8,8 @@ |
323 |
LIBS=-lpthread |
324 |
endif |
325 |
|
326 |
-CC=gcc |
327 |
-CXX=g++ |
328 |
+CC ?= gcc |
329 |
+CXX ?= g++ |
330 |
|
331 |
BIN=wrong3 |
332 |
OBJ=$(BIN).o |
333 |
@@ -21,7 +21,7 @@ |
334 |
- rm -f $(OBJ) $(BIN) |
335 |
|
336 |
$(BIN): $(OBJ) |
337 |
- $(CXX) $(OBJ) $(LFLAGS) $(LIBS) -o $(BIN) |
338 |
+ $(CXX) $(LDFLAGS) $(CXXFLAGS) $(CPPFLAGS) $(OBJ) $(LFLAGS) $(LIBS) -o $(BIN) |
339 |
|
340 |
.cc.o: |
341 |
$(CXX) $(LDFLAGS) $(CXXFLAGS) -c $< -o $@ |
342 |
diff -ur duma_2_5_15.orig/comparisons/ex24/Makefile duma_2_5_15/comparisons/ex24/Makefile |
343 |
--- duma_2_5_15.orig/comparisons/ex24/Makefile 2009-06-22 05:27:53.000000000 +0300 |
344 |
+++ duma_2_5_15/comparisons/ex24/Makefile 2009-06-22 05:35:37.000000000 +0300 |
345 |
@@ -1,6 +1,6 @@ |
346 |
|
347 |
DUMADIR=../.. |
348 |
-CPPFLAGS=-g -O0 -I$(DUMADIR) -include stdlib.h -include new -include dumapp.h |
349 |
+CXXFLAGS += -I$(DUMADIR) -include stdlib.h -include new -include dumapp.h |
350 |
LFLAGS=$(DUMADIR)/libduma.a |
351 |
ifeq ($(OS), Windows_NT) |
352 |
LIBS= |
353 |
@@ -8,8 +8,8 @@ |
354 |
LIBS=-lpthread |
355 |
endif |
356 |
|
357 |
-CC=gcc |
358 |
-CXX=g++ |
359 |
+CC ?= gcc |
360 |
+CXX ?= g++ |
361 |
|
362 |
BIN=wrong4 |
363 |
OBJ=$(BIN).o |
364 |
@@ -21,7 +21,7 @@ |
365 |
- rm -f $(OBJ) $(BIN) |
366 |
|
367 |
$(BIN): $(OBJ) |
368 |
- $(CXX) $(OBJ) $(LFLAGS) $(LIBS) -o $(BIN) |
369 |
+ $(CXX) $(LDFLAGS) $(CXXFLAGS) $(CPPFLAGS) $(OBJ) $(LFLAGS) $(LIBS) -o $(BIN) |
370 |
|
371 |
.cc.o: |
372 |
$(CXX) $(LDFLAGS) $(CXXFLAGS) -c $< -o $@ |
373 |
diff -ur duma_2_5_15.orig/comparisons/ex25/Makefile duma_2_5_15/comparisons/ex25/Makefile |
374 |
--- duma_2_5_15.orig/comparisons/ex25/Makefile 2009-06-22 05:27:53.000000000 +0300 |
375 |
+++ duma_2_5_15/comparisons/ex25/Makefile 2009-06-22 05:35:37.000000000 +0300 |
376 |
@@ -1,6 +1,6 @@ |
377 |
|
378 |
DUMADIR=../.. |
379 |
-CPPFLAGS=-g -O0 -I$(DUMADIR) -include stdlib.h -include new -include dumapp.h |
380 |
+CXXFLAGS += -I$(DUMADIR) -include stdlib.h -include new -include dumapp.h |
381 |
LFLAGS=$(DUMADIR)/libduma.a |
382 |
ifeq ($(OS), Windows_NT) |
383 |
LIBS= |
384 |
@@ -8,8 +8,8 @@ |
385 |
LIBS=-lpthread |
386 |
endif |
387 |
|
388 |
-CC=gcc |
389 |
-CXX=g++ |
390 |
+CC ?= gcc |
391 |
+CXX ?= g++ |
392 |
|
393 |
BIN=wrong5 |
394 |
OBJ=$(BIN).o |
395 |
@@ -21,7 +21,7 @@ |
396 |
- rm -f $(OBJ) $(BIN) |
397 |
|
398 |
$(BIN): $(OBJ) |
399 |
- $(CXX) $(OBJ) $(LFLAGS) $(LIBS) -o $(BIN) |
400 |
+ $(CXX) $(LDFLAGS) $(CXXFLAGS) $(CPPFLAGS) $(OBJ) $(LFLAGS) $(LIBS) -o $(BIN) |
401 |
|
402 |
.cc.o: |
403 |
$(CXX) $(LDFLAGS) $(CXXFLAGS) -c $< -o $@ |
404 |
diff -ur duma_2_5_15.orig/comparisons/ex26/Makefile duma_2_5_15/comparisons/ex26/Makefile |
405 |
--- duma_2_5_15.orig/comparisons/ex26/Makefile 2009-06-22 05:27:53.000000000 +0300 |
406 |
+++ duma_2_5_15/comparisons/ex26/Makefile 2009-06-22 05:35:37.000000000 +0300 |
407 |
@@ -1,6 +1,6 @@ |
408 |
|
409 |
DUMADIR=../.. |
410 |
-CPPFLAGS=-g -O0 -I$(DUMADIR) -include stdlib.h -include new -include dumapp.h |
411 |
+CXXFLAGS += -I$(DUMADIR) -include stdlib.h -include new -include dumapp.h |
412 |
LFLAGS=$(DUMADIR)/libduma.a |
413 |
ifeq ($(OS), Windows_NT) |
414 |
LIBS= |
415 |
@@ -8,8 +8,8 @@ |
416 |
LIBS=-lpthread |
417 |
endif |
418 |
|
419 |
-CC=gcc |
420 |
-CXX=g++ |
421 |
+CC ?= gcc |
422 |
+CXX ?= g++ |
423 |
|
424 |
BIN=wrong6 |
425 |
OBJ=$(BIN).o |
426 |
@@ -21,7 +21,7 @@ |
427 |
- rm -f $(OBJ) $(BIN) |
428 |
|
429 |
$(BIN): $(OBJ) |
430 |
- $(CXX) $(OBJ) $(LFLAGS) $(LIBS) -o $(BIN) |
431 |
+ $(CXX) $(LDFLAGS) $(CXXFLAGS) $(CPPFLAGS) $(OBJ) $(LFLAGS) $(LIBS) -o $(BIN) |
432 |
|
433 |
.cc.o: |
434 |
$(CXX) $(LDFLAGS) $(CXXFLAGS) -c $< -o $@ |
435 |
diff -ur duma_2_5_15.orig/comparisons/ex27/Makefile duma_2_5_15/comparisons/ex27/Makefile |
436 |
--- duma_2_5_15.orig/comparisons/ex27/Makefile 2009-06-22 05:27:53.000000000 +0300 |
437 |
+++ duma_2_5_15/comparisons/ex27/Makefile 2009-06-22 05:35:37.000000000 +0300 |
438 |
@@ -1,6 +1,6 @@ |
439 |
|
440 |
DUMADIR=../.. |
441 |
-CPPFLAGS=-g -O0 -I$(DUMADIR) -include stdlib.h -include new -include dumapp.h |
442 |
+CXXFLAGS += -I$(DUMADIR) -include stdlib.h -include new -include dumapp.h |
443 |
LFLAGS=$(DUMADIR)/libduma.a |
444 |
ifeq ($(OS), Windows_NT) |
445 |
LIBS= |
446 |
@@ -8,8 +8,8 @@ |
447 |
LIBS=-lpthread |
448 |
endif |
449 |
|
450 |
-CC=gcc |
451 |
-CXX=g++ |
452 |
+CC ?= gcc |
453 |
+CXX ?= g++ |
454 |
|
455 |
BIN=leak1 |
456 |
OBJ=$(BIN).o |
457 |
@@ -21,7 +21,7 @@ |
458 |
- rm -f $(OBJ) $(BIN) |
459 |
|
460 |
$(BIN): $(OBJ) |
461 |
- $(CXX) $(OBJ) $(LFLAGS) $(LIBS) -o $(BIN) |
462 |
+ $(CXX) $(LDFLAGS) $(CXXFLAGS) $(CPPFLAGS) $(OBJ) $(LFLAGS) $(LIBS) -o $(BIN) |
463 |
|
464 |
.cc.o: |
465 |
$(CXX) $(LDFLAGS) $(CXXFLAGS) -c $< -o $@ |
466 |
diff -ur duma_2_5_15.orig/comparisons/ex28/Makefile duma_2_5_15/comparisons/ex28/Makefile |
467 |
--- duma_2_5_15.orig/comparisons/ex28/Makefile 2009-06-22 05:27:53.000000000 +0300 |
468 |
+++ duma_2_5_15/comparisons/ex28/Makefile 2009-06-22 05:35:37.000000000 +0300 |
469 |
@@ -1,6 +1,6 @@ |
470 |
|
471 |
DUMADIR=../.. |
472 |
-CPPFLAGS=-g -O0 -I$(DUMADIR) -include stdlib.h -include new -include dumapp.h |
473 |
+CXXFLAGS += -I$(DUMADIR) -include stdlib.h -include new -include dumapp.h |
474 |
LFLAGS=$(DUMADIR)/libduma.a |
475 |
ifeq ($(OS), Windows_NT) |
476 |
LIBS= |
477 |
@@ -8,8 +8,8 @@ |
478 |
LIBS=-lpthread |
479 |
endif |
480 |
|
481 |
-CC=gcc |
482 |
-CXX=g++ |
483 |
+CC ?= gcc |
484 |
+CXX ?= g++ |
485 |
|
486 |
BIN=leak2 |
487 |
OBJ=$(BIN).o |
488 |
@@ -21,7 +21,7 @@ |
489 |
- rm -f $(OBJ) $(BIN) |
490 |
|
491 |
$(BIN): $(OBJ) |
492 |
- $(CXX) $(OBJ) $(LFLAGS) $(LIBS) -o $(BIN) |
493 |
+ $(CXX) $(LDFLAGS) $(CXXFLAGS) $(CPPFLAGS) $(OBJ) $(LFLAGS) $(LIBS) -o $(BIN) |
494 |
|
495 |
.cc.o: |
496 |
$(CXX) $(LDFLAGS) $(CXXFLAGS) -c $< -o $@ |
497 |
diff -ur duma_2_5_15.orig/comparisons/ex29/Makefile duma_2_5_15/comparisons/ex29/Makefile |
498 |
--- duma_2_5_15.orig/comparisons/ex29/Makefile 2009-06-22 05:27:53.000000000 +0300 |
499 |
+++ duma_2_5_15/comparisons/ex29/Makefile 2009-06-22 05:35:37.000000000 +0300 |
500 |
@@ -1,6 +1,6 @@ |
501 |
|
502 |
DUMADIR=../.. |
503 |
-CPPFLAGS=-g -O0 -I$(DUMADIR) -include stdlib.h -include new -include dumapp.h |
504 |
+CXXFLAGS += -I$(DUMADIR) -include stdlib.h -include new -include dumapp.h |
505 |
LFLAGS=$(DUMADIR)/libduma.a |
506 |
ifeq ($(OS), Windows_NT) |
507 |
LIBS= |
508 |
@@ -8,8 +8,8 @@ |
509 |
LIBS=-lpthread |
510 |
endif |
511 |
|
512 |
-CC=gcc |
513 |
-CXX=g++ |
514 |
+CC ?= gcc |
515 |
+CXX ?= g++ |
516 |
|
517 |
BIN=ok5 |
518 |
OBJ=$(BIN).o |
519 |
@@ -21,7 +21,7 @@ |
520 |
- rm -f $(OBJ) $(BIN) |
521 |
|
522 |
$(BIN): $(OBJ) |
523 |
- $(CXX) $(OBJ) $(LFLAGS) $(LIBS) -o $(BIN) |
524 |
+ $(CXX) $(LDFLAGS) $(CXXFLAGS) $(CPPFLAGS) $(OBJ) $(LFLAGS) $(LIBS) -o $(BIN) |
525 |
|
526 |
.cc.o: |
527 |
$(CXX) $(LDFLAGS) $(CXXFLAGS) -c $< -o $@ |
528 |
diff -ur duma_2_5_15.orig/example_makes/ex1/Makefile duma_2_5_15/example_makes/ex1/Makefile |
529 |
--- duma_2_5_15.orig/example_makes/ex1/Makefile 2009-06-22 05:27:53.000000000 +0300 |
530 |
+++ duma_2_5_15/example_makes/ex1/Makefile 2009-06-22 05:35:37.000000000 +0300 |
531 |
@@ -1,6 +1,6 @@ |
532 |
|
533 |
DUMADIR=../.. |
534 |
-CPPFLAGS=-g -O0 -I$(DUMADIR) |
535 |
+CXXFLAGS += -I$(DUMADIR) |
536 |
LFLAGS=$(DUMADIR)/libduma.a |
537 |
ifeq ($(OS), Windows_NT) |
538 |
LIBS= |
539 |
@@ -8,8 +8,8 @@ |
540 |
LIBS=-lpthread |
541 |
endif |
542 |
|
543 |
-CC=gcc |
544 |
-CXX=g++ |
545 |
+CC ?= gcc |
546 |
+CXX ?= g++ |
547 |
|
548 |
BIN=example1 |
549 |
OBJ=../../$(BIN).o |
550 |
@@ -21,5 +21,5 @@ |
551 |
- rm -f $(OBJ) $(BIN) |
552 |
|
553 |
$(BIN): $(OBJ) |
554 |
- $(CXX) $(OBJ) $(LFLAGS) $(LIBS) -o $(BIN) |
555 |
+ $(CXX) $(LDFLAGS) $(CXXFLAGS) $(CPPFLAGS) $(OBJ) $(LFLAGS) $(LIBS) -o $(BIN) |
556 |
|
557 |
diff -ur duma_2_5_15.orig/example_makes/ex2/Makefile duma_2_5_15/example_makes/ex2/Makefile |
558 |
--- duma_2_5_15.orig/example_makes/ex2/Makefile 2009-06-22 05:27:53.000000000 +0300 |
559 |
+++ duma_2_5_15/example_makes/ex2/Makefile 2009-06-22 05:35:37.000000000 +0300 |
560 |
@@ -1,6 +1,6 @@ |
561 |
|
562 |
DUMADIR=../.. |
563 |
-CPPFLAGS=-g -O0 -I$(DUMADIR) |
564 |
+CXXFLAGS += -I$(DUMADIR) |
565 |
LFLAGS=$(DUMADIR)/libduma.a |
566 |
ifeq ($(OS), Windows_NT) |
567 |
LIBS= |
568 |
@@ -8,8 +8,8 @@ |
569 |
LIBS=-lpthread |
570 |
endif |
571 |
|
572 |
-CC=gcc |
573 |
-CXX=g++ |
574 |
+CC ?= gcc |
575 |
+CXX ?= g++ |
576 |
|
577 |
BIN=example2 |
578 |
OBJ=../../$(BIN).o |
579 |
@@ -21,5 +21,5 @@ |
580 |
- rm -f $(OBJ) $(BIN) |
581 |
|
582 |
$(BIN): $(OBJ) |
583 |
- $(CXX) $(OBJ) $(LFLAGS) $(LIBS) -o $(BIN) |
584 |
+ $(CXX) $(LDFLAGS) $(CXXFLAGS) $(CPPFLAGS) $(OBJ) $(LFLAGS) $(LIBS) -o $(BIN) |
585 |
|
586 |
diff -ur duma_2_5_15.orig/example_makes/ex3/Makefile duma_2_5_15/example_makes/ex3/Makefile |
587 |
--- duma_2_5_15.orig/example_makes/ex3/Makefile 2009-06-22 05:27:53.000000000 +0300 |
588 |
+++ duma_2_5_15/example_makes/ex3/Makefile 2009-06-22 05:35:37.000000000 +0300 |
589 |
@@ -1,6 +1,6 @@ |
590 |
|
591 |
DUMADIR=../.. |
592 |
-CPPFLAGS=-g -O0 -I$(DUMADIR) |
593 |
+CXXFLAGS += -I$(DUMADIR) |
594 |
LFLAGS=$(DUMADIR)/libduma.a |
595 |
ifeq ($(OS), Windows_NT) |
596 |
LIBS= |
597 |
@@ -8,8 +8,8 @@ |
598 |
LIBS=-lpthread |
599 |
endif |
600 |
|
601 |
-CC=gcc |
602 |
-CXX=g++ |
603 |
+CC ?= gcc |
604 |
+CXX ?= g++ |
605 |
|
606 |
BIN=example3 |
607 |
OBJ=../../$(BIN).o |
608 |
@@ -21,5 +21,5 @@ |
609 |
- rm -f $(OBJ) $(BIN) |
610 |
|
611 |
$(BIN): $(OBJ) |
612 |
- $(CXX) $(OBJ) $(LFLAGS) $(LIBS) -o $(BIN) |
613 |
+ $(CXX) $(LDFLAGS) $(CXXFLAGS) $(CPPFLAGS) $(OBJ) $(LFLAGS) $(LIBS) -o $(BIN) |
614 |
|
615 |
diff -ur duma_2_5_15.orig/example_makes/ex4/Makefile duma_2_5_15/example_makes/ex4/Makefile |
616 |
--- duma_2_5_15.orig/example_makes/ex4/Makefile 2009-06-22 05:27:53.000000000 +0300 |
617 |
+++ duma_2_5_15/example_makes/ex4/Makefile 2009-06-22 05:35:37.000000000 +0300 |
618 |
@@ -1,6 +1,6 @@ |
619 |
|
620 |
DUMADIR=../.. |
621 |
-CPPFLAGS=-g -O0 -I$(DUMADIR) |
622 |
+CXXFLAGS += -I$(DUMADIR) |
623 |
LFLAGS=$(DUMADIR)/libduma.a |
624 |
ifeq ($(OS), Windows_NT) |
625 |
LIBS= |
626 |
@@ -8,8 +8,8 @@ |
627 |
LIBS=-lpthread |
628 |
endif |
629 |
|
630 |
-CC=gcc |
631 |
-CXX=g++ |
632 |
+CC ?= gcc |
633 |
+CXX ?= g++ |
634 |
|
635 |
BIN=example4 |
636 |
OBJ=../../$(BIN).o |
637 |
@@ -21,5 +21,5 @@ |
638 |
- rm -f $(OBJ) $(BIN) |
639 |
|
640 |
$(BIN): $(OBJ) |
641 |
- $(CXX) $(OBJ) $(LFLAGS) $(LIBS) -o $(BIN) |
642 |
+ $(CXX) $(LDFLAGS) $(CXXFLAGS) $(CPPFLAGS) $(OBJ) $(LFLAGS) $(LIBS) -o $(BIN) |
643 |
|
644 |
diff -ur duma_2_5_15.orig/example_makes/ex5/Makefile duma_2_5_15/example_makes/ex5/Makefile |
645 |
--- duma_2_5_15.orig/example_makes/ex5/Makefile 2009-06-22 05:27:53.000000000 +0300 |
646 |
+++ duma_2_5_15/example_makes/ex5/Makefile 2009-06-22 05:35:37.000000000 +0300 |
647 |
@@ -1,6 +1,6 @@ |
648 |
|
649 |
DUMADIR=../.. |
650 |
-CPPFLAGS=-g -O0 -I$(DUMADIR) |
651 |
+CXXFLAGS += -I$(DUMADIR) |
652 |
LFLAGS=$(DUMADIR)/libduma.a |
653 |
ifeq ($(OS), Windows_NT) |
654 |
LIBS= |
655 |
@@ -8,8 +8,8 @@ |
656 |
LIBS=-lpthread |
657 |
endif |
658 |
|
659 |
-CC=gcc |
660 |
-CXX=g++ |
661 |
+CC ?= gcc |
662 |
+CXX ?= g++ |
663 |
|
664 |
BIN=example5 |
665 |
OBJ=../../$(BIN).o |
666 |
@@ -21,5 +21,5 @@ |
667 |
- rm -f $(OBJ) $(BIN) |
668 |
|
669 |
$(BIN): $(OBJ) |
670 |
- $(CXX) $(OBJ) $(LFLAGS) $(LIBS) -o $(BIN) |
671 |
+ $(CXX) $(LDFLAGS) $(CXXFLAGS) $(CPPFLAGS) $(OBJ) $(LFLAGS) $(LIBS) -o $(BIN) |
672 |
|
673 |
diff -ur duma_2_5_15.orig/example_makes/ex6/Makefile duma_2_5_15/example_makes/ex6/Makefile |
674 |
--- duma_2_5_15.orig/example_makes/ex6/Makefile 2009-06-22 05:27:53.000000000 +0300 |
675 |
+++ duma_2_5_15/example_makes/ex6/Makefile 2009-06-22 05:35:37.000000000 +0300 |
676 |
@@ -1,6 +1,6 @@ |
677 |
|
678 |
DUMADIR=../.. |
679 |
-CPPFLAGS=-g -O0 -I$(DUMADIR) -include stdlib.h -include new -include dumapp.h |
680 |
+CXXFLAGS += -I$(DUMADIR) -include stdlib.h -include new -include dumapp.h |
681 |
LFLAGS=$(DUMADIR)/libduma.a |
682 |
ifeq ($(OS), Windows_NT) |
683 |
LIBS= |
684 |
@@ -8,8 +8,8 @@ |
685 |
LIBS=-lpthread |
686 |
endif |
687 |
|
688 |
-CC=gcc |
689 |
-CXX=g++ |
690 |
+CC ?= gcc |
691 |
+CXX ?= g++ |
692 |
|
693 |
BIN=example6 |
694 |
OBJ=../../$(BIN).o |
695 |
@@ -21,7 +21,7 @@ |
696 |
- rm -f $(OBJ) $(BIN) |
697 |
|
698 |
$(BIN): $(OBJ) |
699 |
- $(CXX) $(OBJ) $(LFLAGS) $(LIBS) -o $(BIN) |
700 |
+ $(CXX) $(LDFLAGS) $(CXXFLAGS) $(CPPFLAGS) $(OBJ) $(LFLAGS) $(LIBS) -o $(BIN) |
701 |
|
702 |
.cpp.o: |
703 |
$(CXX) $(LDFLAGS) $(CXXFLAGS) -c $< -o $@ |
704 |
diff -ur duma_2_5_15.orig/GNUmakefile duma_2_5_15/GNUmakefile |
705 |
--- duma_2_5_15.orig/GNUmakefile 2008-08-03 22:22:38.000000000 +0300 |
706 |
+++ duma_2_5_15/GNUmakefile 2009-06-22 05:57:24.000000000 +0300 |
707 |
@@ -65,38 +65,35 @@ |
708 |
# |
709 |
######################################## |
710 |
|
711 |
-# edit following line |
712 |
-DUMA_OPTIONS= |
713 |
- |
714 |
# no leak detection on any platform: |
715 |
# use static library for finding leaks - with information memory was allocated |
716 |
# i think leak-checking without further information is quite useless! |
717 |
# additionaly too many platforms/environments are broken. |
718 |
-DUMA_OPTIONS += -DDUMA_SO_NO_LEAKDETECTION |
719 |
+CPPFLAGS += -DDUMA_SO_NO_LEAKDETECTION $(DUMA_OPTIONS) |
720 |
|
721 |
# some test cases: |
722 |
-#DUMA_OPTIONS += -DDUMA_LIB_NO_LEAKDETECTION |
723 |
-#DUMA_OPTIONS += -DDUMA_NO_THREAD_SAFETY |
724 |
-#DUMA_OPTIONS += -DDUMA_NO_CPP_SUPPORT |
725 |
+#CPPFLAGS += -DDUMA_LIB_NO_LEAKDETECTION |
726 |
+#CPPFLAGS += -DDUMA_NO_THREAD_SAFETY |
727 |
+#CPPFLAGS += -DDUMA_NO_CPP_SUPPORT |
728 |
|
729 |
-PIC=-fPIC -DPIC |
730 |
-DUMA_SO_OPTIONS=$(PIC) -DDUMA_SO_LIBRARY |
731 |
+# For shared linking, |
732 |
+LFLAGS = -fPIC -DPIC -DDUMA_SO_LIBRARY |
733 |
|
734 |
# for FreeBSD 5.4 |
735 |
-# DUMA_OPTIONS += -DPAGE_PROTECTION_VIOLATED_SIGNAL=SIGBUS |
736 |
+# CPPFLAGS += -DPAGE_PROTECTION_VIOLATED_SIGNAL=SIGBUS |
737 |
# |
738 |
# for FreeBSD 5.4 if DUMA_EXPLICIT_INIT is not set |
739 |
-# DUMA_OPTIONS += -DDUMA_NO_LEAKDETECTION |
740 |
+# CPPFLAGS += -DDUMA_NO_LEAKDETECTION |
741 |
# |
742 |
# for cygwin environment on Windows |
743 |
-# DUMA_OPTIONS += -DDUMA_EXPLICIT_INIT |
744 |
+# CPPFLAGS += -DDUMA_EXPLICIT_INIT |
745 |
# also define 'WIN32' |
746 |
|
747 |
# some defaults: |
748 |
-CC=gcc |
749 |
-CXX=g++ |
750 |
-AR=ar |
751 |
-RANLIB=ranlib |
752 |
+CC?=gcc |
753 |
+CXX?=g++ |
754 |
+AR?=ar |
755 |
+RANLIB?=ranlib |
756 |
INSTALL=install |
757 |
RM=rm |
758 |
RMFORCE=rm -f |
759 |
@@ -116,7 +113,7 @@ |
760 |
# using explicit initialization to avoid leak report |
761 |
# from __w32_sharedptr_initialize() function |
762 |
BSWITCH=101 |
763 |
- DUMA_OPTIONS += -DDUMA_EXPLICIT_INIT |
764 |
+ CPPFLAGS += -DDUMA_EXPLICIT_INIT |
765 |
RM=del |
766 |
RMFORCE=del /F 2>nul |
767 |
ECHO=echo |
768 |
@@ -124,31 +121,25 @@ |
769 |
CURPATH= |
770 |
DUMA_DYN_DEPS= |
771 |
DUMASO= |
772 |
- CFLAGS=-g -O0 |
773 |
- CPPFLAGS=-g -O0 |
774 |
LIBS= |
775 |
EXEPOSTFIX=.exe |
776 |
endif |
777 |
ifeq ($(OSTYPE), cygwin) |
778 |
# call make OSTYPE=cygwin |
779 |
BSWITCH=102 |
780 |
- DUMA_OPTIONS += -DDUMA_EXPLICIT_INIT |
781 |
+ CPPFLAGS += -DWIN32 -DDUMA_EXPLICIT_INIT |
782 |
CURPATH=./ |
783 |
DUMA_DYN_DEPS= |
784 |
DUMASO= |
785 |
- CFLAGS=-g -O0 -DWIN32 -Wall -Wextra |
786 |
- CPPFLAGS=-g -O0 -DWIN32 -Wall -Wextra |
787 |
LIBS= |
788 |
EXEPOSTFIX=.exe |
789 |
endif |
790 |
ifndef BSWITCH |
791 |
BSWITCH=100 |
792 |
- DUMA_OPTIONS += -DDUMA_EXPLICIT_INIT |
793 |
+ CPPFLAGS += -DWIN32 -DDUMA_EXPLICIT_INIT |
794 |
CURPATH=./ |
795 |
DUMA_DYN_DEPS= |
796 |
DUMASO= |
797 |
- CFLAGS=-g -O0 -DWIN32 |
798 |
- CPPFLAGS=-g -O0 -DWIN32 |
799 |
LIBS= |
800 |
EXEPOSTFIX=.exe |
801 |
endif |
802 |
@@ -158,29 +149,23 @@ |
803 |
# tested on darwin 8.0, which is the base for mac-osx |
804 |
# call: make OS=osx |
805 |
BSWITCH=210 |
806 |
- DUMA_OPTIONS += -DPAGE_PROTECTION_VIOLATED_SIGNAL=SIGBUS |
807 |
- DUMA_OPTIONS += -DDUMA_SO_PREFER_GETENV |
808 |
-# DUMA_OPTIONS += -DDUMA_LIB_NO_LEAKDETECTION |
809 |
+ CPPFLAGS += -DPAGE_PROTECTION_VIOLATED_SIGNAL=SIGBUS -DDUMA_SO_PREFER_GETENV |
810 |
+# CPPFLAGS += -DDUMA_LIB_NO_LEAKDETECTION |
811 |
CURPATH=./ |
812 |
# DUMA_DYN_DEPS= |
813 |
DUMASO=libduma.dylib |
814 |
DUMASO_LINK1=libduma.dylib |
815 |
- CFLAGS=-g -O0 |
816 |
- CPPFLAGS=-g -O0 |
817 |
LIBS=-lpthread |
818 |
EXEPOSTFIX= |
819 |
endif |
820 |
|
821 |
ifeq ($(OS), freebsd) |
822 |
BSWITCH=310 |
823 |
- DUMA_OPTIONS += -DDUMA_NO_THREAD_SAFETY |
824 |
- DUMA_OPTIONS += -DDUMA_EXPLICIT_INIT |
825 |
+ CPPFLAGS += -DDUMA_NO_THREAD_SAFETY -DDUMA_EXPLICIT_INIT |
826 |
CURPATH=./ |
827 |
DUMA_DYN_DEPS= |
828 |
DUMASO= |
829 |
DUMASO_LINK1= |
830 |
- CFLAGS=-g -O0 |
831 |
- CPPFLAGS=-g -O0 |
832 |
LIBS=-lpthread |
833 |
EXEPOSTFIX= |
834 |
endif |
835 |
@@ -191,25 +176,19 @@ |
836 |
DUMASO=libduma.so.0.0.0 |
837 |
DUMASO_LINK1=libduma.so.0 |
838 |
DUMASO_LINK2=libduma.so |
839 |
- CFLAGS=-g -O0 |
840 |
- CPPFLAGS=-g -O0 |
841 |
LIBS=-lpthread |
842 |
EXEPOSTFIX= |
843 |
endif |
844 |
|
845 |
ifeq ($(OS), solaris) |
846 |
BSWITCH=410 |
847 |
- DUMA_OPTIONS += -DDUMA_NO_STRERROR |
848 |
+ CPPFLAGS += -DDUMA_NO_STRERROR |
849 |
CURPATH=./ |
850 |
DUMA_DYN_DEPS= |
851 |
DUMASO=libduma.so.0.0.0 |
852 |
DUMASO_LINK1=libduma.so.0 |
853 |
DUMASO_LINK2=libduma.so |
854 |
- CFLAGS=-g -O0 |
855 |
- CPPFLAGS=-g -O0 |
856 |
- LDFLAGS += -lgcc_s |
857 |
- LDOPTIONS += -lgcc_s |
858 |
- LIBS=-Wl,-R/opt/sfw/lib -lpthread |
859 |
+ LIBS=-lgcc_s -Wl,-R/opt/sfw/lib -lpthread |
860 |
EXEPOSTFIX= |
861 |
endif |
862 |
|
863 |
@@ -220,8 +199,6 @@ |
864 |
DUMASO=libduma.so.0.0.0 |
865 |
DUMASO_LINK1=libduma.so.0 |
866 |
DUMASO_LINK2=libduma.so |
867 |
- CFLAGS=-g -O0 -Wall -Wextra |
868 |
- CPPFLAGS=-g -O0 -Wall -Wextra |
869 |
LIBS=-lpthread |
870 |
EXEPOSTFIX= |
871 |
endif |
872 |
@@ -234,8 +211,6 @@ |
873 |
DUMASO=libduma.so.0.0.0 |
874 |
DUMASO_LINK1=libduma.so.0 |
875 |
DUMASO_LINK2=libduma.so |
876 |
- CFLAGS=-g -O0 -Wall -Wextra |
877 |
- CPPFLAGS=-g -O0 -Wall -Wextra |
878 |
LIBS=-lpthread |
879 |
EXEPOSTFIX= |
880 |
endif |
881 |
@@ -243,9 +218,6 @@ |
882 |
|
883 |
############################################################ |
884 |
|
885 |
-MAN_INSTALL_DIR=$(prefix)/share/man/man3 |
886 |
-DOC_INSTALL_DIR=$(prefix)/share/doc/duma |
887 |
- |
888 |
ifndef srcdir |
889 |
srcdir=. |
890 |
$(info using default srcdir [$(srcdir)]) |
891 |
@@ -271,6 +243,10 @@ |
892 |
datadir=$(prefix)/share |
893 |
endif |
894 |
|
895 |
+ifndef mandir |
896 |
+ mandir=$(datadir)/man |
897 |
+endif |
898 |
+ |
899 |
# The directory for installing read-only data files that pertain to a single machine--that is to say, files for configuring a host. |
900 |
ifndef sysconfdir |
901 |
sysconfdir=$(prefix)/etc |
902 |
@@ -286,6 +262,9 @@ |
903 |
includedir=$(prefix)/include |
904 |
endif |
905 |
|
906 |
+ifndef docdir |
907 |
+ docdir=$(datadir)/doc/duma |
908 |
+endif |
909 |
|
910 |
PACKAGE_SOURCE=README.txt CHANGELOG COPYING-GPL COPYING-LGPL duma.3 Makefile gdbinit.rc \ |
911 |
duma.h dumapp.h duma_sem.h paging.h print.h duma_hlp.h noduma.h \ |
912 |
@@ -344,6 +323,8 @@ |
913 |
@echo exec_prefix [$(exec_prefix)] |
914 |
@echo bindir [$(bindir)] |
915 |
@echo datadir [$(datadir)] |
916 |
+ @echo mandir [$(mandir)] |
917 |
+ @echo docdir [$(docdir)] |
918 |
@echo sysconfdir [$(sysconfdir)] |
919 |
@echo libdir [$(libdir)] |
920 |
@echo includedir [$(includedir)] |
921 |
@@ -352,12 +333,11 @@ |
922 |
else |
923 |
@echo oldincludedir empty |
924 |
endif |
925 |
- @echo MAN_INSTALL_DIR [$(MAN_INSTALL_DIR)] |
926 |
- @echo DOC_INSTALL_DIR [$(DOC_INSTALL_DIR)] |
927 |
@echo MAKE [$(MAKE)] |
928 |
@echo CC [$(CC)] |
929 |
@echo CFLAGS [$(CFLAGS)] |
930 |
@echo CXX [$(CXX)] |
931 |
+ @echo CXXFLAGS [$(CXXFLAGS)] |
932 |
@echo CPPFLAGS [$(CPPFLAGS)] |
933 |
@echo LD [$(LD)] |
934 |
@echo AR [$(AR)] |
935 |
@@ -368,11 +348,9 @@ |
936 |
@echo RMFORCE [$(RMFORCE)] |
937 |
@echo ECHO [$(ECHO)] |
938 |
@echo ECHOLF [$(ECHOLF)] |
939 |
- @echo PIC [$(PIC)] |
940 |
+ @echo LFLAGS [$(LFLAGS)] |
941 |
@echo EXEPOSTFIX [$(EXEPOSTFIX)] |
942 |
@echo CURPATH [$(CURPATH)] |
943 |
- @echo DUMA_OPTIONS [$(DUMA_OPTIONS)] |
944 |
- @echo DUMA_SO_OPTIONS [$(DUMA_SO_OPTIONS)] |
945 |
@echo OBJECTS [$(OBJECTS)] |
946 |
@echo SO_OBJECTS [$(SO_OBJECTS)] |
947 |
@echo DUMASO [$(DUMASO)] |
948 |
@@ -386,8 +364,8 @@ |
949 |
# commands; copy any auxiliary files that the executable uses into the |
950 |
# directories where it will look for them. |
951 |
install: libduma.a duma.3 $(DUMASO) |
952 |
- - mkdir -p $(DOC_INSTALL_DIR) |
953 |
- $(INSTALL) -m 644 README.txt $(DOC_INSTALL_DIR) |
954 |
+ - mkdir -p $(docdir) |
955 |
+ $(INSTALL) -m 644 README.txt $(docdir) |
956 |
- mkdir -p $(includedir) |
957 |
$(INSTALL) -m 644 noduma.h duma.h dumapp.h duma_sem.h duma_config.h $(includedir) |
958 |
- mkdir -p $(bindir) |
959 |
@@ -405,13 +383,13 @@ |
960 |
- $(RMFORCE) $(libdir)/$(DUMASO_LINK2) |
961 |
ln -s $(DUMASO) $(libdir)/$(DUMASO_LINK2) |
962 |
endif |
963 |
- - mkdir -p $(MAN_INSTALL_DIR) |
964 |
- $(INSTALL) -m 644 duma.3 $(MAN_INSTALL_DIR)/duma.3 |
965 |
+ - mkdir -p $(mandir)/man3 |
966 |
+ $(INSTALL) -m 644 duma.3 $(mandir)/man3/duma.3 |
967 |
|
968 |
|
969 |
# Delete all the installed files that the `install' target would create |
970 |
uninstall: |
971 |
- - $(RMFORCE) $(DOC_INSTALL_DIR)/README.txt |
972 |
+ - $(RMFORCE) $(docdir)/README.txt |
973 |
- $(RMFORCE) $(includedir)/noduma.h |
974 |
- $(RMFORCE) $(includedir)/duma.h |
975 |
- $(RMFORCE) $(includedir)/dumapp.h |
976 |
@@ -428,7 +406,7 @@ |
977 |
ifdef DUMASO_LINK2 |
978 |
- $(RMFORCE) $(libdir)/$(DUMASO_LINK2) |
979 |
endif |
980 |
- - $(RMFORCE) $(MAN_INSTALL_DIR)/duma.3 |
981 |
+ - $(RMFORCE) $(mandir)/man3/duma.3 |
982 |
|
983 |
|
984 |
# Delete all files that are normally created by running make. |
985 |
@@ -471,39 +449,39 @@ |
986 |
|
987 |
createconf$(EXEPOSTFIX): createconf.o |
988 |
- $(RMFORCE) createconf$(EXEPOSTFIX) |
989 |
- $(CC) $(CFLAGS) $(DUMA_OPTIONS) createconf.o -o createconf$(EXEPOSTFIX) |
990 |
+ $(CC) $(LDFLAGS) $(CFLAGS) $(CPPFLAGS) createconf.o -o createconf$(EXEPOSTFIX) |
991 |
|
992 |
tstheap$(EXEPOSTFIX): libduma.a tstheap.o |
993 |
- $(RMFORCE) tstheap$(EXEPOSTFIX) |
994 |
- $(CC) $(CFLAGS) tstheap.o libduma.a -o tstheap$(EXEPOSTFIX) $(LIBS) |
995 |
+ $(CC) $(LDFLAGS) $(CFLAGS) $(CPPFLAGS) tstheap.o libduma.a -o tstheap$(EXEPOSTFIX) $(LIBS) |
996 |
|
997 |
dumatest$(EXEPOSTFIX): libduma.a dumatest.o |
998 |
- $(RMFORCE) dumatest$(EXEPOSTFIX) |
999 |
- $(CC) $(CFLAGS) dumatest.o libduma.a -o dumatest$(EXEPOSTFIX) $(LIBS) |
1000 |
+ $(CC) $(LDFLAGS) $(CFLAGS) $(CPPFLAGS) dumatest.o libduma.a -o dumatest$(EXEPOSTFIX) $(LIBS) |
1001 |
|
1002 |
dumatestpp$(EXEPOSTFIX): libduma.a dumatestpp.o duma_sem.h dumapp.h |
1003 |
- $(RMFORCE) dumatestpp$(EXEPOSTFIX) |
1004 |
- $(CXX) $(CPPFLAGS) dumatestpp.o libduma.a -o dumatestpp$(EXEPOSTFIX) $(LIBS) |
1005 |
+ $(CXX) $(LDFLAGS) $(CXXFLAGS) $(CPPFLAGS) dumatestpp.o libduma.a -o dumatestpp$(EXEPOSTFIX) $(LIBS) |
1006 |
|
1007 |
thread-test$(EXEPOSTFIX): libduma.a thread-test.o |
1008 |
- $(RMFORCE) thread-test$(EXEPOSTFIX) |
1009 |
- $(CC) $(CFLAGS) thread-test.o libduma.a -o thread-test$(EXEPOSTFIX) $(LIBS) |
1010 |
+ $(CC) $(LDFLAGS) $(CFLAGS) $(CPPFLAGS) thread-test.o libduma.a -o thread-test$(EXEPOSTFIX) $(LIBS) |
1011 |
|
1012 |
testmt$(EXEPOSTFIX): libduma.a testmt.o |
1013 |
- $(RMFORCE) testmt$(EXEPOSTFIX) |
1014 |
- $(CC) $(CFLAGS) testmt.o libduma.a -o testmt$(EXEPOSTFIX) $(LIBS) |
1015 |
+ $(CC) $(LDFLAGS) $(CFLAGS) $(CPPFLAGS) testmt.o libduma.a -o testmt$(EXEPOSTFIX) $(LIBS) |
1016 |
|
1017 |
testoperators$(EXEPOSTFIX): libduma.a testoperators.o duma_sem.h dumapp.h |
1018 |
- $(RMFORCE) testoperators$(EXEPOSTFIX) |
1019 |
- $(CXX) $(CPPFLAGS) testoperators.o libduma.a -o testoperators$(EXEPOSTFIX) $(LIBS) |
1020 |
+ $(CXX) $(LDFLAGS) $(CXXFLAGS) $(CPPFLAGS) testoperators.o libduma.a -o testoperators$(EXEPOSTFIX) $(LIBS) |
1021 |
|
1022 |
tstheap_so$(EXEPOSTFIX): tstheap_so.o |
1023 |
- $(RMFORCE) tstheap_so$(EXEPOSTFIX) |
1024 |
- $(CC) $(CFLAGS) tstheap_so.o -o tstheap_so$(EXEPOSTFIX) $(LIBS) |
1025 |
+ $(CC) $(LDFLAGS) $(CFLAGS) $(CPPFLAGS) tstheap_so.o -o tstheap_so$(EXEPOSTFIX) $(LIBS) |
1026 |
|
1027 |
dumatestpp_so$(EXEPOSTFIX): dumatestpp_so.o |
1028 |
- $(RMFORCE) dumatestpp_so$(EXEPOSTFIX) |
1029 |
- $(CXX) $(CPPFLAGS) dumatestpp_so.o -o dumatestpp_so$(EXEPOSTFIX) $(LIBS) |
1030 |
+ $(CXX) $(LDFLAGS) $(CXXFLAGS) $(CPPFLAGS) dumatestpp_so.o -o dumatestpp_so$(EXEPOSTFIX) $(LIBS) |
1031 |
|
1032 |
|
1033 |
$(OBJECTS) tstheap.o dumatest.o thread-test.o testmt.o dumatestpp.o: duma.h |
1034 |
@@ -514,14 +492,14 @@ |
1035 |
ifeq ($(OS), osx) |
1036 |
|
1037 |
$(DUMASO): duma_config.h $(SO_OBJECTS) |
1038 |
- $(CXX) -g -dynamiclib -Wl -o $(DUMASO) $(SO_OBJECTS) -lpthread -lc |
1039 |
- $(CXX) -g -dynamiclib -o $(DUMASO) $(SO_OBJECTS) -lpthread -lc |
1040 |
+ $(CXX) $(LDFLAGS) $(CXXFLAGS) $(CPPFLAGS) -dynamiclib -Wl -o $(DUMASO) $(SO_OBJECTS) -lpthread -lc |
1041 |
+ $(CXX) $(LDFLAGS) $(CXXFLAGS) $(CPPFLAGS) -dynamiclib -o $(DUMASO) $(SO_OBJECTS) -lpthread -lc |
1042 |
|
1043 |
else |
1044 |
|
1045 |
$(DUMASO): duma_config.h $(SO_OBJECTS) |
1046 |
- $(CXX) -g -shared -Wl,-soname,$(DUMASO) -o $(DUMASO) $(SO_OBJECTS) -lpthread -lc |
1047 |
-# $(CXX) -g -shared -o $(DUMASO) $(SO_OBJECTS) -lpthread -lc |
1048 |
+ $(CXX) $(LDFLAGS) $(CXXFLAGS) $(CPPFLAGS) -shared -Wl,-soname,$(DUMASO) -o $(DUMASO) $(SO_OBJECTS) -lpthread -lc |
1049 |
+# $(CXX) $(LDFLAGS) $(CXXFLAGS) $(CPPFLAGS) -shared -o $(DUMASO) $(SO_OBJECTS) -lpthread -lc |
1050 |
|
1051 |
endif |
1052 |
|
1053 |
@@ -532,7 +510,7 @@ |
1054 |
# define rules how to build objects for createconf |
1055 |
# |
1056 |
createconf.o: |
1057 |
- $(CC) $(CFLAGS) $(DUMA_OPTIONS) -c createconf.c -o $@ |
1058 |
+ $(CC) $(LDFLAGS) $(CFLAGS) $(CPPFLAGS) -c createconf.c -o $@ |
1059 |
|
1060 |
|
1061 |
# |
1062 |
@@ -540,39 +518,39 @@ |
1063 |
# |
1064 |
|
1065 |
dumapp_so.o: dumapp.cpp duma.h duma_sem.h dumapp.h |
1066 |
- $(CXX) $(CPPFLAGS) $(DUMA_SO_OPTIONS) -c dumapp.cpp -o $@ |
1067 |
+ $(CXX) $(LDFLAGS) $(CXXFLAGS) $(LFLAGS) -c dumapp.cpp -o $@ |
1068 |
|
1069 |
duma_so.o: duma.c duma.h duma_config.h |
1070 |
- $(CC) $(CFLAGS) $(DUMA_SO_OPTIONS) -c duma.c -o $@ |
1071 |
+ $(CC) $(LDFLAGS) $(CFLAGS) $(LFLAGS) -c duma.c -o $@ |
1072 |
|
1073 |
sem_inc_so.o: sem_inc.c duma_sem.h |
1074 |
- $(CC) $(CFLAGS) $(DUMA_SO_OPTIONS) -c sem_inc.c -o $@ |
1075 |
+ $(CC) $(LDFLAGS) $(CFLAGS) $(LFLAGS) -c sem_inc.c -o $@ |
1076 |
|
1077 |
print_so.o: print.c print.h |
1078 |
- $(CC) $(CFLAGS) $(DUMA_SO_OPTIONS) -c print.c -o $@ |
1079 |
+ $(CC) $(LDFLAGS) $(CFLAGS) $(LFLAGS) -c print.c -o $@ |
1080 |
|
1081 |
-# DUMA_SO_OPTIONS needed cause duma.h is included explicitly |
1082 |
+# LFLAGS needed cause duma.h is included explicitly |
1083 |
tstheap_so.o: |
1084 |
- $(CC) $(CFLAGS) $(DUMA_SO_OPTIONS) -c tstheap.c -o $@ |
1085 |
+ $(CC) $(LDFLAGS) $(CFLAGS) $(LFLAGS) -c tstheap.c -o $@ |
1086 |
|
1087 |
dumatestpp_so.o: |
1088 |
- $(CXX) $(CPPFLAGS) $(DUMA_SO_OPTIONS) -c dumatestpp.cpp -o $@ |
1089 |
+ $(CXX) $(LDFLAGS) $(CXXFLAGS) $(LFLAGS) -c dumatestpp.cpp -o $@ |
1090 |
|
1091 |
# |
1092 |
# define rules how to build objects for static library |
1093 |
# |
1094 |
|
1095 |
dumapp.o: dumapp.cpp duma.h duma_sem.h dumapp.h |
1096 |
- $(CXX) $(CPPFLAGS) -c dumapp.cpp -o $@ |
1097 |
+ $(CXX) $(LDFLAGS) $(CXXFLAGS) $(CPPFLAGS) -c dumapp.cpp -o $@ |
1098 |
|
1099 |
duma.o: duma.c duma.h duma_config.h |
1100 |
- $(CC) $(CFLAGS) -c duma.c -o $@ |
1101 |
+ $(CC) $(LDFLAGS) $(CFLAGS) $(CPPFLAGS) -c duma.c -o $@ |
1102 |
|
1103 |
sem_inc.o: sem_inc.c duma_sem.h |
1104 |
- $(CC) $(CFLAGS) -c sem_inc.c -o $@ |
1105 |
+ $(CC) $(LDFLAGS) $(CFLAGS) $(CPPFLAGS) -c sem_inc.c -o $@ |
1106 |
|
1107 |
print.o: print.c print.h |
1108 |
- $(CC) $(CFLAGS) -c print.c -o $@ |
1109 |
+ $(CC) $(LDFLAGS) $(CFLAGS) $(CPPFLAGS) -c print.c -o $@ |
1110 |
|
1111 |
|
1112 |
# |
1113 |
@@ -580,32 +558,32 @@ |
1114 |
# |
1115 |
|
1116 |
dumatest.o: dumatest.c duma.h duma_config.h |
1117 |
- $(CC) $(CFLAGS) -c dumatest.c -o $@ |
1118 |
+ $(CC) $(LDFLAGS) $(CFLAGS) $(CPPFLAGS) -c dumatest.c -o $@ |
1119 |
|
1120 |
dumatestpp.o: dumatestpp.cpp duma.h duma_sem.h dumapp.h duma_config.h |
1121 |
- $(CXX) $(CPPFLAGS) -c dumatestpp.cpp -o $@ |
1122 |
+ $(CXX) $(LDFLAGS) $(CXXFLAGS) $(CPPFLAGS) -c dumatestpp.cpp -o $@ |
1123 |
|
1124 |
tstheap.o: tstheap.c duma.h duma_config.h |
1125 |
- $(CC) $(CFLAGS) -c tstheap.c -o $@ |
1126 |
+ $(CC) $(LDFLAGS) $(CFLAGS) $(CPPFLAGS) -c tstheap.c -o $@ |
1127 |
|
1128 |
testoperators.o: testoperators.cpp duma.h duma_sem.h dumapp.h duma_config.h |
1129 |
- $(CXX) $(CPPFLAGS) -c testoperators.cpp -o $@ |
1130 |
+ $(CXX) $(LDFLAGS) $(CXXFLAGS) $(CPPFLAGS) -c testoperators.cpp -o $@ |
1131 |
|
1132 |
thread-test.o: thread-test.c duma.h duma_config.h |
1133 |
- $(CC) $(CFLAGS) -c thread-test.c -o $@ |
1134 |
+ $(CC) $(LDFLAGS) $(CFLAGS) $(CPPFLAGS) -c thread-test.c -o $@ |
1135 |
|
1136 |
testmt.o: testmt.c duma.h duma_config.h |
1137 |
- $(CC) $(CFLAGS) -c testmt.c -o $@ |
1138 |
+ $(CC) $(LDFLAGS) $(CFLAGS) $(CPPFLAGS) -c testmt.c -o $@ |
1139 |
|
1140 |
|
1141 |
# |
1142 |
# default rules |
1143 |
# |
1144 |
#.c.o: |
1145 |
-# $(CC) $(CFLAGS) -c $< -o $@ |
1146 |
+# $(CC) $(LDFLAGS) $(CFLAGS) $(CPPFLAGS) -c $< -o $@ |
1147 |
# |
1148 |
#.cpp.o: |
1149 |
-# $(CXX) $(CPPFLAGS) -c $< -o $@ |
1150 |
+# $(CXX) $(LDFLAGS) $(CXXFLAGS) $(CPPFLAGS) -c $< -o $@ |
1151 |
# |
1152 |
|
1153 |
.PHONY: check test installcheck install uninstall clean distclean realclean clobber dos2unix printvars |
1154 |
diff -ur duma_2_5_15.orig/README.txt duma_2_5_15/README.txt |
1155 |
--- duma_2_5_15.orig/README.txt 2009-04-07 01:26:47.000000000 +0300 |
1156 |
+++ duma_2_5_15/README.txt 2009-06-22 05:53:14.000000000 +0300 |
1157 |
@@ -377,7 +377,7 @@ |
1158 |
linenumber of the calling function. The atexit() function checks if each |
1159 |
allocated memory block was freed. To disable leak detection add the |
1160 |
preprocessor definition 'DUMA_SO_NO_LEAKDETECTION' or |
1161 |
-'DUMA_LIB_NO_LEAKDETECTION' to DUMA_OPTIONS in Makefile. |
1162 |
+'DUMA_LIB_NO_LEAKDETECTION' to CPPFLAGS in Makefile. |
1163 |
If a leak is reported without source filename and line number but is |
1164 |
reproducible with the same pointer, set a conditional breakpoint on the |
1165 |
function 'void * duma_alloc_return( void * address)' |
1166 |
@@ -392,7 +392,7 @@ |
1167 |
same leak detection reports as for malloc and free. 'dumapp.h' needs to be |
1168 |
included from your source file(s). |
1169 |
For disabling the C++ new/delete/new[] and delete[] operators, add the |
1170 |
-preprocessor definition 'DUMA_NO_CPP_SUPPORT' to DUMA_OPTIONS in Makefile. |
1171 |
+preprocessor definition 'DUMA_NO_CPP_SUPPORT' to CPPFLAGS in Makefile. |
1172 |
|
1173 |
|
1174 |
DEFINITION OF OWN MEMBER NEW/DELETE OPERATORS: |