- rel 3; build fixed (patches from gentoo)

[packages/fltk.git] / fltk-link.patch

diff --git a/fltk-link.patch b/fltk-link.patch
index 8154367068fe4d434a9df2a1eb06c1daa892bc5e..57c82222c6f8246418639a335573305c3f0b5229 100644 (file)
--- a/fltk-link.patch
+++ b/fltk-link.patch
@@ -1,29 +1,45 @@
---- fltk-1.1.3/src/Makefile.orig       Thu Jan 30 21:43:17 2003
-+++ fltk-1.1.3/src/Makefile    Tue May 13 14:36:19 2003
-@@ -232,7 +232,7 @@
+-- fltk-1.1.8/makeinclude.in~  2008-03-28 22:31:50.280354265 +0100
++++ fltk-1.1.8/makeinclude.in  2008-03-28 22:31:55.920623903 +0100
+@@ -127,7 +127,7 @@
+ UNINSTALL_DESKTOP = @UNINSTALL_DESKTOP@
  
- libfltk_forms.so.1.1: $(FLOBJECTS)
-       echo $(DSOCOMMAND) $@ ...
--      $(DSOCOMMAND) $@ $(FLOBJECTS)
-+      $(DSOCOMMAND) $@ $(FLOBJECTS) -L. -lfltk
-       -$(RM) libfltk_forms.so
-       $(LN) libfltk_forms.so.1.1 libfltk_forms.so
+ # Be quiet when building...
+-.SILENT:
++#.SILENT:
  
-@@ -264,7 +264,7 @@
- 
- libfltk_gl.so.1.1: $(GLOBJECTS)
-       echo $(DSOCOMMAND) $@ ...
--      $(DSOCOMMAND) $@ $(GLOBJECTS)
-+      $(DSOCOMMAND) $@ $(GLOBJECTS) -L. -lfltk -L/usr/X11R6/lib -lGL
-       -$(RM) libfltk_gl.so
-       $(LN) libfltk_gl.so.1.1 libfltk_gl.so
- 
-@@ -296,7 +296,7 @@
- 
- libfltk_images.so.1.1: $(IMGOBJECTS)
-       echo $(DSOCOMMAND) $@ ...
--      $(DSOCOMMAND) $@ $(IMGOBJECTS)
-+      $(DSOCOMMAND) $@ $(IMGOBJECTS) -L. -lfltk
-       -$(RM) libfltk_images.so
-       $(LN) libfltk_images.so.1.1 libfltk_images.so
+ # Build commands and filename extensions...
+ .SUFFIXES:    .0 .1 .3 .6 .c .cxx .h .fl .man .o .z $(EXEEXT)
+--- fltk-1.1.8/src/Makefile~   2008-03-28 22:40:13.774424155 +0100
++++ fltk-1.1.8/src/Makefile    2008-03-28 22:46:26.665583815 +0100
+@@ -494,16 +494,16 @@
+       -$(INSTALL_DIR) $(DESTDIR)$(libdir)
+       -$(INSTALL_DIR) $(DESTDIR)$(bindir)
+       $(RM) $(DESTDIR)$(libdir)/$(LIBNAME)
++      $(RANLIB) $(LIBNAME)
++      $(RANLIB) $(FLLIBNAME)
++      $(RANLIB) $(IMGLIBNAME)
+       $(INSTALL_LIB) $(LIBNAME) $(DESTDIR)$(libdir)
+       $(INSTALL_LIB) $(FLLIBNAME) $(DESTDIR)$(libdir)
+       $(INSTALL_LIB) $(IMGLIBNAME) $(DESTDIR)$(libdir)
+-      $(RANLIB) $(DESTDIR)$(libdir)/$(LIBNAME)
+-      $(RANLIB) $(DESTDIR)$(libdir)/$(FLLIBNAME)
+       if test x$(GLLIBNAME) != x; then \
++              $(RANLIB) $(GLLIBNAME); \
+               $(INSTALL_LIB) $(GLLIBNAME) $(DESTDIR)$(libdir); \
+-              $(RANLIB) $(DESTDIR)$(libdir)/$(GLLIBNAME); \
+       fi
+-      $(RANLIB) $(DESTDIR)$(libdir)/$(IMGLIBNAME)
+       if test x$(DSONAME) = xlibfltk.so.1.1; then\
+               $(RM) $(DESTDIR)$(libdir)/libfltk.so*;\
+               $(INSTALL_LIB) libfltk.so.1.1 $(DESTDIR)$(libdir); \
+--- fltk-1.1.8/configure.in~   2008-03-28 23:00:54.660412250 +0100
++++ fltk-1.1.8/configure.in    2008-03-28 23:15:59.012846871 +0100
+@@ -225,7 +225,7 @@
+           ;;
+     esac
  
+-    LINKSHARED="-L../src -lfltk_images$SHAREDSUFFIX -lfltk_forms$SHAREDSUFFIX -lfltk$SHAREDSUFFIX"
++    LINKSHARED="-l:../src/libfltk_images.so -l:../src/libfltk_forms.so -l:../src/libfltk.so"
+ else
+     DSOCOMMAND="echo"
+     DSOLINK=""