Mercurial > octave-nkf
diff libinterp/corefcn/module.mk @ 19315: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 | d20c81d3cd21 |
children | e72052d96a13 |
line wrap: on
line diff
--- a/libinterp/corefcn/module.mk Wed Oct 22 11:37:00 2014 -0700 +++ b/libinterp/corefcn/module.mk Thu Oct 23 17:12:58 2014 -0400 @@ -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)