Mercurial > hg > octave-nkf
comparison liboctave/array/module.mk @ 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 | 3087dc835497 |
children | 5b263e517c95 |
comparison
equal
deleted
inserted
replaced
19472:98a18bc3208e | 19473:4b8b942ef8db |
---|---|
137 noinst_LTLIBRARIES += array/libarray.la | 137 noinst_LTLIBRARIES += array/libarray.la |
138 | 138 |
139 array_libarray_la_SOURCES = $(ARRAY_SRC) | 139 array_libarray_la_SOURCES = $(ARRAY_SRC) |
140 array_libarray_la_CPPFLAGS = \ | 140 array_libarray_la_CPPFLAGS = \ |
141 $(liboctave_la_CPPFLAGS) \ | 141 $(liboctave_la_CPPFLAGS) \ |
142 $(FFTW_XCPPFLAGS) \ | |
142 $(SPARSE_XCPPFLAGS) | 143 $(SPARSE_XCPPFLAGS) |
143 | 144 |
144 liboctave_la_LIBADD += array/libarray.la | 145 liboctave_la_LIBADD += array/libarray.la |