]>
Commit | Line | Data |
---|---|---|
1 | --- fltk-1.3.8/makeinclude.in.orig 2022-02-05 21:08:49.939598334 +0100 | |
2 | +++ fltk-1.3.8/makeinclude.in 2022-02-05 21:10:37.971876749 +0100 | |
3 | @@ -144,9 +144,6 @@ INSTALL_SCRIPT = $(INSTALL) -m 755 | |
4 | INSTALL_DESKTOP = @INSTALL_DESKTOP@ | |
5 | UNINSTALL_DESKTOP = @UNINSTALL_DESKTOP@ | |
6 | ||
7 | -# Be quiet when building... | |
8 | -.SILENT: | |
9 | - | |
10 | # Build commands and filename extensions... | |
11 | .SUFFIXES: .0 .1 .3 .6 .c .cxx .mm .h .fl .man .o .z $(EXEEXT) | |
12 | ||
13 | --- fltk-1.3.5/configure.ac.orig 2011-12-11 18:23:15.000000000 +0100 | |
14 | +++ fltk-1.3.5/configure.ac 2011-12-11 18:30:07.000000000 +0100 | |
15 | @@ -335,7 +335,7 @@ | |
16 | ;; | |
17 | esac | |
18 | ||
19 | - LINKSHARED="-L../src $FLTKCAIROOPTION -lfltk_images$SHAREDSUFFIX -lfltk_forms$SHAREDSUFFIX -lfltk$SHAREDSUFFIX" | |
20 | + LINKSHARED="-L../src $FLTKCAIROOPTION -l:../src/libfltk_images.so -l:../src/libfltk_forms.so -l:../src/libfltk.so" | |
21 | else | |
22 | DSOCOMMAND="echo" | |
23 | DSOLINK="" | |
24 | --- fltk-1.3.8/src/Makefile.orig 2022-02-05 15:58:57.974760005 +0100 | |
25 | +++ fltk-1.3.8/src/Makefile 2022-02-05 16:08:42.471593514 +0100 | |
26 | @@ -569,6 +569,9 @@ install: $(LIBNAME) $(DSONAME) \ | |
27 | $(FLLIBNAME) $(FLDSONAME) \ | |
28 | $(GLLIBNAME) $(GLDSONAME) \ | |
29 | $(IMGLIBNAME) $(IMGDSONAME) | |
30 | + $(RANLIB) $(LIBNAME) | |
31 | + $(RANLIB) $(FLLIBNAME) | |
32 | + $(RANLIB) $(IMGLIBNAME) | |
33 | echo "Installing libraries in $(DESTDIR)$(libdir)..." | |
34 | -$(INSTALL_DIR) $(DESTDIR)$(libdir) | |
35 | -$(INSTALL_DIR) $(DESTDIR)$(bindir) | |
36 | @@ -576,13 +579,10 @@ install: $(LIBNAME) $(DSONAME) \ | |
37 | $(INSTALL_LIB) $(LIBNAME) $(DESTDIR)$(libdir) | |
38 | $(INSTALL_LIB) $(FLLIBNAME) $(DESTDIR)$(libdir) | |
39 | $(INSTALL_LIB) $(IMGLIBNAME) $(DESTDIR)$(libdir) | |
40 | - $(RANLIB) $(DESTDIR)$(libdir)/$(LIBBASENAME) | |
41 | - $(RANLIB) $(DESTDIR)$(libdir)/$(FLLIBBASENAME) | |
42 | if test x$(GLLIBNAME) != x; then \ | |
43 | + $(RANLIB) $(GLLIBNAME); \ | |
44 | $(INSTALL_LIB) $(GLLIBNAME) $(DESTDIR)$(libdir); \ | |
45 | - $(RANLIB) $(DESTDIR)$(libdir)/$(GLLIBBASENAME); \ | |
46 | fi | |
47 | - $(RANLIB) $(DESTDIR)$(libdir)/$(IMGLIBBASENAME) | |
48 | if test x$(DSONAME) = xlibfltk.so.$(FL_DSO_VERSION); then\ | |
49 | $(RM) $(DESTDIR)$(libdir)/libfltk.so*;\ | |
50 | $(INSTALL_LIB) libfltk.so.$(FL_DSO_VERSION) $(DESTDIR)$(libdir); \ |