Mercurial > octave

comparison libgui/module.mk @ 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 2d3972b802ff
children b8eeca55fa81
comparison
equal deleted inserted replaced
22233:60faa7c85e31 22234:66dd260512a4
79 define moc-command 79 define moc-command
80 rm -f $@-t $@ && \ 80 rm -f $@-t $@ && \
81 ( echo "#if defined (HAVE_CONFIG_H)"; \ 81 ( echo "#if defined (HAVE_CONFIG_H)"; \
82 echo '# include "config.h"'; \ 82 echo '# include "config.h"'; \
83 echo "#endif"; \ 83 echo "#endif"; \
84 $(MOC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MOC_OCTAVE_CPPFLAGS) $(MOC_CPPFLAGS) $(libgui_liboctgui_la_CPPFLAGS) $< ) > $@-t && \ 84 $(MOC) $(MOCFLAGS) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MOC_OCTAVE_CPPFLAGS) $(MOC_CPPFLAGS) $(libgui_liboctgui_la_CPPFLAGS) $< ) > $@-t && \
85 mv $@-t $@ 85 mv $@-t $@
86 endef 86 endef
87 87
88 define rcc-command 88 define rcc-command
89 rm -f $@-t $@ && \ 89 rm -f $@-t $@ && \
92 echo "#endif"; \ 92 echo "#endif"; \
93 echo "// Ignore unused variable warnings in generated code."; \ 93 echo "// Ignore unused variable warnings in generated code."; \
94 echo "#if defined (HAVE_PRAGMA_GCC_DIAGNOSTIC)"; \ 94 echo "#if defined (HAVE_PRAGMA_GCC_DIAGNOSTIC)"; \
95 echo "#pragma GCC diagnostic ignored \"-Wunused-variable\""; \ 95 echo "#pragma GCC diagnostic ignored \"-Wunused-variable\""; \
96 echo "#endif"; \ 96 echo "#endif"; \
97 $(RCC) -name $(@D) $< ) > $@-t && \ 97 $(RCC) $(RCCFLAGS) -name $(@D) $< ) > $@-t && \
98 mv $@-t $@ 98 mv $@-t $@
99 endef 99 endef
100 100
101 moc-%.cc: %.h 101 moc-%.cc: %.h
102 $(AM_V_GEN)$(moc-command) 102 $(AM_V_GEN)$(moc-command)
103 103
104 ui-%.h: %.ui 104 ui-%.h: %.ui
105 $(AM_V_GEN)$(UIC) -o $@ $< 105 $(AM_V_GEN)$(UIC) $(UICFLAGS) -o $@ $<
106 106
107 qrc-%.cc: %.qrc 107 qrc-%.cc: %.qrc
108 $(AM_V_GEN)$(rcc-command) 108 $(AM_V_GEN)$(rcc-command)
109 109
110 AM_V_lrelease = $(am__v_lrelease_$(V)) 110 AM_V_lrelease = $(am__v_lrelease_$(V))
111 am__v_lrelease_ = $(am__v_lrelease_$(AM_DEFAULT_VERBOSITY)) 111 am__v_lrelease_ = $(am__v_lrelease_$(AM_DEFAULT_VERBOSITY))
112 am__v_lrelease_0 = -silent 112 am__v_lrelease_0 = -silent
113 am__v_lrelease_1 = 113 am__v_lrelease_1 =
114 114
115 %.qm: %.ts | libgui/languages/$(octave_dirstamp) 115 %.qm: %.ts | libgui/languages/$(octave_dirstamp)
116 $(AM_V_GEN)$(LRELEASE) $(AM_V_lrelease) -qm $@ $< 116 $(AM_V_GEN)$(LRELEASE) $(LRELEASEFLAGS) $(AM_V_lrelease) -qm $@ $<
117 117
118 DIRSTAMP_FILES += \ 118 DIRSTAMP_FILES += \
119 libgui/languages/$(octave_dirstamp) 119 libgui/languages/$(octave_dirstamp)
120 120
121 libgui_EXTRA_DIST += \ 121 libgui_EXTRA_DIST += \