Mercurial > hg > octave-lyh

changeset 15413:3dcd96e1f657

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
build: Comment and add FIXME notes for automake rules which never fire. * interp-core/module.mk: Comment out extra CPPFLAGS rule for display.lo. Add FIXME note on how to resolve this. * parse-tree/module.mk: Comment out AM_CXXFLAGS filter rule for lex.lo, oct-parse.lo. Add FIXME note on how to resolve this.
author Rik <rik@octave.org>
date Tue, 18 Sep 2012 11:33:48 -0700
parents 9128fa93fb21
children 494f9bac8862
files libinterp/interp-core/module.mk libinterp/parse-tree/module.mk
diffstat 2 files changed, 11 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/libinterp/interp-core/module.mk
+++ b/libinterp/interp-core/module.mk
@@ -111,8 +111,11 @@
   $(JIT_SRC) \
   $(C_INTERP_CORE_SRC)
 
-## FIXME: I don't believe this rule actually fires
-display.df display.lo: CPPFLAGS += $(X11_FLAGS)
+## FIXME: Automake does not support per-object rules.
+##        These rules could be emulated by creating a new convenience
+##        library and using per-library rules.  Or we can just live
+##        without the rule since there haven't been any problems. (09/18/2012)
+#display.df display.lo: CPPFLAGS += $(X11_FLAGS)
 
 ## Special rules for sources which must be built before rest of compilation.
 interp-core/oct-errno.cc: interp-core/oct-errno.in.cc Makefile
--- a/libinterp/parse-tree/module.mk
+++ b/libinterp/parse-tree/module.mk
@@ -11,8 +11,12 @@
   parse-tree/lex.ll \
   parse-tree/oct-parse.yy
 
-lex.lo lex.o oct-parse.lo oct-parse.o: \
-  AM_CXXFLAGS := $(filter-out -Wold-style-cast, $(AM_CXXFLAGS))
+## FIXME: Automake does not support per-object rules.
+##        These rules could be emulated by creating a new convenience
+##        library and using per-library rules.  Or we can just live
+##        with the extra warnings about old-sytle-casts. (09/18/2012)
+#lex.lo lex.o oct-parse.lo oct-parse.o: \
+#  AM_CXXFLAGS := $(filter-out -Wold-style-cast, $(AM_CXXFLAGS))
 
 PARSE_TREE_INC = \
   parse-tree/pt-all.h \