Mercurial > hg > octave-lyh

changeset 15417:dd371063e414

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
build: Add FFTW_XCPPFLAGS to corefcn convenience library CPPFLAGS * libinterp/Makefile.am: Remove commented rule with FFTW_XCPPFLAGS. * libinterp/corefcn/module.mk: Add FFTW_XCPPFLAGS to CPPFLAGS.
author Rik <rik@octave.org>
date Wed, 19 Sep 2012 10:17:35 -0700
parents a0fb36acbd0d
children 60090630cb76
files libinterp/Makefile.am libinterp/corefcn/module.mk
diffstat 2 files changed, 1 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/libinterp/Makefile.am
+++ b/libinterp/Makefile.am
@@ -188,9 +188,6 @@
   -bindir $(bindir) \
   $(LIBOCTINTERP_LINK_OPTS)
 
-## FIXME: Does this rule need to be uncommented?
-#fft.df fft.lo fft2.df fft2.lo fftn.df fftn.lo: CPPFLAGS += $(FFTW_XCPPFLAGS)
-
 ## Section for defining and creating DEF_FILES
 SRC_DEF_FILES := $(shell $(srcdir)/find-defun-files.sh "$(srcdir)" $(DIST_SRC))
 
--- a/libinterp/corefcn/module.mk
+++ b/libinterp/corefcn/module.mk
@@ -95,5 +95,5 @@
 noinst_LTLIBRARIES += corefcn/libcorefcn.la
 
 corefcn_libcorefcn_la_SOURCES = $(COREFCN_SRC)
-corefcn_libcorefcn_la_CPPFLAGS = $(liboctinterp_la_CPPFLAGS)
+corefcn_libcorefcn_la_CPPFLAGS = $(liboctinterp_la_CPPFLAGS) $(FFTW_XCPPFLAGS)