Mercurial > octave-nkf
comparison libinterp/Makefile.am @ 19311:18a3eaf7bdf0
make --with-PKG-includedir and --with-PKG-libdir configure options work again
* common.mk (ALL_CPPFLAGS): Delete unused variable.
* liboctave/Makefile.am, libcruft/Makefile.am (AM_CPPFLAGS):
Append relevant individual PKG_CPPFLAGS variables.
* oct-hdf5.h: Check HAVE_HDF5_H instead of HAVE_HDF5 to decide whether
to include hdf5.h.
* libgui/graphics/module.mk (graphics_libgui_graphics_la_CPPFLAGS):
Include HDF5_CPPFLAGS in the list.
* libgui/src/module.mk (graphics_libgui_src_la_CPPFLAGS): Include
HDF5_CPPFLAGS in the list.
author | John W. Eaton <jwe@octave.org> |
---|---|
date | Tue, 21 Oct 2014 14:37:44 -0400 |
parents | 3cad99b56fa7 |
children | 4b8b942ef8db |
comparison
equal
deleted
inserted
replaced
19310:1fa328da03ef | 19311:18a3eaf7bdf0 |
---|---|
30 -I$(top_srcdir)/liboctave/util \ | 30 -I$(top_srcdir)/liboctave/util \ |
31 -I$(srcdir)/octave-value \ | 31 -I$(srcdir)/octave-value \ |
32 -I$(srcdir)/operators \ | 32 -I$(srcdir)/operators \ |
33 -Iparse-tree -I$(srcdir)/parse-tree \ | 33 -Iparse-tree -I$(srcdir)/parse-tree \ |
34 -Icorefcn -I$(srcdir)/corefcn \ | 34 -Icorefcn -I$(srcdir)/corefcn \ |
35 -I$(top_builddir)/libgnu -I$(top_srcdir)/libgnu | 35 -I$(top_builddir)/libgnu -I$(top_srcdir)/libgnu \ |
36 $(FT2_CPPFLAGS) \ | |
37 $(HDF5_CPPFLAGS) \ | |
38 $(Z_CPPFLAGS) \ | |
39 $(FFTW_XCPPFLAGS) \ | |
40 $(LLVM_CPPFLAGS) | |
36 | 41 |
37 AM_CFLAGS += $(WARN_CFLAGS) | 42 AM_CFLAGS += $(WARN_CFLAGS) |
38 | 43 |
39 AM_CXXFLAGS += $(WARN_CXXFLAGS) | 44 AM_CXXFLAGS += $(WARN_CXXFLAGS) |
40 | 45 |