Mercurial > octave

diff build-aux/common.mk @ 19732:bf25e9f7c22a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
use FLTK_CFLAGS and FLTK_LIBS instead of GRAPHICS_CFLAGS and GRAPHICS_LIBS * common.mk, configure.ac, toplev.cc, __osmesa_print__.cc, libinterp/dldfcn/module-files, oct-conf.in.h: Use FLTK_CFLAGS and FLTK_LIBS instead of GRAPHICS_CFLAGS and GRAPHICS_LIBS.
author John W. Eaton <jwe@octave.org>
date Tue, 17 Feb 2015 14:10:46 -0500
parents 0e1f5a750d00
children 08033d583435
line wrap: on
line diff
--- a/build-aux/common.mk	Tue Feb 17 20:13:29 2015 +0100
+++ b/build-aux/common.mk	Tue Feb 17 14:10:46 2015 -0500
@@ -225,6 +225,9 @@
 FFTW_XLDFLAGS = $(FFTW3_LDFLAGS) $(FFTW3F_LDFLAGS)
 FFTW_XLIBS = $(FFTW3_LIBS) $(FFTW3F_LIBS)
 
+FLTK_CFLAGS = @FLTK_CFLAGS@
+FLTK_LIBS = @FLTK_LIBS@
+
 ## Alias CPPFLAGS to CFLAGS.
 ## This is closer to the true meaning of `pkg-config --cflags` output.
 FONTCONFIG_CPPFLAGS = @FONTCONFIG_CFLAGS@
@@ -239,9 +242,6 @@
 GLPK_LDFLAGS = @GLPK_LDFLAGS@
 GLPK_LIBS = @GLPK_LIBS@
 
-GRAPHICS_CFLAGS = @GRAPHICS_CFLAGS@
-GRAPHICS_LIBS = @GRAPHICS_LIBS@
-
 GL2PS_LIBS = @GL2PS_LIBS@
 
 HDF5_CPPFLAGS = @HDF5_CPPFLAGS@
@@ -556,6 +556,8 @@
   -e "s|%OCTAVE_CONF_FFTW3F_LDFLAGS%|\"${FFTW3F_LDFLAGS}\"|" \
   -e "s|%OCTAVE_CONF_FFTW3F_LIBS%|\"${FFTW3F_LIBS}\"|" \
   -e "s|%OCTAVE_CONF_FLIBS%|\"${FLIBS}\"|" \
+  -e "s|%OCTAVE_CONF_FLTK_CFLAGS%|\"${FLTK_CFLAGS}\"|" \
+  -e "s|%OCTAVE_CONF_FLTK_LIBS%|\"${FLTK_LIBS}\"|" \
   -e "s|%OCTAVE_CONF_FONTCONFIG_CFLAGS%|\"${FONTCONFIG_CFLAGS}\"|" \
   -e "s|%OCTAVE_CONF_FPICFLAG%|\"${FPICFLAG}\"|" \
   -e "s|%OCTAVE_CONF_FT2_CFLAGS%|\"${FT2_CFLAGS}\"|" \
@@ -564,8 +566,6 @@
   -e "s|%OCTAVE_CONF_GLPK_LDFLAGS%|\"${GLPK_LDFLAGS}\"|" \
   -e "s|%OCTAVE_CONF_GLPK_LIBS%|\"${GLPK_LIBS}\"|" \
   -e "s|%OCTAVE_CONF_GNUPLOT%|\"${GNUPLOT}\"|" \
-  -e "s|%OCTAVE_CONF_GRAPHICS_CFLAGS%|\"${GRAPHICS_CFLAGS}\"|" \
-  -e "s|%OCTAVE_CONF_GRAPHICS_LIBS%|\"${GRAPHICS_LIBS}\"|" \
   -e "s|%OCTAVE_CONF_HDF5_CPPFLAGS%|\"${HDF5_CPPFLAGS}\"|" | \
   $(SED) -e "s|%OCTAVE_CONF_HDF5_LDFLAGS%|\"${HDF5_LDFLAGS}\"|" \
   -e "s|%OCTAVE_CONF_HDF5_LIBS%|\"${HDF5_LIBS}\"|" \