Mercurial > octave-nkf

comparison libgui/src/module.mk @ 19311:18a3eaf7bdf0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 086093fbdc1a
children ef3d0cf7aed5
comparison
equal deleted inserted replaced
19310:1fa328da03ef 19311:18a3eaf7bdf0
174 174
175 nodist_src_libgui_src_la_SOURCES = $(octave_gui_MOC) $(octave_gui_RC) 175 nodist_src_libgui_src_la_SOURCES = $(octave_gui_MOC) $(octave_gui_RC)
176 176
177 src_libgui_src_la_CPPFLAGS = \ 177 src_libgui_src_la_CPPFLAGS = \
178 $(AM_CPPFLAGS) \ 178 $(AM_CPPFLAGS) \
179 $(FT2_CFLAGS) \ 179 $(FT2_CPPFLAGS) \
180 $(FONTCONFIG_CPPFLAGS) \ 180 $(FONTCONFIG_CPPFLAGS) \
181 $(HDF5_CPPFLAGS) \
181 @OCTGUI_DLL_DEFS@ \ 182 @OCTGUI_DLL_DEFS@ \
182 @QT_CPPFLAGS@ \ 183 @QT_CPPFLAGS@ \
183 -I$(srcdir)/qterminal/libqterminal \ 184 -I$(srcdir)/qterminal/libqterminal \
184 -Isrc -I$(srcdir)/src \ 185 -Isrc -I$(srcdir)/src \
185 -I$(srcdir)/src/m-editor \ 186 -I$(srcdir)/src/m-editor \