1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
|
--- fltk-1.1.7/configure.in.old 2006-11-12 14:30:49.000000000 +0100
+++ fltk-1.1.7/configure.in 2006-11-12 14:31:58.000000000 +0100
@@ -171,7 +171,7 @@
FLDSONAME="libfltk_forms.so.$FL_API_VERSION"
GLDSONAME="libfltk_gl.so.$FL_API_VERSION"
IMGDSONAME="libfltk_images.so.$FL_API_VERSION"
- DSOCOMMAND="\$(CXX) -Wl,-soname,\$@ \$(LDLIBS) -shared -fPIC $DEBUGFLAG -o"
+ DSOCOMMAND="\$(CXX) \$(LDFLAGS) -Wl,-soname,\$@ -shared -fPIC $DEBUGFLAG -o"
if test "x$libdir" != "x/usr/lib"; then
DSOLINK="-Wl,-rpath,$libdir"
fi
@@ -647,10 +647,9 @@
AC_MSG_WARN(Ignoring libraries \"$X_PRE_LIBS\" requested by configure.)
fi
- LIBS="$LIBS -lXext -lX11 $X_EXTRA_LIBS"
+ LIBS="$LIBS -lXext -lX11 $X_EXTRA_LIBS $X_LIBS"
CFLAGS="$CFLAGS $X_CFLAGS"
CXXFLAGS="$CXXFLAGS $X_CFLAGS"
- LDFLAGS="$X_LIBS $LDFLAGS"
if test "x$x_includes" != x; then
ac_cpp="$ac_cpp -I$x_includes"
--- fltk-1.1.7/makeinclude.in.old 2006-11-12 14:31:05.000000000 +0100
+++ fltk-1.1.7/makeinclude.in 2006-11-12 14:31:20.000000000 +0100
@@ -74,8 +74,9 @@
# libraries to link with:
AUDIOLIBS = @AUDIOLIBS@
-LDLIBS = @LDFLAGS@ @LIBS@
-GLDLIBS = @LDFLAGS@ @GLLIB@ @LIBS@
+LDFLAGS = @LDFLAGS@
+LDLIBS = @LIBS@
+GLDLIBS = @GLLIB@ @LIBS@
LINKFLTK = @LINKFLTK@
LINKFLTKGL = @LINKFLTKGL@
LINKFLTKFORMS = @LINKFLTKFORMS@ @LINKFLTK@
--- fltk-1.1.7/src/Makefile.old 2006-11-12 15:30:11.000000000 +0100
+++ fltk-1.1.7/src/Makefile 2006-11-12 15:33:56.000000000 +0100
@@ -202,13 +202,13 @@
libfltk.so.1.1: $(OBJECTS)
echo $(DSOCOMMAND) $@ ...
- $(DSOCOMMAND) $@ $(OBJECTS)
+ $(DSOCOMMAND) $@ $(OBJECTS) $(LDLIBS)
$(RM) libfltk.so
$(LN) libfltk.so.1.1 libfltk.so
libfltk.sl.1.1: $(OBJECTS)
echo $(DSOCOMMAND) $@ ...
- $(DSOCOMMAND) $@ $(OBJECTS)
+ $(DSOCOMMAND) $@ $(OBJECTS) $(LDLIBS)
$(RM) libfltk.sl
$(LN) libfltk.sl.1.1 libfltk.sl
@@ -224,7 +224,7 @@
libfltk_s.a: $(OBJECTS)
echo $(DSOCOMMAND) libfltk_s.o ...
- $(DSOCOMMAND) libfltk_s.o $(OBJECTS) $(IMAGELIBS)
+ $(DSOCOMMAND) libfltk_s.o $(OBJECTS) $(IMAGELIBS) $(LDLIBS)
echo $(LIBCOMMAND) libfltk_s.a libfltk_s.o
$(RM) $@
$(LIBCOMMAND) libfltk_s.a libfltk_s.o
@@ -238,13 +238,13 @@
libfltk_forms.so.1.1: $(FLOBJECTS) libfltk.so.1.1
echo $(DSOCOMMAND) $@ ...
- $(DSOCOMMAND) $@ $(FLOBJECTS) -L. -lfltk
+ $(DSOCOMMAND) $@ $(FLOBJECTS) $(LDLIBS) -L. -lfltk
$(RM) libfltk_forms.so
$(LN) libfltk_forms.so.1.1 libfltk_forms.so
libfltk_forms.sl.1.1: $(FLOBJECTS) libfltk.sl.1.1
echo $(DSOCOMMAND) $@ ...
- $(DSOCOMMAND) $@ $(FLOBJECTS) -L. -lfltk
+ $(DSOCOMMAND) $@ $(FLOBJECTS) $(LDLIBS) -L. -lfltk
$(RM) libfltk_forms.sl
$(LN) libfltk_forms.sl.1.1 libfltk_forms.sl
@@ -260,7 +260,7 @@
libfltk_forms_s.a: $(FLOBJECTS)
echo $(DSOCOMMAND) libfltk_forms_s.o ...
- $(DSOCOMMAND) libfltk_forms_s.o $(FLOBJECTS)
+ $(DSOCOMMAND) libfltk_forms_s.o $(FLOBJECTS) $(LDLIBS)
echo $(LIBCOMMAND) libfltk_forms_s.a libfltk_forms_s.o
$(RM) $@
$(LIBCOMMAND) libfltk_forms_s.a libfltk_forms_s.o
@@ -274,13 +274,13 @@
libfltk_gl.so.1.1: $(GLOBJECTS) libfltk.so.1.1
echo $(DSOCOMMAND) $@ ...
- $(DSOCOMMAND) $@ $(GLOBJECTS) -L. -lfltk
+ $(DSOCOMMAND) $@ $(GLOBJECTS) $(LDLIBS) -L. -lfltk
$(RM) libfltk_gl.so
$(LN) libfltk_gl.so.1.1 libfltk_gl.so
libfltk_gl.sl.1.1: $(GLOBJECTS) libfltk.sl.1.1
echo $(DSOCOMMAND) $@ ...
- $(DSOCOMMAND) $@ $(GLOBJECTS) -L. -lfltk
+ $(DSOCOMMAND) $@ $(GLOBJECTS) $(LDLIBS) -L. -lfltk
$(RM) libfltk_gl.sl
$(LN) libfltk_gl.sl.1.1 libfltk_gl.sl
@@ -296,7 +296,7 @@
libfltk_gl_s.a: $(GLOBJECTS)
echo $(DSOCOMMAND) libfltk_gl_s.o ...
- $(DSOCOMMAND) libfltk_gl_s.o $(GLOBJECTS)
+ $(DSOCOMMAND) libfltk_gl_s.o $(GLOBJECTS) $(LDLIBS)
echo $(LIBCOMMAND) libfltk_gl_s.a libfltk_gl_s.o
$(RM) $@
$(LIBCOMMAND) libfltk_gl_s.a libfltk_gl_s.o
@@ -310,13 +310,13 @@
libfltk_images.so.1.1: $(IMGOBJECTS) libfltk.so.1.1
echo $(DSOCOMMAND) $@ ...
- $(DSOCOMMAND) $@ $(IMGOBJECTS) -L. $(IMAGELIBS) -lfltk
+ $(DSOCOMMAND) $@ $(IMGOBJECTS) -L. $(IMAGELIBS) $(LDLIBS) -lfltk
$(RM) libfltk_images.so
$(LN) libfltk_images.so.1.1 libfltk_images.so
libfltk_images.sl.1.1: $(IMGOBJECTS) libfltk.sl.1.1
echo $(DSOCOMMAND) $@ ...
- $(DSOCOMMAND) $@ $(IMGOBJECTS) -L. $(IMAGELIBS) -lfltk
+ $(DSOCOMMAND) $@ $(IMGOBJECTS) -L. $(IMAGELIBS) $(LDLIBS) -lfltk
$(RM) libfltk_images.sl
$(LN) libfltk_images.sl.1.1 libfltk_images.sl
@@ -332,7 +332,7 @@
libfltk_images_s.a: $(IMGOBJECTS)
echo $(DSOCOMMAND) libfltk_images_s.o ...
- $(DSOCOMMAND) libfltk_images_s.o $(IMGOBJECTS)
+ $(DSOCOMMAND) libfltk_images_s.o $(IMGOBJECTS) $(LDLIBS)
echo $(LIBCOMMAND) libfltk_images_s.a libfltk_images_s.o
$(RM) $@
$(LIBCOMMAND) libfltk_images_s.a libfltk_images_s.o
|
GitWeb