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
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
|
cairo/Makefile | 4 ++--
configure.in | 9 +++------
src/Makefile | 24 ++++++++++++------------
3 files changed, 17 insertions(+), 20 deletions(-)
diff --git a/cairo/Makefile b/cairo/Makefile
index 3cefc9f..445cd9c 100644
--- a/cairo/Makefile
+++ b/cairo/Makefile
@@ -48,13 +48,13 @@ $(CAIROLIBNAME): $(CAIROOBJECTS)
libfltk_cairo.so.1.3: $(CAIROOBJECTS) ../src/libfltk.so.1.3
echo $(DSOCOMMAND) $@ ...
- $(DSOCOMMAND) $@ $(CAIROOBJECTS) -L../src -lfltk
+ $(DSOCOMMAND) $@ $(CAIROOBJECTS) -L../src -lfltk $(CAIROLIBS)
$(RM) libfltk_cairo.so
$(LN) $(CAIRODSONAME) libfltk_cairo.so
libfltk_cairo.sl.1.3: $(CAIROOBJECTS) ../src/libfltk.sl.1.3
echo $(DSOCOMMAND) $@ ...
- $(DSOCOMMAND) $@ $(CAIROOBJECTS) -L../src -lfltk
+ $(DSOCOMMAND) $@ $(CAIROOBJECTS) -L../src -lfltk $(CAIROLIBS)
$(RM) libfltk_cairo.sl
$(LN) libfltk_cairo.sl.1.3 libfltk_cairo.sl
diff --git a/configure.in b/configure.in
index 762d3f9..56a5d97 100644
--- a/configure.in
+++ b/configure.in
@@ -166,7 +166,7 @@ else
dnl we do not rely on pkg-config .
CAIRODIR="cairo"
CAIROFLAGS="`pkg-config --cflags cairo`"
- CAIROLIBS="-lcairo -lpixman-1"
+ CAIROLIBS="`pkg-config --libs cairo pixman-1`"
CXXFLAGS="$CAIROFLAGS $CXXFLAGS"
LINKFLTKCAIRO="../lib/libfltk_cairo.a"
FLTKCAIROOPTION="-L ../cairo -lfltk_cairo$SHAREDSUFFIX"
@@ -280,10 +280,7 @@ if test x$enable_shared = xyes; then
GLDSONAME="libfltk_gl.so.$FL_API_VERSION"
IMGDSONAME="libfltk_images.so.$FL_API_VERSION"
CAIRODSONAME="libfltk_cairo.so.$FL_API_VERSION"
- DSOCOMMAND="\$(CXX) \$(DSOFLAGS) -Wl,-soname,\$@ \$(LDLIBS) -shared -fPIC $DEBUGFLAG -o"
- if test "x$libdir" != "x/usr/lib" -a "x$libdir" != "x/usr/lib64"; then
- DSOLINK="-Wl,-rpath,$libdir"
- fi
+ DSOCOMMAND="\$(CXX) \$(DSOFLAGS) \$(LDFLAGS) -Wl,-soname,\$@ -shared -fPIC $DEBUGFLAG -o"
;;
AIX*)
DSONAME="libfltk_s.a"
diff --git a/src/Makefile b/src/Makefile
index 7806854..a43106e 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -240,13 +240,13 @@ $(LIBNAME): $(OBJECTS)
libfltk.so.1.3: $(OBJECTS)
echo $(DSOCOMMAND) $@ ...
- $(DSOCOMMAND) $@ $(OBJECTS)
+ $(DSOCOMMAND) $@ $(OBJECTS) $(LDLIBS)
$(RM) libfltk.so
$(LN) libfltk.so.1.3 libfltk.so
libfltk.sl.1.3: $(OBJECTS)
echo $(DSOCOMMAND) $@ ...
- $(DSOCOMMAND) $@ $(OBJECTS)
+ $(DSOCOMMAND) $@ $(OBJECTS) $(LDLIBS)
$(RM) libfltk.sl
$(LN) libfltk.sl.1.3 libfltk.sl
@@ -262,7 +262,7 @@ libfltk.1.3.dylib: $(OBJECTS)
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
@@ -276,13 +276,13 @@ $(FLLIBNAME): $(FLOBJECTS)
libfltk_forms.so.1.3: $(FLOBJECTS) libfltk.so.1.3
echo $(DSOCOMMAND) $@ ...
- $(DSOCOMMAND) $@ $(FLOBJECTS) -L. -lfltk
+ $(DSOCOMMAND) $@ $(FLOBJECTS) $(LDLIBS) -L. -lfltk
$(RM) libfltk_forms.so
$(LN) libfltk_forms.so.1.3 libfltk_forms.so
libfltk_forms.sl.1.3: $(FLOBJECTS) libfltk.sl.1.3
echo $(DSOCOMMAND) $@ ...
- $(DSOCOMMAND) $@ $(FLOBJECTS) -L. -lfltk
+ $(DSOCOMMAND) $@ $(FLOBJECTS) $(LDLIBS) -L. -lfltk
$(RM) libfltk_forms.sl
$(LN) libfltk_forms.sl.1.3 libfltk_forms.sl
@@ -298,7 +298,7 @@ libfltk_forms.1.3.dylib: $(FLOBJECTS) libfltk.1.3.dylib
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
@@ -312,13 +312,13 @@ $(GLLIBNAME): $(GLOBJECTS)
libfltk_gl.so.1.3: $(GLOBJECTS) libfltk.so.1.3
echo $(DSOCOMMAND) $@ ...
- $(DSOCOMMAND) $@ $(GLOBJECTS) -L. -lfltk
+ $(DSOCOMMAND) $@ $(GLOBJECTS) $(LDLIBS) -L. -lfltk $(GLDLIBS) $(GLLIB)
$(RM) libfltk_gl.so
$(LN) libfltk_gl.so.1.3 libfltk_gl.so
libfltk_gl.sl.1.3: $(GLOBJECTS) libfltk.sl.1.3
echo $(DSOCOMMAND) $@ ...
- $(DSOCOMMAND) $@ $(GLOBJECTS) -L. -lfltk
+ $(DSOCOMMAND) $@ $(GLOBJECTS) $(LDLIBS) -L. -lfltk
$(RM) libfltk_gl.sl
$(LN) libfltk_gl.sl.1.3 libfltk_gl.sl
@@ -334,7 +334,7 @@ libfltk_gl.1.3.dylib: $(GLOBJECTS) libfltk.1.3.dylib
libfltk_gl_s.a: $(GLOBJECTS)
echo $(DSOCOMMAND) libfltk_gl_s.o ...
- $(DSOCOMMAND) libfltk_gl_s.o $(GLOBJECTS)
+ $(DSOCOMMAND) libfltk_gl_s.o $(GLOBJECTS) $(LDLIBS) $(GLLIB)
echo $(LIBCOMMAND) libfltk_gl_s.a libfltk_gl_s.o
$(RM) $@
$(LIBCOMMAND) libfltk_gl_s.a libfltk_gl_s.o
@@ -348,13 +348,13 @@ $(IMGLIBNAME): $(IMGOBJECTS)
libfltk_images.so.1.3: $(IMGOBJECTS) libfltk.so.1.3
echo $(DSOCOMMAND) $@ ...
- $(DSOCOMMAND) $@ $(IMGOBJECTS) -L. $(IMAGELIBS) -lfltk
+ $(DSOCOMMAND) $@ $(IMGOBJECTS) -L. $(IMAGELIBS) $(LDLIBS) -lfltk
$(RM) libfltk_images.so
$(LN) libfltk_images.so.1.3 libfltk_images.so
libfltk_images.sl.1.3: $(IMGOBJECTS) libfltk.sl.1.3
echo $(DSOCOMMAND) $@ ...
- $(DSOCOMMAND) $@ $(IMGOBJECTS) -L. $(IMAGELIBS) -lfltk
+ $(DSOCOMMAND) $@ $(IMGOBJECTS) -L. $(IMAGELIBS) $(LDLIBS) -lfltk
$(RM) libfltk_images.sl
$(LN) libfltk_images.sl.1.3 libfltk_images.sl
@@ -370,7 +370,7 @@ libfltk_images.1.3.dylib: $(IMGOBJECTS) libfltk.1.3.dylib
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
|
