Mercurial > hg > octave-nkf
changeset 19473:4b8b942ef8db
limit specific CPPFLAGS variables to specific convenience libs (bug #38928)
* libinterp/Makefile.am (AM_CPPFLAGS): Remove $(FT2_CPPFLAGS),
$(HDF5_CPPFLAGS), $(Z_CPPFLAGS), $(FFTW_XCPPFLAGS), and
$(LLVM_CPPFLAGS) from the list.
* liboctave/Makefile.am (AM_CPPFLAGS): Remove $(CURL_CPPFLAGS),
$(SPARSE_XCPPFLAGS), $(ARPACK_CPPFLAGS), $(QRUPDATE_CPPFLAGS), and
$(FFTW_XCPPFLAGS) from the list.
* libinterp/corefcn/module.mk (corefcn_libcorefcn_la_CPPFLAGS):
Include $(Z_CPPFLAGS) in the list.
* liboctave/array/module.mk (array_libarray_la_CPPFLAGS): Include
$(FFTW_XCPPFLAGS) in the list.
* liboctave/numeric/module.mk (numeric_libnumeric_la_CPPFLAGS): Remove
$(ARPACK_CPPFLAGS) from the list.
* liboctave/util/module.mk (util_libutil_la_CPPFLAGS): Include
$(CURL_CPPFLAGS) in the list.
author | John W. Eaton <jwe@octave.org> |
---|---|
date | Thu, 23 Oct 2014 17:12:58 -0400 |
parents | 98a18bc3208e |
children | a834b3151c7e |
files | libinterp/Makefile.am libinterp/corefcn/module.mk liboctave/Makefile.am liboctave/array/module.mk liboctave/numeric/module.mk liboctave/util/module.mk |
diffstat | 6 files changed, 7 insertions(+), 13 deletions(-) [+] |
line wrap: on
line diff
--- a/libinterp/Makefile.am +++ b/libinterp/Makefile.am @@ -33,11 +33,7 @@ -Iparse-tree -I$(srcdir)/parse-tree \ -Icorefcn -I$(srcdir)/corefcn \ -I$(top_builddir)/libgnu -I$(top_srcdir)/libgnu \ - $(FT2_CPPFLAGS) \ - $(HDF5_CPPFLAGS) \ - $(Z_CPPFLAGS) \ - $(FFTW_XCPPFLAGS) \ - $(LLVM_CPPFLAGS) + $(HDF5_CPPFLAGS) AM_CFLAGS += $(WARN_CFLAGS)
--- a/libinterp/corefcn/module.mk +++ b/libinterp/corefcn/module.mk @@ -341,7 +341,9 @@ $(FONTCONFIG_CPPFLAGS) \ $(FT2_CPPFLAGS) \ $(HDF5_CPPFLAGS) \ - $(LLVM_CPPFLAGS) + $(LLVM_CPPFLAGS) \ + $(Z_CPPFLAGS) + corefcn_libcorefcn_la_CXXFLAGS = $(AM_CXXFLAGS) $(LLVM_CXXFLAGS) corefcn_libtex_parser_la_SOURCES = $(TEX_PARSER_SRC)
--- a/liboctave/Makefile.am +++ b/liboctave/Makefile.am @@ -28,12 +28,7 @@ -Ioperators -I$(srcdir)/operators \ -I$(srcdir)/system \ -I$(srcdir)/util \ - -I$(top_builddir)/libgnu -I$(top_srcdir)/libgnu \ - $(CURL_CPPFLAGS) \ - $(SPARSE_XCPPFLAGS) \ - $(ARPACK_CPPFLAGS) \ - $(QRUPDATE_CPPFLAGS) \ - $(FFTW_XCPPFLAGS) + -I$(top_builddir)/libgnu -I$(top_srcdir)/libgnu AM_CFLAGS += $(WARN_CFLAGS)
--- a/liboctave/array/module.mk +++ b/liboctave/array/module.mk @@ -139,6 +139,7 @@ array_libarray_la_SOURCES = $(ARRAY_SRC) array_libarray_la_CPPFLAGS = \ $(liboctave_la_CPPFLAGS) \ + $(FFTW_XCPPFLAGS) \ $(SPARSE_XCPPFLAGS) liboctave_la_LIBADD += array/libarray.la