]>
Commit | Line | Data |
---|---|---|
02b3a948 JB |
1 | --- fltk-1.1.4/src/Makefile.orig 2003-08-24 15:09:06.000000000 +0200 |
2 | +++ fltk-1.1.4/src/Makefile 2004-04-07 00:16:16.828411328 +0200 | |
e878e300 | 3 | @@ -200,7 +200,7 @@ |
682dac48 | 4 | |
e878e300 JB |
5 | libfltk.so.1.1: $(OBJECTS) |
6 | echo $(DSOCOMMAND) $@ ... | |
02b3a948 | 7 | - $(DSOCOMMAND) $@ $(OBJECTS) |
e878e300 | 8 | + $(DSOCOMMAND) $@ $(OBJECTS) $(LDLIBS) |
9975cb48 | 9 | $(RM) libfltk.so |
e878e300 JB |
10 | $(LN) libfltk.so.1.1 libfltk.so |
11 | ||
02b3a948 | 12 | @@ -236,7 +236,7 @@ |
e878e300 | 13 | |
02b3a948 | 14 | libfltk_forms.so.1.1: $(FLOBJECTS) libfltk.so.1.1 |
682dac48 | 15 | echo $(DSOCOMMAND) $@ ... |
02b3a948 | 16 | - $(DSOCOMMAND) $@ $(FLOBJECTS) -L. -lfltk |
e878e300 | 17 | + $(DSOCOMMAND) $@ $(FLOBJECTS) -L. -lfltk $(LDLIBS) $(IMAGELIBS) |
9975cb48 | 18 | $(RM) libfltk_forms.so |
682dac48 JB |
19 | $(LN) libfltk_forms.so.1.1 libfltk_forms.so |
20 | ||
02b3a948 | 21 | @@ -272,7 +272,7 @@ |
682dac48 | 22 | |
02b3a948 | 23 | libfltk_gl.so.1.1: $(GLOBJECTS) libfltk.so.1.1 |
682dac48 | 24 | echo $(DSOCOMMAND) $@ ... |
02b3a948 | 25 | - $(DSOCOMMAND) $@ $(GLOBJECTS) -L. -lfltk |
e878e300 | 26 | + $(DSOCOMMAND) $@ $(GLOBJECTS) -L. -lfltk $(GLDLIBS) |
9975cb48 | 27 | $(RM) libfltk_gl.so |
682dac48 JB |
28 | $(LN) libfltk_gl.so.1.1 libfltk_gl.so |
29 | ||
02b3a948 | 30 | @@ -308,7 +308,7 @@ |
682dac48 | 31 | |
02b3a948 | 32 | libfltk_images.so.1.1: $(IMGOBJECTS) libfltk.so.1.1 |
682dac48 | 33 | echo $(DSOCOMMAND) $@ ... |
14526c56 PS |
34 | - $(DSOCOMMAND) $@ $(IMGOBJECTS) -L. $(IMAGELIBS) -lfltk |
35 | + $(DSOCOMMAND) $@ $(IMGOBJECTS) -L. $(IMAGELIBS) -lfltk $(LDLIBS) $(IMAGELIBS) | |
9975cb48 | 36 | $(RM) libfltk_images.so |
682dac48 JB |
37 | $(LN) libfltk_images.so.1.1 libfltk_images.so |
38 | ||
02b3a948 JB |
39 | --- fltk-1.1.4/configure.in.orig 2003-08-06 00:40:45.000000000 +0200 |
40 | +++ fltk-1.1.4/configure.in 2004-04-07 00:17:07.647685624 +0200 | |
41 | @@ -166,7 +166,7 @@ | |
e878e300 JB |
42 | FLDSONAME="libfltk_forms.so.$FL_API_VERSION" |
43 | GLDSONAME="libfltk_gl.so.$FL_API_VERSION" | |
44 | IMGDSONAME="libfltk_images.so.$FL_API_VERSION" | |
45 | - DSOCOMMAND="\$(CXX) -Wl,-soname,\$@ \$(LDLIBS) -shared -fPIC $DEBUGFLAG -o" | |
46 | + DSOCOMMAND="\$(CXX) -Wl,-soname,\$@ -shared -fPIC $DEBUGFLAG -o" | |
02b3a948 | 47 | if test "x$libdir" != "x/usr/lib"; then |
e878e300 JB |
48 | DSOLINK="-Wl,-rpath,$libdir" |
49 | fi |