fltk-1.3.0-as-needed.patch

   1 --- fltk-1.3.0/configure.in.orig        2011-03-06 17:54:58.000000000 +0100
   2 +++ fltk-1.3.0/configure.in     2011-12-11 18:11:20.000000000 +0100
   3 @@ -280,10 +280,7 @@
   4              GLDSONAME="libfltk_gl.so.$FL_API_VERSION"
   5              IMGDSONAME="libfltk_images.so.$FL_API_VERSION"
   6              CAIRODSONAME="libfltk_cairo.so.$FL_API_VERSION"
   7 -            DSOCOMMAND="\$(CXX) \$(DSOFLAGS) -Wl,-soname,\$@ \$(LDLIBS) -shared -fPIC $DEBUGFLAG -o"
   8 -           if test "x$libdir" != "x/usr/lib" -a "x$libdir" != "x/usr/lib64"; then
   9 -                   DSOLINK="-Wl,-rpath,$libdir"
  10 -            fi
  11 +            DSOCOMMAND="\$(CXX) \$(DSOFLAGS) \$(LDFLAGS) -Wl,-soname,\$@  -shared -fPIC $DEBUGFLAG -o"
  12             ;;
  13         AIX*)
  14              DSONAME="libfltk_s.a"
  15
  16 --- fltk-1.3.0/src/Makefile.orig        2011-02-06 15:08:08.000000000 +0100
  17 +++ fltk-1.3.0/src/Makefile     2011-12-11 18:17:55.000000000 +0100
  18 @@ -240,13 +240,13 @@
  19
  20  libfltk.so.1.3: $(OBJECTS)
  21         echo $(DSOCOMMAND) $@ ...
  22 -       $(DSOCOMMAND) $@ $(OBJECTS)
  23 +       $(DSOCOMMAND) $@ $(OBJECTS) $(LDLIBS)
  24         $(RM) libfltk.so
  25         $(LN) libfltk.so.1.3 libfltk.so
  26
  27  libfltk.sl.1.3: $(OBJECTS)
  28         echo $(DSOCOMMAND) $@ ...
  29 -       $(DSOCOMMAND) $@ $(OBJECTS)
  30 +       $(DSOCOMMAND) $@ $(OBJECTS) $(LDLIBS)
  31         $(RM) libfltk.sl
  32         $(LN) libfltk.sl.1.3 libfltk.sl
  33
  34 @@ -262,7 +262,7 @@
  35
  36  libfltk_s.a: $(OBJECTS)
  37         echo $(DSOCOMMAND) libfltk_s.o ...
  38 -       $(DSOCOMMAND) libfltk_s.o $(OBJECTS) $(IMAGELIBS)
  39 +       $(DSOCOMMAND) libfltk_s.o $(OBJECTS) $(IMAGELIBS) $(LDLIBS)
  40         echo $(LIBCOMMAND) libfltk_s.a libfltk_s.o
  41         $(RM) $@
  42         $(LIBCOMMAND) libfltk_s.a libfltk_s.o
  43 @@ -276,13 +276,13 @@
  44
  45  libfltk_forms.so.1.3: $(FLOBJECTS) libfltk.so.1.3
  46         echo $(DSOCOMMAND) $@ ...
  47 -       $(DSOCOMMAND) $@ $(FLOBJECTS) -L. -lfltk
  48 +       $(DSOCOMMAND) $@ $(FLOBJECTS) $(LDLIBS) -L. -lfltk
  49         $(RM) libfltk_forms.so
  50         $(LN) libfltk_forms.so.1.3 libfltk_forms.so
  51
  52  libfltk_forms.sl.1.3: $(FLOBJECTS) libfltk.sl.1.3
  53         echo $(DSOCOMMAND) $@ ...
  54 -       $(DSOCOMMAND) $@ $(FLOBJECTS) -L. -lfltk
  55 +       $(DSOCOMMAND) $@ $(FLOBJECTS) $(LDLIBS) -L. -lfltk
  56         $(RM) libfltk_forms.sl
  57         $(LN) libfltk_forms.sl.1.3 libfltk_forms.sl
  58
  59 @@ -298,7 +298,7 @@
  60
  61  libfltk_forms_s.a: $(FLOBJECTS)
  62         echo $(DSOCOMMAND) libfltk_forms_s.o ...
  63 -       $(DSOCOMMAND) libfltk_forms_s.o $(FLOBJECTS)
  64 +       $(DSOCOMMAND) libfltk_forms_s.o $(FLOBJECTS) $(LDLIBS)
  65         echo $(LIBCOMMAND) libfltk_forms_s.a libfltk_forms_s.o
  66         $(RM) $@
  67         $(LIBCOMMAND) libfltk_forms_s.a libfltk_forms_s.o
  68 @@ -312,13 +312,13 @@
  69
  70  libfltk_gl.so.1.3: $(GLOBJECTS) libfltk.so.1.3
  71         echo $(DSOCOMMAND) $@ ...
  72 -       $(DSOCOMMAND) $@ $(GLOBJECTS) -L. -lfltk
  73 +       $(DSOCOMMAND) $@ $(GLOBJECTS) $(GLDLIBS) -L. -lfltk
  74         $(RM) libfltk_gl.so
  75         $(LN) libfltk_gl.so.1.3 libfltk_gl.so
  76
  77  libfltk_gl.sl.1.3: $(GLOBJECTS) libfltk.sl.1.3
  78         echo $(DSOCOMMAND) $@ ...
  79 -       $(DSOCOMMAND) $@ $(GLOBJECTS) -L. -lfltk
  80 +       $(DSOCOMMAND) $@ $(GLOBJECTS) $(GLDLIBS) -L. -lfltk
  81         $(RM) libfltk_gl.sl
  82         $(LN) libfltk_gl.sl.1.3 libfltk_gl.sl
  83
  84 @@ -334,7 +334,7 @@
  85
  86  libfltk_gl_s.a: $(GLOBJECTS)
  87         echo $(DSOCOMMAND) libfltk_gl_s.o ...
  88 -       $(DSOCOMMAND) libfltk_gl_s.o $(GLOBJECTS)
  89 +       $(DSOCOMMAND) libfltk_gl_s.o $(GLOBJECTS) $(GLDLIBS)
  90         echo $(LIBCOMMAND) libfltk_gl_s.a libfltk_gl_s.o
  91         $(RM) $@
  92         $(LIBCOMMAND) libfltk_gl_s.a libfltk_gl_s.o
  93 @@ -348,13 +348,13 @@
  94
  95  libfltk_images.so.1.3: $(IMGOBJECTS) libfltk.so.1.3
  96         echo $(DSOCOMMAND) $@ ...
  97 -       $(DSOCOMMAND) $@ $(IMGOBJECTS) -L. $(IMAGELIBS) -lfltk
  98 +       $(DSOCOMMAND) $@ $(IMGOBJECTS) -L. $(IMAGELIBS) $(LDLIBS) -lfltk
  99         $(RM) libfltk_images.so
 100         $(LN) libfltk_images.so.1.3 libfltk_images.so
 101
 102  libfltk_images.sl.1.3: $(IMGOBJECTS) libfltk.sl.1.3
 103         echo $(DSOCOMMAND) $@ ...
 104 -       $(DSOCOMMAND) $@ $(IMGOBJECTS) -L. $(IMAGELIBS) -lfltk
 105 +       $(DSOCOMMAND) $@ $(IMGOBJECTS) -L. $(IMAGELIBS) $(LDLIBS) -lfltk
 106         $(RM) libfltk_images.sl
 107         $(LN) libfltk_images.sl.1.3 libfltk_images.sl
 108
 109 @@ -370,7 +370,7 @@
 110
 111  libfltk_images_s.a: $(IMGOBJECTS)
 112         echo $(DSOCOMMAND) libfltk_images_s.o ...
 113 -       $(DSOCOMMAND) libfltk_images_s.o $(IMGOBJECTS)
 114 +       $(DSOCOMMAND) libfltk_images_s.o $(IMGOBJECTS) $(LDLIBS)
 115         echo $(LIBCOMMAND) libfltk_images_s.a libfltk_images_s.o
 116         $(RM) $@
 117         $(LIBCOMMAND) libfltk_images_s.a libfltk_images_s.o