Mercurial > octave-dspies

comparison libgui/Makefile.am @ 18975:c59745865c7f gui-release

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
maint: Periodic merge of stable to gui-release.
author John W. Eaton <jwe@octave.org>
date Fri, 01 Aug 2014 09:06:21 -0400
parents c23e9e29a499 a5add7b660ac
children
comparison
equal deleted inserted replaced
18969:12462638ab20 18975:c59745865c7f
19 # <http://www.gnu.org/licenses/>. 19 # <http://www.gnu.org/licenses/>.
20 20
21 include $(top_srcdir)/build-aux/common.mk 21 include $(top_srcdir)/build-aux/common.mk
22 22
23 MOC_CPPFLAGS = 23 MOC_CPPFLAGS =
24
25 ## Fix for bug #42839 where -mieee CFLAG option is added to CPPFLAGS by gnulib.
26 ## Eventually gnulib will be appropriately fixed and this hack removed.
27 MOC_OCTAVE_CPPFLAGS = $(filter-out -mieee, $(AM_CPPFLAGS) $(CPPFLAGS))
24 28
25 octlib_LTLIBRARIES = liboctgui.la 29 octlib_LTLIBRARIES = liboctgui.la
26 30
27 TRANSLATIONS = \ 31 TRANSLATIONS = \
28 languages/be_BY.ts \ 32 languages/be_BY.ts \
92 96
93 define moc-command 97 define moc-command
94 ( echo '#ifdef HAVE_CONFIG_H'; \ 98 ( echo '#ifdef HAVE_CONFIG_H'; \
95 echo '#include <config.h>'; \ 99 echo '#include <config.h>'; \
96 echo '#endif'; \ 100 echo '#endif'; \
97 $(MOC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(MOC_CPPFLAGS) $(liboctgui_la_CPPFLAGS) $< ) > $@-t 101 $(MOC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MOC_OCTAVE_CPPFLAGS) $(MOC_CPPFLAGS) $(liboctgui_la_CPPFLAGS) $< ) > $@-t
98 mv $@-t $@ 102 mv $@-t $@
99 endef 103 endef
100 104
101 define rcc-command 105 define rcc-command
102 ( echo '#ifdef HAVE_CONFIG_H'; \ 106 ( echo '#ifdef HAVE_CONFIG_H'; \