]>
Commit | Line | Data |
---|---|---|
3fe5983b AM |
1 | diff -urN fungimol-0.5.1.org/mk/common.mk fungimol-0.5.1/mk/common.mk |
2 | --- fungimol-0.5.1.org/mk/common.mk Fri Mar 7 21:54:18 2003 | |
3 | +++ fungimol-0.5.1/mk/common.mk Fri Mar 7 22:00:16 2003 | |
4 | @@ -68,10 +68,10 @@ | |
5 | PPMLIBPATH:=/usr/lib | |
6 | export PPMLIBPATH | |
7 | PPMLINKOPTS:= | |
8 | -ifneq ($(wildcard $(PPMLIBPATH)/libppm.a),) | |
9 | +ifneq ($(wildcard $(PPMLIBPATH)/libppm.so),) | |
10 | PPMLINKOPTS += -lppm | |
11 | else | |
12 | - ifneq ($(wildcard $(PPMLIBPATH)/libnetppm.a),) | |
13 | + ifneq ($(wildcard $(PPMLIBPATH)/libnetppm.so),) | |
14 | PPMLINKOPTS += -lnetppm | |
15 | else | |
16 | -include stopNOPPM | |
17 | @@ -81,10 +81,10 @@ | |
18 | @exit 1 | |
19 | endif | |
20 | endif | |
21 | -ifneq ($(wildcard $(PPMLIBPATH)/libpgm.a),) | |
22 | +ifneq ($(wildcard $(PPMLIBPATH)/libpgm.so),) | |
23 | PPMLINKOPTS += -lpgm | |
24 | else | |
25 | - ifneq ($(wildcard $(PPMLIBPATH)/libnetpgm.a),) | |
26 | + ifneq ($(wildcard $(PPMLIBPATH)/libnetpgm.so),) | |
27 | PPMLINKOPTS += -lnetpgm | |
28 | else | |
29 | -include stopNOPGM | |
30 | @@ -94,10 +94,10 @@ | |
31 | @exit 1 | |
32 | endif | |
33 | endif | |
34 | -ifneq ($(wildcard $(PPMLIBPATH)/libpbm.a),) | |
35 | +ifneq ($(wildcard $(PPMLIBPATH)/libpbm.so),) | |
36 | PPMLINKOPTS += -lpbm | |
37 | else | |
38 | - ifneq ($(wildcard $(PPMLIBPATH)/libnetpbm.a),) | |
39 | + ifneq ($(wildcard $(PPMLIBPATH)/libnetpbm.so),) | |
40 | PPMLINKOPTS += -lnetpbm | |
41 | else | |
42 | -include stopNOPBM | |
43 | @@ -113,7 +113,7 @@ | |
44 | # Dynamic linking is better for debugging because the link ought to be faster. | |
45 | # Except it's broken right now with the new gcc. | |
46 | ifdef NDEBUG | |
47 | - LINKOPTS += -Xlinker -Bstatic | |
48 | + LINKOPTS += -Xlinker | |
49 | endif | |
50 | LINKOPTS += -lXext -lX11 -lm $(PPMLINKOPTS) | |
51 | ifdef NDEBUG |