1 |
jlec 10/10/31 09:15:41 |
2 |
|
3 |
Added: 2.8-impl-decng.patch 2.8-prllng.patch |
4 |
Log: |
5 |
More parallel fixes and impl dec QA |
6 |
|
7 |
(Portage version: 2.2.0_alpha2/cvs/Linux x86_64) |
8 |
|
9 |
Revision Changes Path |
10 |
1.1 sci-chemistry/azara/files/2.8-impl-decng.patch |
11 |
|
12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-chemistry/azara/files/2.8-impl-decng.patch?rev=1.1&view=markup |
13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-chemistry/azara/files/2.8-impl-decng.patch?rev=1.1&content-type=text/plain |
14 |
|
15 |
Index: 2.8-impl-decng.patch |
16 |
=================================================================== |
17 |
diff --git a/connect/crosspeak.c b/connect/crosspeak.c |
18 |
index 0de57bf..7b016e1 100644 |
19 |
--- a/connect/crosspeak.c |
20 |
+++ b/connect/crosspeak.c |
21 |
@@ -1,4 +1,5 @@ |
22 |
#include "crosspeak.h" |
23 |
+#include "utility.h" |
24 |
|
25 |
#include "atom.h" |
26 |
#include "table.h" |
27 |
diff --git a/connect/shift.c b/connect/shift.c |
28 |
index f54ba9f..a880001 100644 |
29 |
--- a/connect/shift.c |
30 |
+++ b/connect/shift.c |
31 |
@@ -1,4 +1,5 @@ |
32 |
#include "shift.h" |
33 |
+#include "utility.h" |
34 |
|
35 |
#include "atom.h" |
36 |
#include "table.h" |
37 |
diff --git a/global/macros.h b/global/macros.h |
38 |
index 43fc43e..bb1d267 100644 |
39 |
--- a/global/macros.h |
40 |
+++ b/global/macros.h |
41 |
@@ -8,6 +8,7 @@ |
42 |
#include <math.h> |
43 |
#include <string.h> |
44 |
#include <stdlib.h> |
45 |
+#include <ctype.h> |
46 |
|
47 |
#ifdef WIN32 |
48 |
#include <ctype.h> |
49 |
diff --git a/global/parser.c b/global/parser.c |
50 |
index 007d926..0f19575 100644 |
51 |
--- a/global/parser.c |
52 |
+++ b/global/parser.c |
53 |
@@ -1,4 +1,5 @@ |
54 |
#include "parser.h" |
55 |
+#include "utility.h" |
56 |
|
57 |
#define MAX_NARGS 20 |
58 |
|
59 |
diff --git a/peak/fitter.c b/peak/fitter.c |
60 |
index ba6b175..b58f573 100644 |
61 |
--- a/peak/fitter.c |
62 |
+++ b/peak/fitter.c |
63 |
@@ -1,4 +1,5 @@ |
64 |
#include "fitter.h" |
65 |
+#include "data.h" |
66 |
|
67 |
#include "nonlinear_model.h" |
68 |
|
69 |
diff --git a/peak/peak_fit.c b/peak/peak_fit.c |
70 |
index 92c69a8..5b9791f 100644 |
71 |
--- a/peak/peak_fit.c |
72 |
+++ b/peak/peak_fit.c |
73 |
@@ -6,6 +6,7 @@ |
74 |
#include "output.h" |
75 |
#include "ref.h" |
76 |
#include "script_fit.h" |
77 |
+#include "fitter.h" |
78 |
|
79 |
#define MEGAWORD (1024 * 1024) |
80 |
#define DEFAULT_STORE (2 * MEGAWORD) |
81 |
diff --git a/plot1/draw.c b/plot1/draw.c |
82 |
index 4fdce96..a2a2e8a 100644 |
83 |
--- a/plot1/draw.c |
84 |
+++ b/plot1/draw.c |
85 |
@@ -1,4 +1,5 @@ |
86 |
#include "draw.h" |
87 |
+#include "ticks.h" |
88 |
|
89 |
#include "color.h" |
90 |
#include "data.h" |
91 |
diff --git a/plot1/object.c b/plot1/object.c |
92 |
index 973897c..e043a53 100644 |
93 |
--- a/plot1/object.c |
94 |
+++ b/plot1/object.c |
95 |
@@ -1,4 +1,5 @@ |
96 |
#include "object.h" |
97 |
+#include "script.h" |
98 |
|
99 |
#include "color.h" |
100 |
#include "parser.h" |
101 |
diff --git a/plot1/output_popup.c b/plot1/output_popup.c |
102 |
index 0794584..e73976e 100644 |
103 |
--- a/plot1/output_popup.c |
104 |
+++ b/plot1/output_popup.c |
105 |
@@ -1,4 +1,5 @@ |
106 |
#include "output_popup.h" |
107 |
+#include "script.h" |
108 |
|
109 |
#include "output.hlp" |
110 |
|
111 |
diff --git a/plot1/plots.c b/plot1/plots.c |
112 |
index 3790f5b..7ac58df 100644 |
113 |
--- a/plot1/plots.c |
114 |
+++ b/plot1/plots.c |
115 |
@@ -1,4 +1,5 @@ |
116 |
#include "plots.h" |
117 |
+#include "script.h" |
118 |
|
119 |
#include "data.h" |
120 |
#include "input.h" |
121 |
diff --git a/plot1/region_popup.c b/plot1/region_popup.c |
122 |
index 68b3930..f049d29 100644 |
123 |
--- a/plot1/region_popup.c |
124 |
+++ b/plot1/region_popup.c |
125 |
@@ -1,4 +1,5 @@ |
126 |
#include "region_popup.h" |
127 |
+#include "data.h" |
128 |
|
129 |
#include "region.hlp" |
130 |
|
131 |
diff --git a/plot2/data_popup.c b/plot2/data_popup.c |
132 |
index 851b1d4..1c9026e 100644 |
133 |
--- a/plot2/data_popup.c |
134 |
+++ b/plot2/data_popup.c |
135 |
@@ -1,4 +1,5 @@ |
136 |
#include "data_popup.h" |
137 |
+#include "rowcol_popup.h" |
138 |
|
139 |
#include "data.hlp" |
140 |
|
141 |
diff --git a/plot2/extract_popup.c b/plot2/extract_popup.c |
142 |
index 416aab0..a7fcbf3 100644 |
143 |
--- a/plot2/extract_popup.c |
144 |
+++ b/plot2/extract_popup.c |
145 |
@@ -1,4 +1,5 @@ |
146 |
#include "extract_popup.h" |
147 |
+#include "script.h" |
148 |
|
149 |
#include "extract.hlp" |
150 |
|
151 |
diff --git a/plot2/levels_popup.c b/plot2/levels_popup.c |
152 |
index 197cf2c..e1ac22c 100644 |
153 |
--- a/plot2/levels_popup.c |
154 |
+++ b/plot2/levels_popup.c |
155 |
@@ -1,4 +1,5 @@ |
156 |
#include "levels_popup.h" |
157 |
+#include "levels_func.h" |
158 |
|
159 |
#include "levels.hlp" |
160 |
|
161 |
diff --git a/plot2/plot2.c b/plot2/plot2.c |
162 |
index 9ca91c3..0c10d5a 100644 |
163 |
--- a/plot2/plot2.c |
164 |
+++ b/plot2/plot2.c |
165 |
@@ -1,4 +1,6 @@ |
166 |
#include "plot2.h" |
167 |
+#include "object_popup.h" |
168 |
+#include "prop_popup.h" |
169 |
|
170 |
#include "baseline_popup.h" |
171 |
#include "callback.h" |
172 |
diff --git a/plot2/rowcol_popup.c b/plot2/rowcol_popup.c |
173 |
index e9f4843..6c50426 100644 |
174 |
--- a/plot2/rowcol_popup.c |
175 |
+++ b/plot2/rowcol_popup.c |
176 |
@@ -1,4 +1,5 @@ |
177 |
#include "rowcol_popup.h" |
178 |
+#include "ref_popup.h" |
179 |
|
180 |
#include "rowcol.hlp" |
181 |
|
182 |
diff --git a/plot2/script.c b/plot2/script.c |
183 |
index 2f55182..d7d886f 100644 |
184 |
--- a/plot2/script.c |
185 |
+++ b/plot2/script.c |
186 |
@@ -1,4 +1,5 @@ |
187 |
#include "script.h" |
188 |
+#include "macros.h" |
189 |
|
190 |
#include "param.h" |
191 |
#include "stack.h" |
192 |
diff --git a/plot2/slice_popup.c b/plot2/slice_popup.c |
193 |
index b601834..1b1e686 100644 |
194 |
--- a/plot2/slice_popup.c |
195 |
+++ b/plot2/slice_popup.c |
196 |
@@ -1,4 +1,5 @@ |
197 |
#include "slice_popup.h" |
198 |
+#include "rowcol_func.h" |
199 |
|
200 |
#include "baseline.h" |
201 |
#include "baseline_popup.h" |
202 |
diff --git a/process/files.c b/process/files.c |
203 |
index e09127e..d95d681 100644 |
204 |
--- a/process/files.c |
205 |
+++ b/process/files.c |
206 |
@@ -1,4 +1,5 @@ |
207 |
#include "files.h" |
208 |
+#include "macros.h" |
209 |
|
210 |
#include <sys/types.h> |
211 |
#include <sys/stat.h> |
212 |
diff --git a/project/project.c b/project/project.c |
213 |
index 92b70e3..a3e6d94 100644 |
214 |
--- a/project/project.c |
215 |
+++ b/project/project.c |
216 |
@@ -1,4 +1,5 @@ |
217 |
#include "project.h" |
218 |
+#include "utility.h" |
219 |
|
220 |
#include "block.h" |
221 |
#include "par.h" |
222 |
|
223 |
|
224 |
|
225 |
1.1 sci-chemistry/azara/files/2.8-prllng.patch |
226 |
|
227 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-chemistry/azara/files/2.8-prllng.patch?rev=1.1&view=markup |
228 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-chemistry/azara/files/2.8-prllng.patch?rev=1.1&content-type=text/plain |
229 |
|
230 |
Index: 2.8-prllng.patch |
231 |
=================================================================== |
232 |
diff --git a/DataRows/makefile b/DataRows/makefile |
233 |
index 587e710..4e0a312 100644 |
234 |
--- a/DataRows/makefile |
235 |
+++ b/DataRows/makefile |
236 |
@@ -28,7 +28,7 @@ GLOBAL_OBJS = \ |
237 |
$(GLOBAL_DIR)/ref.o \ |
238 |
$(GLOBAL_DIR)/utility.o |
239 |
|
240 |
-DataRows.so: locals globals |
241 |
+DataRows.so: $(LOCAL_OBJS) $(GLOBAL_OBJS) |
242 |
$(CC) $(SHARED_FLAGS) -o $@ $(CFLAGS) $(LFLAGS) \ |
243 |
$(LOCAL_OBJS) \ |
244 |
$(GLOBAL_OBJS) |
245 |
diff --git a/azara/makefile b/azara/makefile |
246 |
index 3ba0cd9..f7b4ce5 100644 |
247 |
--- a/azara/makefile |
248 |
+++ b/azara/makefile |
249 |
@@ -12,7 +12,7 @@ LOCAL_OBJS = \ |
250 |
GLOBAL_OBJS = \ |
251 |
$(GLOBAL_DIR)/help.o |
252 |
|
253 |
-azara: locals globals |
254 |
+azara: $(LOCAL_OBJS) $(GLOBAL_OBJS) |
255 |
$(CC) -o $@ $(LFLAGS) \ |
256 |
$(LOCAL_OBJS) \ |
257 |
$(GLOBAL_OBJS) \ |
258 |
diff --git a/combine/makefile b/combine/makefile |
259 |
index a855236..7a83d8f 100644 |
260 |
--- a/combine/makefile |
261 |
+++ b/combine/makefile |
262 |
@@ -20,7 +20,7 @@ GLOBAL_OBJS = \ |
263 |
$(GLOBAL_DIR)/ref.o \ |
264 |
$(GLOBAL_DIR)/utility.o |
265 |
|
266 |
-combine: locals globals |
267 |
+combine: $(LOCAL_OBJS) $(GLOBAL_OBJS) |
268 |
$(CC) -o $@ $(LFLAGS) \ |
269 |
$(LOCAL_OBJS) \ |
270 |
$(GLOBAL_OBJS) \ |
271 |
diff --git a/connect/makefile b/connect/makefile |
272 |
index d75e7da..d238507 100644 |
273 |
--- a/connect/makefile |
274 |
+++ b/connect/makefile |
275 |
@@ -23,7 +23,7 @@ GLOBAL_OBJS = \ |
276 |
$(GLOBAL_DIR)/ref.o \ |
277 |
$(GLOBAL_DIR)/utility.o |
278 |
|
279 |
-connect: locals globals |
280 |
+connect: $(LOCAL_OBJS) $(GLOBAL_OBJS) |
281 |
$(CC) -o $@ $(LFLAGS) \ |
282 |
$(LOCAL_OBJS) \ |
283 |
$(GLOBAL_OBJS) \ |
284 |
diff --git a/contours/makefile b/contours/makefile |
285 |
index 5b832b8..49175dd 100644 |
286 |
--- a/contours/makefile |
287 |
+++ b/contours/makefile |
288 |
@@ -19,7 +19,7 @@ GLOBAL_OBJS = \ |
289 |
$(GLOBAL_DIR)/ref.o \ |
290 |
$(GLOBAL_DIR)/utility.o |
291 |
|
292 |
-contours: locals globals |
293 |
+contours: $(LOCAL_OBJS) $(GLOBAL_OBJS) |
294 |
$(CC) -o $@ $(LFLAGS) \ |
295 |
$(LOCAL_OBJS) \ |
296 |
$(GLOBAL_OBJS) \ |
297 |
diff --git a/deflate/makefile b/deflate/makefile |
298 |
index 4c4e02e..42d5c30 100644 |
299 |
--- a/deflate/makefile |
300 |
+++ b/deflate/makefile |
301 |
@@ -18,7 +18,7 @@ GLOBAL_OBJS = \ |
302 |
$(GLOBAL_DIR)/ref.o \ |
303 |
$(GLOBAL_DIR)/utility.o |
304 |
|
305 |
-deflate: locals globals |
306 |
+deflate: $(LOCAL_OBJS) $(GLOBAL_OBJS) |
307 |
$(CC) -o $@ $(LFLAGS) \ |
308 |
$(LOCAL_OBJS) \ |
309 |
$(GLOBAL_OBJS) \ |
310 |
diff --git a/extract/makefile b/extract/makefile |
311 |
index 3212cb9..fed874b 100644 |
312 |
--- a/extract/makefile |
313 |
+++ b/extract/makefile |
314 |
@@ -18,7 +18,7 @@ GLOBAL_OBJS = \ |
315 |
$(GLOBAL_DIR)/ref.o \ |
316 |
$(GLOBAL_DIR)/utility.o |
317 |
|
318 |
-extract: locals globals |
319 |
+extract: $(LOCAL_OBJS) $(GLOBAL_OBJS) |
320 |
$(CC) -o $@ $(LFLAGS) \ |
321 |
$(LOCAL_OBJS) \ |
322 |
$(GLOBAL_OBJS) \ |
323 |
diff --git a/global/makefile b/global/makefile |
324 |
index 364fa41..5272a31 100644 |
325 |
--- a/global/makefile |
326 |
+++ b/global/makefile |
327 |
@@ -42,6 +42,31 @@ LINPACK_OBJS = \ |
328 |
AZARA_OBJS = \ |
329 |
help.o |
330 |
|
331 |
+all: \ |
332 |
+ azara_objects \ |
333 |
+ decay_objects \ |
334 |
+ simulate_objects \ |
335 |
+ viewer_objects \ |
336 |
+ components_objects \ |
337 |
+ shuffle_objects \ |
338 |
+ connect_objects \ |
339 |
+ slides_objects \ |
340 |
+ peak_find_objects \ |
341 |
+ peak_fit_objects \ |
342 |
+ plot1_objects \ |
343 |
+ reflate_objects \ |
344 |
+ deflate_objects \ |
345 |
+ combine_objects \ |
346 |
+ unblock_objects \ |
347 |
+ extract_objects \ |
348 |
+ project_objects \ |
349 |
+ contours_objects \ |
350 |
+ plot2_nog_objects \ |
351 |
+ plot2_objects \ |
352 |
+ process_objects \ |
353 |
+ python_objects \ |
354 |
+ integrate_objects |
355 |
+ |
356 |
azara_objects: $(AZARA_OBJS) |
357 |
|
358 |
DECAY_OBJS = \ |
359 |
diff --git a/help/makefile b/help/makefile |
360 |
index 9e99a7c..59a86a3 100644 |
361 |
--- a/help/makefile |
362 |
+++ b/help/makefile |
363 |
@@ -39,7 +39,7 @@ globals: |
364 |
|
365 |
.c.o:; $(CC) -c $(CFLAGS) $< |
366 |
|
367 |
-hlp: |
368 |
+hlp: txt2hlp |
369 |
$(TXT2HLP) azara |
370 |
$(TXT2HLP) combine |
371 |
$(TXT2HLP) connect |
372 |
@@ -78,7 +78,7 @@ hlp: |
373 |
$(TXT2HLP) plot1/text |
374 |
$(TXT2HLP) DataRows |
375 |
|
376 |
-html: |
377 |
+html: txt2html |
378 |
$(TXT2HTML) azara |
379 |
$(TXT2HTML) combine |
380 |
$(TXT2HTML) connect |
381 |
diff --git a/makefile b/makefile |
382 |
index 9965b07..6f3bdd0 100644 |
383 |
--- a/makefile |
384 |
+++ b/makefile |
385 |
@@ -14,7 +14,7 @@ all: help nongui DataRows gui |
386 |
help: \ |
387 |
help_program |
388 |
|
389 |
-nongui: \ |
390 |
+nongui: help \ |
391 |
process_program \ |
392 |
plot2_nog_program \ |
393 |
peak_program \ |
394 |
@@ -29,63 +29,63 @@ nongui: \ |
395 |
connect_program \ |
396 |
azara_program |
397 |
|
398 |
-gui: \ |
399 |
+gui: help \ |
400 |
plot2_program \ |
401 |
plot1_program |
402 |
|
403 |
-DataRows: \ |
404 |
+DataRows: help \ |
405 |
DataRows |
406 |
|
407 |
process_program: |
408 |
- cd process; $(MAKE) |
409 |
+ $(MAKE) -C process |
410 |
|
411 |
plot2_program: |
412 |
- cd plot2; $(MAKE) plot2 |
413 |
+ $(MAKE) -C plot2 |
414 |
|
415 |
plot2_nog_program: |
416 |
- cd plot2; $(MAKE) plot2_nog |
417 |
+ $(MAKE) -C plot2 plot2_nog |
418 |
|
419 |
plot1_program: |
420 |
- cd plot1; $(MAKE) |
421 |
+ $(MAKE) -C plot1 |
422 |
|
423 |
peak_program: |
424 |
- cd peak; $(MAKE) |
425 |
+ $(MAKE) -C peak |
426 |
|
427 |
extract_program: |
428 |
- cd extract; $(MAKE) |
429 |
+ $(MAKE) -C extract |
430 |
|
431 |
project_program: |
432 |
- cd project; $(MAKE) |
433 |
+ $(MAKE) -C project |
434 |
|
435 |
unblock_program: |
436 |
- cd unblock; $(MAKE) |
437 |
+ $(MAKE) -C unblock |
438 |
|
439 |
contours_program: |
440 |
- cd contours; $(MAKE) |
441 |
+ $(MAKE) -C contours |
442 |
|
443 |
combine_program: |
444 |
- cd combine; $(MAKE) |
445 |
+ $(MAKE) -C combine |
446 |
|
447 |
deflate_program: |
448 |
- cd deflate; $(MAKE) |
449 |
+ $(MAKE) -C deflate |
450 |
|
451 |
reflate_program: |
452 |
- cd reflate; $(MAKE) |
453 |
+ $(MAKE) -C reflate |
454 |
|
455 |
utility_program: |
456 |
- cd utility; $(MAKE) |
457 |
+ $(MAKE) -C utility |
458 |
|
459 |
connect_program: |
460 |
- cd connect; $(MAKE) |
461 |
+ $(MAKE) -C connect |
462 |
|
463 |
help_program: |
464 |
- cd help; $(MAKE) |
465 |
+ $(MAKE) -C help |
466 |
|
467 |
azara_program: |
468 |
- cd azara; $(MAKE) |
469 |
+ $(MAKE) -C azara |
470 |
|
471 |
DataRows: |
472 |
- cd DataRows; $(MAKE) |
473 |
+ $(MAKE) -C DataRows |
474 |
|
475 |
clean: \ |
476 |
global_clean \ |
477 |
diff --git a/peak/makefile b/peak/makefile |
478 |
index f3c13b7..4211221 100644 |
479 |
--- a/peak/makefile |
480 |
+++ b/peak/makefile |
481 |
@@ -97,13 +97,13 @@ COMMAND_OBJS = \ |
482 |
|
483 |
all: peak_find peak_fit |
484 |
|
485 |
-peak_find: local_find global_find |
486 |
+peak_find: $(LOCAL_FIND_OBJS) $(GLOBAL_FIND_OBJS) |
487 |
$(CC) -o $@ $(LFLAGS) \ |
488 |
$(LOCAL_FIND_OBJS) \ |
489 |
$(GLOBAL_FIND_OBJS) \ |
490 |
$(LIB) $(MATH_LIB) |
491 |
|
492 |
-peak_fit: local_fit global_fit commands |
493 |
+peak_fit: $(LOCAL_FIT_OBJS) $(GLOBAL_FIT_OBJS) $(COMMAND_OBJS) |
494 |
$(CC) -o $@ $(LFLAGS) \ |
495 |
$(LOCAL_FIT_OBJS) \ |
496 |
$(GLOBAL_FIT_OBJS) \ |
497 |
diff --git a/plot1/makefile b/plot1/makefile |
498 |
index d1dce2d..e729443 100644 |
499 |
--- a/plot1/makefile |
500 |
+++ b/plot1/makefile |
501 |
@@ -95,7 +95,7 @@ GLOBAL_OBJS = \ |
502 |
$(GLOBAL_DIR)/utility.o \ |
503 |
$(GLOBAL_DIR)/window.o |
504 |
|
505 |
-plot1: locals globals |
506 |
+plot1: $(LOCAL_OBJS) $(GLOBAL_OBJS) |
507 |
$(CC) -o $@ $(LFLAGS) \ |
508 |
$(LOCAL_OBJS) \ |
509 |
$(GLOBAL_OBJS) \ |
510 |
@@ -110,7 +110,7 @@ locals: |
511 |
globals: |
512 |
cd $(GLOBAL_DIR); $(MAKE) plot1_objects |
513 |
|
514 |
-.c.o:; $(CC) $(X11_INCLUDE_DIR) $(MOTIF_INCLUDE_DIR) -c $(CFLAGS) $< |
515 |
+.c.o:; $(CC) $(X11_INCLUDE_DIR) $(MOTIF_INCLUDE_DIR) -c $(CFLAGS) -I../plot2 $< |
516 |
|
517 |
clean: |
518 |
rm -f *.o |
519 |
diff --git a/plot2/makefile b/plot2/makefile |
520 |
index a6b7b4a..98e286e 100644 |
521 |
--- a/plot2/makefile |
522 |
+++ b/plot2/makefile |
523 |
@@ -129,7 +129,7 @@ GLOBAL_PLOT2_NOG_OBJS = \ |
524 |
|
525 |
all: plot2 plot2_nog |
526 |
|
527 |
-plot2: local_plot2 global_plot2 |
528 |
+plot2: $(LOCAL_PLOT2_OBJS) $(GLOBAL_PLOT2_OBJS) |
529 |
$(CC) -o $@ $(CFLAGS) $(LFLAGS) \ |
530 |
$(LOCAL_PLOT2_OBJS) \ |
531 |
$(GLOBAL_PLOT2_OBJS) \ |
532 |
@@ -137,7 +137,7 @@ plot2: local_plot2 global_plot2 |
533 |
$(LIB) $(MATH_LIB) \ |
534 |
$(MOTIF_LIB) $(X11_LIB) $(XPM_LIB) |
535 |
|
536 |
-plot2_nog: local_plot2_nog global_plot2_nog |
537 |
+plot2_nog: $(LOCAL_PLOT2_NOG_OBJS) $(GLOBAL_PLOT2_NOG_OBJS) |
538 |
$(CC) -o $@ $(CFLAGS) $(LFLAGS) \ |
539 |
$(LOCAL_PLOT2_NOG_OBJS) \ |
540 |
$(GLOBAL_PLOT2_NOG_OBJS) \ |
541 |
diff --git a/process/makefile b/process/makefile |
542 |
index 22ceeed..72d587b 100644 |
543 |
--- a/process/makefile |
544 |
+++ b/process/makefile |
545 |
@@ -72,7 +72,7 @@ GLOBAL_OBJS = \ |
546 |
$(GLOBAL_DIR)/utility.o \ |
547 |
$(LINPACK_OBJS) |
548 |
|
549 |
-process: locals globals |
550 |
+process: $(LOCAL_OBJS) $(GLOBAL_OBJS) |
551 |
$(CC) -o $@ $(LFLAGS) \ |
552 |
$(LOCAL_OBJS) \ |
553 |
$(GLOBAL_OBJS) \ |
554 |
diff --git a/project/makefile b/project/makefile |
555 |
index 78143fc..ed0f296 100644 |
556 |
--- a/project/makefile |
557 |
+++ b/project/makefile |
558 |
@@ -18,7 +18,7 @@ GLOBAL_OBJS = \ |
559 |
$(GLOBAL_DIR)/ref.o \ |
560 |
$(GLOBAL_DIR)/utility.o |
561 |
|
562 |
-project: locals globals |
563 |
+project: $(LOCAL_OBJS) $(GLOBAL_OBJS) |
564 |
$(CC) -o $@ $(LFLAGS) \ |
565 |
$(LOCAL_OBJS) \ |
566 |
$(GLOBAL_OBJS) \ |
567 |
diff --git a/reflate/makefile b/reflate/makefile |
568 |
index 079a3fc..01ec311 100644 |
569 |
--- a/reflate/makefile |
570 |
+++ b/reflate/makefile |
571 |
@@ -18,7 +18,7 @@ GLOBAL_OBJS = \ |
572 |
$(GLOBAL_DIR)/ref.o \ |
573 |
$(GLOBAL_DIR)/utility.o |
574 |
|
575 |
-reflate: locals globals |
576 |
+reflate: $(LOCAL_OBJS) $(GLOBAL_OBJS) |
577 |
$(CC) -o $@ $(LFLAGS) \ |
578 |
$(LOCAL_OBJS) \ |
579 |
$(GLOBAL_OBJS) \ |
580 |
diff --git a/unblock/makefile b/unblock/makefile |
581 |
index 510dc9e..d9a0f2b 100644 |
582 |
--- a/unblock/makefile |
583 |
+++ b/unblock/makefile |
584 |
@@ -18,7 +18,7 @@ GLOBAL_OBJS = \ |
585 |
$(GLOBAL_DIR)/ref.o \ |
586 |
$(GLOBAL_DIR)/utility.o |
587 |
|
588 |
-unblock: locals globals |
589 |
+unblock: $(LOCAL_OBJS) $(GLOBAL_OBJS) |
590 |
$(CC) -o $@ $(LFLAGS) \ |
591 |
$(LOCAL_OBJS) \ |
592 |
$(GLOBAL_OBJS) \ |