fltk-link.patch

   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
   3 @@ -200,7 +200,7 @@
   4
   5  libfltk.so.1.1: $(OBJECTS)
   6         echo $(DSOCOMMAND) $@ ...
   7 -       $(DSOCOMMAND) $@ $(OBJECTS)
   8 +       $(DSOCOMMAND) $@ $(OBJECTS) $(LDLIBS)
   9         $(RM) libfltk.so
  10         $(LN) libfltk.so.1.1 libfltk.so
  11
  12 @@ -236,7 +236,7 @@
  13
  14  libfltk_forms.so.1.1: $(FLOBJECTS) libfltk.so.1.1
  15         echo $(DSOCOMMAND) $@ ...
  16 -       $(DSOCOMMAND) $@ $(FLOBJECTS) -L. -lfltk
  17 +       $(DSOCOMMAND) $@ $(FLOBJECTS) -L. -lfltk $(LDLIBS) $(IMAGELIBS)
  18         $(RM) libfltk_forms.so
  19         $(LN) libfltk_forms.so.1.1 libfltk_forms.so
  20
  21 @@ -272,7 +272,7 @@
  22
  23  libfltk_gl.so.1.1: $(GLOBJECTS) libfltk.so.1.1
  24         echo $(DSOCOMMAND) $@ ...
  25 -       $(DSOCOMMAND) $@ $(GLOBJECTS) -L. -lfltk
  26 +       $(DSOCOMMAND) $@ $(GLOBJECTS) -L. -lfltk $(GLDLIBS)
  27         $(RM) libfltk_gl.so
  28         $(LN) libfltk_gl.so.1.1 libfltk_gl.so
  29
  30 @@ -308,7 +308,7 @@
  31
  32  libfltk_images.so.1.1: $(IMGOBJECTS) libfltk.so.1.1
  33         echo $(DSOCOMMAND) $@ ...
  34 -       $(DSOCOMMAND) $@ $(IMGOBJECTS) -L. $(IMAGELIBS) -lfltk
  35 +       $(DSOCOMMAND) $@ $(IMGOBJECTS) -L. $(IMAGELIBS) -lfltk $(LDLIBS) $(IMAGELIBS)
  36         $(RM) libfltk_images.so
  37         $(LN) libfltk_images.so.1.1 libfltk_images.so
  38
  39 --- fltk-1.1.8/configure.in~    2008-03-28 10:38:36.000000000 +0100
  40 +++ fltk-1.1.8/configure.in     2008-03-28 10:38:50.000000000 +0100
  41 @@ -179,7 +179,7 @@
  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) \$(DSOFLAGS) -Wl,-soname,\$@ \$(LDLIBS) -shared -fPIC $DEBUGFLAG -o"
  46 +            DSOCOMMAND="\$(CXX) \$(DSOFLAGS) -Wl,-soname,\$@ -shared -fPIC $DEBUGFLAG -o"
  47             if test "x$libdir" != "x/usr/lib"; then
  48                     DSOLINK="-Wl,-rpath,$libdir"
  49              fi
  50 -- fltk-1.1.8/makeinclude.in~   2008-03-28 22:31:50.280354265 +0100
  51 +++ fltk-1.1.8/makeinclude.in   2008-03-28 22:31:55.920623903 +0100
  52 @@ -127,7 +127,7 @@
  53  UNINSTALL_DESKTOP = @UNINSTALL_DESKTOP@
  54
  55  # Be quiet when building...
  56 -.SILENT:
  57 +#.SILENT:
  58
  59  # Build commands and filename extensions...
  60  .SUFFIXES:     .0 .1 .3 .6 .c .cxx .h .fl .man .o .z $(EXEEXT)
  61 --- fltk-1.1.8/src/Makefile~    2008-03-28 22:40:13.774424155 +0100
  62 +++ fltk-1.1.8/src/Makefile     2008-03-28 22:46:26.665583815 +0100
  63 @@ -494,16 +494,16 @@
  64         -$(INSTALL_DIR) $(DESTDIR)$(libdir)
  65         -$(INSTALL_DIR) $(DESTDIR)$(bindir)
  66         $(RM) $(DESTDIR)$(libdir)/$(LIBNAME)
  67 +       $(RANLIB) $(LIBNAME)
  68 +       $(RANLIB) $(FLLIBNAME)
  69 +       $(RANLIB) $(IMGLIBNAME)
  70         $(INSTALL_LIB) $(LIBNAME) $(DESTDIR)$(libdir)
  71         $(INSTALL_LIB) $(FLLIBNAME) $(DESTDIR)$(libdir)
  72         $(INSTALL_LIB) $(IMGLIBNAME) $(DESTDIR)$(libdir)
  73 -       $(RANLIB) $(DESTDIR)$(libdir)/$(LIBNAME)
  74 -       $(RANLIB) $(DESTDIR)$(libdir)/$(FLLIBNAME)
  75         if test x$(GLLIBNAME) != x; then \
  76 +               $(RANLIB) $(GLLIBNAME); \
  77                 $(INSTALL_LIB) $(GLLIBNAME) $(DESTDIR)$(libdir); \
  78 -               $(RANLIB) $(DESTDIR)$(libdir)/$(GLLIBNAME); \
  79         fi
  80 -       $(RANLIB) $(DESTDIR)$(libdir)/$(IMGLIBNAME)
  81         if test x$(DSONAME) = xlibfltk.so.1.1; then\
  82                 $(RM) $(DESTDIR)$(libdir)/libfltk.so*;\
  83                 $(INSTALL_LIB) libfltk.so.1.1 $(DESTDIR)$(libdir); \
  84 --- fltk-1.1.8/configure.in~    2008-03-28 23:00:54.660412250 +0100
  85 +++ fltk-1.1.8/configure.in     2008-03-28 23:15:59.012846871 +0100
  86 @@ -225,7 +225,7 @@
  87             ;;
  88      esac
  89
  90 -    LINKSHARED="-L../src -lfltk_images$SHAREDSUFFIX -lfltk_forms$SHAREDSUFFIX -lfltk$SHAREDSUFFIX"
  91 +    LINKSHARED="-l:../src/libfltk_images.so -l:../src/libfltk_forms.so -l:../src/libfltk.so"
  92  else
  93      DSOCOMMAND="echo"
  94      DSOLINK=""