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