Mercurial > octave
changeset 22102:3b2198c3013b
maint: delete unused build rules for legacy doc string files
* libinterp/corefcn/module.mk (COREFCN_FT2_DF): Delete definition and
associated build pattern rule for .df files.
* libinterp/octave-value/module.mk (OV_JAVA_DF): Delete definition and
associated build pattern rule for .df files.
* libinterp/dldfcn/config-module.awk: Don't emit .df targets for .oct files.
| author | Mike Miller <mtmiller@octave.org> |
|---|---|
| date | Wed, 13 Jul 2016 15:43:28 -0700 |
| parents | 4e770056f74a |
| children | 9811e7875d52 |
| files | libinterp/corefcn/module.mk libinterp/dldfcn/config-module.awk libinterp/octave-value/module.mk |
| diffstat | 3 files changed, 0 insertions(+), 44 deletions(-) [+] |
line wrap: on
line diff
--- a/libinterp/corefcn/module.mk Wed Jul 13 13:36:36 2016 -0400 +++ b/libinterp/corefcn/module.mk Wed Jul 13 15:43:28 2016 -0700 @@ -261,30 +261,6 @@ $(JIT_SRC) \ $(NOINSTALL_COREFCN_INC) -COREFCN_FT2_DF = \ - libinterp/corefcn/graphics.df \ - libinterp/corefcn/gl-render.df \ - libinterp/corefcn/toplev.df \ - libinterp/corefcn/txt-eng-ft.df - -## 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 FreeType .df files so that not all .df files are built -## with FT2_CPPFLAGS, FONTCONFIG_CPPFLAGS -$(COREFCN_FT2_DF) : libinterp/corefcn/%.df : libinterp/corefcn/%.cc $(GENERATED_MAKE_BUILTINS_INCS) octave-config.h | libinterp/corefcn/$(octave_dirstamp) - $(AM_V_GEN)rm -f $@-t $@-t1 $@ && \ - $(CXXCPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(libinterp_corefcn_libcorefcn_la_CPPFLAGS) $(CPPFLAGS) \ - $(libinterp_corefcn_libcorefcn_la_CXXFLAGS) $(CXXFLAGS) \ - -DMAKE_BUILTINS $< > $@-t1 && \ - $(SHELL) $(srcdir)/libinterp/mkdefs $(srcdir)/libinterp $< < $@-t1 > $@-t && \ - rm -f $@-t1 && \ - mv $@-t $@ - ## Special rules for sources which must be built before rest of compilation. libinterp/corefcn/defaults.h: libinterp/corefcn/defaults.in.h build-aux/subst-default-vals.sh | libinterp/corefcn/$(octave_dirstamp)
--- a/libinterp/dldfcn/config-module.awk Wed Jul 13 13:36:36 2016 -0400 +++ b/libinterp/dldfcn/config-module.awk Wed Jul 13 15:43:28 2016 -0700 @@ -55,8 +55,6 @@ basename, files[i]); if (cppflags[i]) { - printf ("libinterp/dldfcn/%s.df: CPPFLAGS += %s\n", - basename, cppflags[i]); printf ("libinterp_dldfcn_%s_la_CPPFLAGS = $(libinterp_liboctinterp_la_CPPFLAGS) %s\n", basename, cppflags[i]); }
--- a/libinterp/octave-value/module.mk Wed Jul 13 13:36:36 2016 -0400 +++ b/libinterp/octave-value/module.mk Wed Jul 13 15:43:28 2016 -0700 @@ -133,24 +133,6 @@ libinterp/octave-value/ov-base-scalar.cc \ libinterp/octave-value/ov-base-sparse.cc -OV_JAVA_DF = \ - libinterp/octave-value/ov.df \ - libinterp/octave-value/ov-class.df \ - libinterp/octave-value/ov-java.df \ - libinterp/octave-value/ov-typeinfo.df - -## Special rules for Java .df files so that not all .df files are built with -## JAVA_CPPFLAGS -$(OV_JAVA_DF) : libinterp/octave-value/%.df : libinterp/octave-value/%.cc $(GENERATED_MAKE_BUILTINS_INCS) octave-config.h - $(AM_V_GEN)rm -f $@-t $@-t1 $@ && \ - $(CXXCPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(libinterp_octave_value_liboctave_value_la_CPPFLAGS) $(JAVA_CPPFLAGS) $(CPPFLAGS) \ - $(libinterp_octave_value_liboctave_value_la_CXXFLAGS) $(CXXFLAGS) \ - -DMAKE_BUILTINS $< > $@-t1 && \ - $(SHELL) $(srcdir)/libinterp/mkdefs $(srcdir)/libinterp $< < $@-t1 > $@-t && \ - mv $@-t $@ && \ - rm -f $@-t1 - noinst_LTLIBRARIES += libinterp/octave-value/liboctave-value.la libinterp_octave_value_liboctave_value_la_SOURCES = $(OCTAVE_VALUE_SRC)