Mercurial > octave

comparison Makefile.am @ 22234:66dd260512a4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
allow configure to select Qt version * Makefile.am (AM_FFLAGS): Include FPICFLAG in definition. (AM_CFLAGS): Include CPICFLAG in definition. (AM_CXXFLAGS): Include CXXPICFLAG in definition. * libgui/module.mk: Use MOCFLAGS, UICFLAGS, RCCFLAGS, and LRELEASEFLAGS in MOC, UIC, RCC, and LRELEASE commands. * acinclude.m4: Add CXXPICFLAG to CXXFLAGS in Qt tests. (OCTAVE_CHECK_QSCINTILLA_VERSION): Rename from OCTAVE_CHECK_VERSION_2_6_0. (OCTAVE_CHECK_QT_VERSION, OCTAVE_CHECK_QT): New macros extracted from configure.ac. * configure.ac: Move checks for shared vs. static libraries earlier in file. Allow checking for multiple versions of Qt libraries. Report MOC, UIC, RCC, and LRELEASE in summary.
author John W. Eaton <jwe@octave.org>
date Tue, 09 Aug 2016 14:41:52 -0400
parents ad1790bb8f71
children bac0d6f07a3e
comparison
equal deleted inserted replaced
22233:60faa7c85e31 22234:66dd260512a4
36 36
37 AM_YFLAGS = -dv 37 AM_YFLAGS = -dv
38 38
39 # Fortran compiler flags. 39 # Fortran compiler flags.
40 40
41 AM_FFLAGS = @FFLAGS@ 41 AM_FFLAGS = ${FPICFLAG} @FFLAGS@
42 42
43 # C compiler flags. 43 # C compiler flags.
44 44
45 AM_CFLAGS = ${XTRA_CFLAGS} 45 AM_CFLAGS = ${CPICFLAG} ${XTRA_CFLAGS}
46 46
47 # ifeq (${INCLUDE_DEPS},no) 47 # ifeq (${INCLUDE_DEPS},no)
48 # omit_deps = true; 48 # omit_deps = true;
49 # endif 49 # endif
50 50
51 # C++ compiler flags. 51 # C++ compiler flags.
52 52
53 AM_CXXFLAGS = ${XTRA_CXXFLAGS} 53 AM_CXXFLAGS = ${CXXPICFLAG} ${XTRA_CXXFLAGS}
54 54
55 FFTW_XCPPFLAGS = @FFTW_XCPPFLAGS@ 55 FFTW_XCPPFLAGS = @FFTW_XCPPFLAGS@
56 FFTW_XLDFLAGS = @FFTW_XLDFLAGS@ 56 FFTW_XLDFLAGS = @FFTW_XLDFLAGS@
57 FFTW_XLIBS = @FFTW_XLIBS@ 57 FFTW_XLIBS = @FFTW_XLIBS@
58 58