Mercurial > octave-nkf
diff libinterp/Makefile.am @ 17816:e6317049225b
build: Remove FreeType and Fontconfig CPPFLAGS from XTRA_CXXFLAGS.
* build-aux/common.mk: New alias FONTCONFIG_CPPFLAGS for FONTCONFIG_CFLAGS.
Add FONTCONFIG_CFLAGS to build variables. New alias FT2_CPPFLAGS for
FT2_CFLAGS
* configure.ac: Don't add FT2_CFLAGS and FONTCONFIG_CFLAGS to XTRA_CXXFLAGS
variable.
* libinterp/Makefile.am: Add FT2_CPPFLAGS and FONTCONFIG_CPPFLAGS to rule
that creates *.df file from *.cc file.
* libinterp/corefcn/module.mk: Add FT2_CPPFLAGS and FONTCONFIG_CPPFLAGS to
corefcn convenience library CPPFLAGS.
* libinterp/corefcn/toplev.cc: Add new FONTCONFIG_CFLAGS to OCTAVE_CONF variable.
* libinterp/dldfcn/module-files: Add FT2_CPPFLAGS and FONTCONFIG_CPPFLAGS to
__init_gnuplot__.cc build. This is required because of #include "graphics.h".
* libinterp/oct-conf.in.h: Add new FONTCONFIG_CFLAGS to OCTAVE_CONF variable.
author | Rik <rik@octave.org> |
---|---|
date | Thu, 31 Oct 2013 13:13:25 -0700 |
parents | 9244d2a908fd |
children | 3488d987eb50 |
line wrap: on
line diff
--- a/libinterp/Makefile.am Thu Oct 31 20:56:37 2013 +0100 +++ b/libinterp/Makefile.am Thu Oct 31 13:13:25 2013 -0700 @@ -237,7 +237,8 @@ ## FIXME -- Shouldn't the build stop if CPP fails here? %.df: %.cc $(CXXCPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(JAVA_CPPFLAGS) $(CPPFLAGS) \ + $(AM_CPPFLAGS) $(JAVA_CPPFLAGS) $(FT2_CPPFLAGS) $(FONTCONFIG_CPPFLAGS) \ + $(CPPFLAGS) \ $(AM_CXXFLAGS) $(CXXFLAGS) \ -DMAKE_BUILTINS $< | $(srcdir)/mkdefs $(srcdir) $< > $@-t mv $@-t $@