Mercurial > octave-nkf

diff liboctave/numeric/module.mk @ 15416:a0fb36acbd0d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
build: Only use extra CPPFLAGS in the convenience libraries that need them. * liboctave/Makefile.am: Remove XCPPFLAGS from liboctave_la_CPPFLAGS. * liboctave/array/module.mk: Add SPARSE_XCPPFLAGS to convenience library CPPFLAGS. * liboctave/cruft/Makefile.am: Place all CPPFLAGS on one line. * liboctave/numeric/module.mk: Add ARPACK_CPPFLAGS, FFTW_XCPPFLAGS, SPARSE_XCPPFLAGS to convenience library CPPFLAGS. * liboctave/util/module.mk: Add SPARSE_XCPPFLAGS to convenience library CPPFLAGS.
author Rik <rik@octave.org>
date Wed, 19 Sep 2012 10:05:15 -0700
parents 648dabbb4c6b
children 2fac72a256ce
line wrap: on
line diff
--- a/liboctave/numeric/module.mk	Tue Sep 18 15:41:58 2012 -0700
+++ b/liboctave/numeric/module.mk	Wed Sep 19 10:05:15 2012 -0700
@@ -1,5 +1,5 @@
 EXTRA_DIST += \
-	numeric/module.mk \
+  numeric/module.mk \
   $(OPT_IN)
 
 OPT_INC = \
@@ -156,7 +156,7 @@
   numeric/SparsedbleCHOL.cc \
   numeric/SparsedbleLU.cc \
   numeric/SparseQR.cc \
-	$(NUMERIC_C_SRC)
+  $(NUMERIC_C_SRC)
 
 TEMPLATE_SRC += \
   numeric/base-lu.cc \
@@ -176,5 +176,9 @@
 noinst_LTLIBRARIES += numeric/libnumeric.la
 
 numeric_libnumeric_la_SOURCES = $(NUMERIC_SRC)
-numeric_libnumeric_la_CPPFLAGS = $(liboctave_la_CPPFLAGS)
+numeric_libnumeric_la_CPPFLAGS = \
+  $(liboctave_la_CPPFLAGS) \
+  $(ARPACK_CPPFLAGS) \
+  $(FFTW_XCPPFLAGS) \
+  $(SPARSE_XCPPFLAGS)