]>
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) | |
12 | --- fltk-1.1.8/src/Makefile~ 2008-03-28 22:40:13.774424155 +0100 | |
13 | +++ fltk-1.1.8/src/Makefile 2008-03-28 22:46:26.665583815 +0100 | |
14 | @@ -494,16 +494,16 @@ | |
15 | -$(INSTALL_DIR) $(DESTDIR)$(libdir) | |
16 | -$(INSTALL_DIR) $(DESTDIR)$(bindir) | |
66ec0b1c | 17 | $(RM) $(DESTDIR)$(libdir)/$(LIBBASENAME) |
5c5d20b6 JR |
18 | + $(RANLIB) $(LIBNAME) |
19 | + $(RANLIB) $(FLLIBNAME) | |
20 | + $(RANLIB) $(IMGLIBNAME) | |
1c2d3b78 | 21 | $(INSTALL_LIB) $(LIBNAME) $(DESTDIR)$(libdir) |
22 | $(INSTALL_LIB) $(FLLIBNAME) $(DESTDIR)$(libdir) | |
23 | $(INSTALL_LIB) $(IMGLIBNAME) $(DESTDIR)$(libdir) | |
66ec0b1c JR |
24 | - $(RANLIB) $(DESTDIR)$(libdir)/$(LIBBASENAME) |
25 | - $(RANLIB) $(DESTDIR)$(libdir)/$(FLLIBBASENAME) | |
1c2d3b78 | 26 | if test x$(GLLIBNAME) != x; then \ |
5c5d20b6 | 27 | + $(RANLIB) $(GLLIBNAME); \ |
1c2d3b78 | 28 | $(INSTALL_LIB) $(GLLIBNAME) $(DESTDIR)$(libdir); \ |
66ec0b1c | 29 | - $(RANLIB) $(DESTDIR)$(libdir)/$(GLLIBBASENAME); \ |
1c2d3b78 | 30 | fi |
66ec0b1c | 31 | - $(RANLIB) $(DESTDIR)$(libdir)/$(IMGLIBBASENAME) |
1c2d3b78 | 32 | if test x$(DSONAME) = xlibfltk.so.1.1; then\ |
33 | $(RM) $(DESTDIR)$(libdir)/libfltk.so*;\ | |
34 | $(INSTALL_LIB) libfltk.so.1.1 $(DESTDIR)$(libdir); \ | |
35 | --- fltk-1.1.8/configure.in~ 2008-03-28 23:00:54.660412250 +0100 | |
36 | +++ fltk-1.1.8/configure.in 2008-03-28 23:15:59.012846871 +0100 | |
37 | @@ -225,7 +225,7 @@ | |
38 | ;; | |
39 | esac | |
40 | ||
41 | - LINKSHARED="-L../src -lfltk_images$SHAREDSUFFIX -lfltk_forms$SHAREDSUFFIX -lfltk$SHAREDSUFFIX" | |
42 | + LINKSHARED="-l:../src/libfltk_images.so -l:../src/libfltk_forms.so -l:../src/libfltk.so" | |
43 | else | |
44 | DSOCOMMAND="echo" | |
45 | DSOLINK="" |