Mercurial > octave-nkf
diff build-aux/common.mk @ 19767:08033d583435
more consistently use _CPPFLAGS and _LDFLAGS variables
* common.mk, configure.ac, toplev.cc, libinterp/dldfcn/module-files,
oct-conf.in.h: Use FLTK_CPPFLAGS, FLTK_LDFLAGS, FONTCONFIG_CPPFLAGS,
FT2_CPPFLAGS for consistency with other library compiler flag variables.
| author | John W. Eaton <jwe@octave.org> |
|---|---|
| date | Tue, 17 Feb 2015 14:33:05 -0500 |
| parents | bf25e9f7c22a |
| children | 9f6ee9cb749c |
line wrap: on
line diff
--- a/build-aux/common.mk Tue Feb 17 14:10:46 2015 -0500 +++ b/build-aux/common.mk Tue Feb 17 14:33:05 2015 -0500 @@ -225,7 +225,8 @@ FFTW_XLDFLAGS = $(FFTW3_LDFLAGS) $(FFTW3F_LDFLAGS) FFTW_XLIBS = $(FFTW3_LIBS) $(FFTW3F_LIBS) -FLTK_CFLAGS = @FLTK_CFLAGS@ +FLTK_CPPFLAGS = @FLTK_CPPFLAGS@ +FLTK_LDFLAGS = @FLTK_LDFLAGS@ FLTK_LIBS = @FLTK_LIBS@ ## Alias CPPFLAGS to CFLAGS. @@ -556,11 +557,13 @@ -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_CPPFLAGS%|\"${FLTK_CPPFLAGS}\"|" \ + -e "s|%OCTAVE_CONF_FLTK_LDFLAGS%|\"${FLTK_LDFLAGS}\"|" \ -e "s|%OCTAVE_CONF_FLTK_LIBS%|\"${FLTK_LIBS}\"|" \ - -e "s|%OCTAVE_CONF_FONTCONFIG_CFLAGS%|\"${FONTCONFIG_CFLAGS}\"|" \ + -e "s|%OCTAVE_CONF_FONTCONFIG_CPPFLAGS%|\"${FONTCONFIG_CPPFLAGS}\"|" \ + -e "s|%OCTAVE_CONF_FONTCONFIG_LIBS%|\"${FONTCONFIG_LIBS}\"|" \ -e "s|%OCTAVE_CONF_FPICFLAG%|\"${FPICFLAG}\"|" \ - -e "s|%OCTAVE_CONF_FT2_CFLAGS%|\"${FT2_CFLAGS}\"|" \ + -e "s|%OCTAVE_CONF_FT2_CPPFLAGS%|\"${FT2_CPPFLAGS}\"|" \ -e "s|%OCTAVE_CONF_FT2_LIBS%|\"${FT2_LIBS}\"|" \ -e "s|%OCTAVE_CONF_GLPK_CPPFLAGS%|\"${GLPK_CPPFLAGS}\"|" \ -e "s|%OCTAVE_CONF_GLPK_LDFLAGS%|\"${GLPK_LDFLAGS}\"|" \