Mercurial > octave-dspies

comparison libgui/Makefile.am @ 18960:a5add7b660ac stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
build: Fix compiling GUI on Alpha platforms (bug #42839). * libgui/Makefile.am: Use GNU Makefile filter-out command to remove -mieee CFLAG option from CPPFLAGS passed to MOC command.
author Rik <rik@octave.org>
date Sat, 26 Jul 2014 07:50:38 -0700
parents ef7bb00d8167
children c59745865c7f
comparison
equal deleted inserted replaced
18957:87cba451fd5e 18960:a5add7b660ac
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 \
89 93
90 define moc-command 94 define moc-command
91 ( echo '#ifdef HAVE_CONFIG_H'; \ 95 ( echo '#ifdef HAVE_CONFIG_H'; \
92 echo '#include <config.h>'; \ 96 echo '#include <config.h>'; \
93 echo '#endif'; \ 97 echo '#endif'; \
94 $(MOC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(MOC_CPPFLAGS) $(liboctgui_la_CPPFLAGS) $< ) > $@-t 98 $(MOC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MOC_OCTAVE_CPPFLAGS) $(MOC_CPPFLAGS) $(liboctgui_la_CPPFLAGS) $< ) > $@-t
95 mv $@-t $@ 99 mv $@-t $@
96 endef 100 endef
97 101
98 define rcc-command 102 define rcc-command
99 ( echo '#ifdef HAVE_CONFIG_H'; \ 103 ( echo '#ifdef HAVE_CONFIG_H'; \