- updated for 1.1.4

Changed files:
    fltk-link.patch -> 1.3

diff --git a/fltk-link.patch b/fltk-link.patch
index 3fe34b0d59967444bd80d894b2085a427228fbc6..356f7a0662bef1def4b5fe64fd7ee43f1f60f24f 100644 (file)
--- a/fltk-link.patch
+++ b/fltk-link.patch
@@ -1,62 +1,53 @@
---- fltk-1.1.3/src/Makefile.orig       2003-01-30 22:43:17.000000000 +0100
-+++ fltk-1.1.3/src/Makefile    2003-05-16 21:53:12.000000000 +0200
+--- fltk-1.1.4/src/Makefile.orig       2003-08-24 15:09:06.000000000 +0200
++++ fltk-1.1.4/src/Makefile    2004-04-07 00:16:16.828411328 +0200
 @@ -200,7 +200,7 @@
  
  libfltk.so.1.1: $(OBJECTS)
        echo $(DSOCOMMAND) $@ ...
--      $(DSOCOMMAND) $@ $(OBJECTS) $(IMAGELIBS)
+-      $(DSOCOMMAND) $@ $(OBJECTS)
 +      $(DSOCOMMAND) $@ $(OBJECTS) $(LDLIBS)
        -$(RM) libfltk.so
        $(LN) libfltk.so.1.1 libfltk.so
  
-@@ -230,9 +230,9 @@
-       $(LIBCOMMAND) $@ $(FLOBJECTS)
-       $(RANLIB) $@
+@@ -236,7 +236,7 @@
  
--libfltk_forms.so.1.1: $(FLOBJECTS)
-+libfltk_forms.so.1.1: $(FLOBJECTS) libfltk.so.1.1
+ libfltk_forms.so.1.1: $(FLOBJECTS) libfltk.so.1.1
        echo $(DSOCOMMAND) $@ ...
--      $(DSOCOMMAND) $@ $(FLOBJECTS)
+-      $(DSOCOMMAND) $@ $(FLOBJECTS) -L. -lfltk
 +      $(DSOCOMMAND) $@ $(FLOBJECTS) -L. -lfltk $(LDLIBS) $(IMAGELIBS)
        -$(RM) libfltk_forms.so
        $(LN) libfltk_forms.so.1.1 libfltk_forms.so
  
-@@ -262,9 +262,9 @@
-       $(LIBCOMMAND) $@ $(GLOBJECTS)
-       $(RANLIB) $@
+@@ -272,7 +272,7 @@
  
--libfltk_gl.so.1.1: $(GLOBJECTS)
-+libfltk_gl.so.1.1: $(GLOBJECTS) libfltk.so.1.1
+ libfltk_gl.so.1.1: $(GLOBJECTS) libfltk.so.1.1
        echo $(DSOCOMMAND) $@ ...
--      $(DSOCOMMAND) $@ $(GLOBJECTS)
+-      $(DSOCOMMAND) $@ $(GLOBJECTS) -L. -lfltk
 +      $(DSOCOMMAND) $@ $(GLOBJECTS) -L. -lfltk $(GLDLIBS)
        -$(RM) libfltk_gl.so
        $(LN) libfltk_gl.so.1.1 libfltk_gl.so
  
-@@ -294,9 +294,9 @@
-       $(LIBCOMMAND) $@ $(IMGOBJECTS)
-       $(RANLIB) $@
+@@ -308,7 +308,7 @@
  
--libfltk_images.so.1.1: $(IMGOBJECTS)
-+libfltk_images.so.1.1: $(IMGOBJECTS) libfltk.so.1.1
+ libfltk_images.so.1.1: $(IMGOBJECTS) libfltk.so.1.1
        echo $(DSOCOMMAND) $@ ...
--      $(DSOCOMMAND) $@ $(IMGOBJECTS)
-+      $(DSOCOMMAND) $@ $(IMGOBJECTS) -L. -lfltk $(LDLIBS) $(IMAGELIBS)
+-      $(DSOCOMMAND) $@ $(IMGOBJECTS) $(IMAGELIBS) -L. -lfltk
++      $(DSOCOMMAND) $@ $(IMGOBJECTS) $(IMAGELIBS) -L. -lfltk $(LDLIBS) $(IMAGELIBS)
        -$(RM) libfltk_images.so
        $(LN) libfltk_images.so.1.1 libfltk_images.so
  
---- fltk-1.1.3/configure.in.orig       2003-01-30 22:38:18.000000000 +0100
-+++ fltk-1.1.3/configure.in    2003-05-16 21:46:27.000000000 +0200
-@@ -169,7 +169,7 @@
+--- fltk-1.1.4/configure.in.orig       2003-08-06 00:40:45.000000000 +0200
++++ fltk-1.1.4/configure.in    2004-04-07 00:17:07.647685624 +0200
+@@ -166,7 +166,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) -Wl,-soname,\$@ -shared -fPIC $DEBUGFLAG -o"
-           if test "$libdir" != "/usr/lib"; then
+           if test "x$libdir" != "x/usr/lib"; then
                    DSOLINK="-Wl,-rpath,$libdir"
              fi
-@@ -649,22 +649,7 @@
+@@ -653,22 +653,7 @@
      # Previous versions of GCC do not have the reliance on the stdc++
      # or g++ libraries, so the extra supc++ library is not needed.