Mercurial > octave-nkf

diff 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
line wrap: on
line diff
--- a/libgui/src/module.mk	Tue Oct 21 09:57:02 2014 -0700
+++ b/libgui/src/module.mk	Tue Oct 21 14:37:44 2014 -0400
@@ -176,8 +176,9 @@
 
 src_libgui_src_la_CPPFLAGS = \
   $(AM_CPPFLAGS) \
-  $(FT2_CFLAGS) \
+  $(FT2_CPPFLAGS) \
   $(FONTCONFIG_CPPFLAGS) \
+  $(HDF5_CPPFLAGS) \
   @OCTGUI_DLL_DEFS@ \
   @QT_CPPFLAGS@ \
   -I$(srcdir)/qterminal/libqterminal \