Mercurial > octave

diff liboctave/Makefile.am @ 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 5546fe4dd77f
children fcdc284f96ef
line wrap: on
line diff
--- a/liboctave/Makefile.am	Tue Sep 18 15:41:58 2012 -0700
+++ b/liboctave/Makefile.am	Wed Sep 19 10:05:15 2012 -0700
@@ -85,18 +85,11 @@
 ## It has no source code itself.
 liboctave_la_SOURCES = 
 
-## FIXME: SPARSE, FFTW, and ARPACK flags should probably only be in the
-##        particular convenience library that needs them.  
-liboctave_la_CPPFLAGS = \
-  @OCTAVE_DLL_DEFS@ \
-  $(SPARSE_XCPPFLAGS) \
-  $(FFTW_XCPPFLAGS) \
-  $(ARPACK_CPPFLAGS) \
-  $(AM_CPPFLAGS)
+liboctave_la_CPPFLAGS = @OCTAVE_DLL_DEFS@ $(AM_CPPFLAGS)
 
 include link-deps.mk
 
-# Dummy C++ source to cause C++ linking.
+# Dummy C++ source to force C++ linking.
 nodist_EXTRA_liboctave_la_SOURCES = dummy.cc
 
 liboctave_la_LIBADD = \