]>
Commit | Line | Data |
---|---|---|
1c2d3b78 | 1 | -- fltk-1.1.8/makeinclude.in~ 2008-03-28 22:31:50.280354265 +0100 |
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) | |
9133bc0f | 12 | --- fltk-1.3.0/configure.in.orig 2011-12-11 18:23:15.000000000 +0100 |
13 | +++ fltk-1.3.0/configure.in 2011-12-11 18:30:07.000000000 +0100 | |
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="" | |
23 | --- fltk-1.3.0/src/Makefile.orig 2011-12-11 18:23:16.000000000 +0100 | |
24 | +++ fltk-1.3.0/src/Makefile 2011-12-11 18:36:24.000000000 +0100 | |
25 | @@ -557,7 +557,10 @@ | |
26 | install: $(LIBNAME) $(DSONAME) \ | |
27 | $(FLLIBNAME) $(FLDSONAME) \ | |
28 | $(GLLIBNAME) $(GLDSONAME) \ | |
29 | - $(IMGLIBNAME) $(IMGDSONAME) | |
30 | + $(IMGLIBNAME) $(IMGDSONAME) | |
5c5d20b6 JR |
31 | + $(RANLIB) $(LIBNAME) |
32 | + $(RANLIB) $(FLLIBNAME) | |
9133bc0f | 33 | + $(RANLIB) $(IMGLIBNAME) |
34 | echo "Installing libraries in $(DESTDIR)$(libdir)..." | |
35 | -$(INSTALL_DIR) $(DESTDIR)$(libdir) | |
36 | -$(INSTALL_DIR) $(DESTDIR)$(bindir) | |
37 | @@ -565,13 +568,10 @@ | |
1c2d3b78 | 38 | $(INSTALL_LIB) $(LIBNAME) $(DESTDIR)$(libdir) |
39 | $(INSTALL_LIB) $(FLLIBNAME) $(DESTDIR)$(libdir) | |
40 | $(INSTALL_LIB) $(IMGLIBNAME) $(DESTDIR)$(libdir) | |
66ec0b1c JR |
41 | - $(RANLIB) $(DESTDIR)$(libdir)/$(LIBBASENAME) |
42 | - $(RANLIB) $(DESTDIR)$(libdir)/$(FLLIBBASENAME) | |
1c2d3b78 | 43 | if test x$(GLLIBNAME) != x; then \ |
5c5d20b6 | 44 | + $(RANLIB) $(GLLIBNAME); \ |
1c2d3b78 | 45 | $(INSTALL_LIB) $(GLLIBNAME) $(DESTDIR)$(libdir); \ |
66ec0b1c | 46 | - $(RANLIB) $(DESTDIR)$(libdir)/$(GLLIBBASENAME); \ |
1c2d3b78 | 47 | fi |
66ec0b1c | 48 | - $(RANLIB) $(DESTDIR)$(libdir)/$(IMGLIBBASENAME) |
9133bc0f | 49 | if test x$(DSONAME) = xlibfltk.so.1.3; then\ |
1c2d3b78 | 50 | $(RM) $(DESTDIR)$(libdir)/libfltk.so*;\ |
9133bc0f | 51 | $(INSTALL_LIB) libfltk.so.1.3 $(DESTDIR)$(libdir); \ |