Mercurial > jwe > octave
changeset 22074:5a0eea960bdb
build: fix typo of $(octave_dirstamp) in build prerequisites
* libgui/src/module.mk: Fix occurrences of $(octave-dirstamp) typo.
* libinterp/corefcn/module.mk: Fix occurrences of $(octave-dirstamp) typo.
(DIRSTAMP_FILES): Include libinterp/corefcn/$(octave_dirstamp) in the list.
* libinterp/module.mk: Fix occurrences of $(octave-dirstamp) typo.
(DIRSTAMP_FILES): Include libinterp/$(octave_dirstamp) in the list.
* liboctave/module.mk: Fix occurrences of $(octave-dirstamp) typo.
(DIRSTAMP_FILES): Include liboctave/$(octave_dirstamp) in the list.
* scripts/module.mk: Fix occurrences of $(octave-dirstamp) typo.
(DIRSTAMP_FILES): Include scripts/$(octave_dirstamp) in the list.
* src/module.mk: Fix occurrences of $(octave-dirstamp) typo.
author | Mike Miller <mtmiller@octave.org> |
---|---|
date | Thu, 07 Jul 2016 16:11:47 -0700 |
parents | d18c63a45070 |
children | 7a4897e07727 |
files | libgui/src/module.mk libinterp/corefcn/module.mk libinterp/module.mk liboctave/module.mk scripts/module.mk src/module.mk |
diffstat | 6 files changed, 28 insertions(+), 21 deletions(-) [+] |
line wrap: on
line diff
--- a/libgui/src/module.mk Thu Jul 07 18:24:50 2016 -0400 +++ b/libgui/src/module.mk Thu Jul 07 16:11:47 2016 -0700 @@ -234,7 +234,7 @@ $(octave_gui_RC) \ libgui/src/liboctgui-build-info.cc -libgui/src/liboctgui-build-info.cc: libgui/src/liboctgui-build-info.in.cc HG-ID | libgui/src/$(octave-dirstamp) +libgui/src/liboctgui-build-info.cc: libgui/src/liboctgui-build-info.in.cc HG-ID | libgui/src/$(octave_dirstamp) $(AM_V_GEN)rm -f $@-t && \ $(SED) \ -e "s|%NO_EDIT_WARNING%|DO NOT EDIT! Generated automatically by Makefile|" \
--- a/libinterp/corefcn/module.mk Thu Jul 07 18:24:50 2016 -0400 +++ b/libinterp/corefcn/module.mk Thu Jul 07 16:11:47 2016 -0700 @@ -7,13 +7,15 @@ libinterp/corefcn/LSODE-opts.cc \ libinterp/corefcn/Quad-opts.cc -$(OPT_HANDLERS): libinterp/corefcn/%.cc : liboctave/numeric/%.in | libinterp/corefcn/$(octave-dirstamp) +$(OPT_HANDLERS): libinterp/corefcn/%.cc : liboctave/numeric/%.in | libinterp/corefcn/$(octave_dirstamp) $(AM_V_GEN)rm -f $@-t $@ && \ $(PERL) $(srcdir)/build-aux/mk-opts.pl --opt-handler-fcns $< > $@-t && \ mv $@-t $@ $(OPT_HANDLERS): $(srcdir)/build-aux/mk-opts.pl +DIRSTAMP_FILES += libinterp/corefcn/$(octave_dirstamp) + JIT_INC = \ libinterp/corefcn/jit-util.h \ libinterp/corefcn/jit-typeinfo.h \ @@ -269,7 +271,7 @@ ## 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) +$(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) \ @@ -281,20 +283,20 @@ ## 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) +libinterp/corefcn/defaults.h: libinterp/corefcn/defaults.in.h build-aux/subst-default-vals.sh | libinterp/corefcn/$(octave_dirstamp) $(AM_V_GEN)$(call simple-filter-rule,build-aux/subst-default-vals.sh) -libinterp/corefcn/graphics.h: libinterp/corefcn/graphics.in.h libinterp/genprops.awk | libinterp/corefcn/$(octave-dirstamp) +libinterp/corefcn/graphics.h: libinterp/corefcn/graphics.in.h libinterp/genprops.awk | libinterp/corefcn/$(octave_dirstamp) $(AM_V_GEN)rm -f $@-t && \ $(AWK) -f $(srcdir)/libinterp/genprops.awk $< > $@-t && \ mv $@-t $@ -libinterp/corefcn/graphics-props.cc: libinterp/corefcn/graphics.in.h libinterp/genprops.awk | libinterp/corefcn/$(octave-dirstamp) +libinterp/corefcn/graphics-props.cc: libinterp/corefcn/graphics.in.h libinterp/genprops.awk | libinterp/corefcn/$(octave_dirstamp) $(AM_V_GEN)rm -f $@-t && \ $(AWK) -v emit_graphics_props=1 -f $(srcdir)/libinterp/genprops.awk $< > $@-t && \ mv $@-t $@ -libinterp/corefcn/oct-errno.cc: libinterp/corefcn/oct-errno.in.cc | libinterp/corefcn/$(octave-dirstamp) +libinterp/corefcn/oct-errno.cc: libinterp/corefcn/oct-errno.in.cc | libinterp/corefcn/$(octave_dirstamp) $(AM_V_GEN)rm -f $@-t && \ if test -n "$(PERL)"; then \ $(SHELL) $(srcdir)/libinterp/mk-errno-list --perl "$(PERL)" < $< > $@-t; \ @@ -305,15 +307,15 @@ fi && \ mv $@-t $@ -libinterp/corefcn/mxarray.h: libinterp/corefcn/mxarray.in.h build-aux/mk-mxarray-h.sh | libinterp/corefcn/$(octave-dirstamp) +libinterp/corefcn/mxarray.h: libinterp/corefcn/mxarray.in.h build-aux/mk-mxarray-h.sh | libinterp/corefcn/$(octave_dirstamp) $(AM_V_GEN)$(call simple-filter-rule,build-aux/mk-mxarray-h.sh) -libinterp/corefcn/oct-tex-lexer.ll: libinterp/corefcn/oct-tex-lexer.in.ll libinterp/corefcn/oct-tex-symbols.in | libinterp/corefcn/$(octave-dirstamp) +libinterp/corefcn/oct-tex-lexer.ll: libinterp/corefcn/oct-tex-lexer.in.ll libinterp/corefcn/oct-tex-symbols.in | libinterp/corefcn/$(octave_dirstamp) $(AM_V_GEN)rm -f $@-t && \ $(AWK) 'BEGIN { print "/* DO NOT EDIT. AUTOMATICALLY GENERATED FROM oct-tex-lexer.in.ll and oct-tex-symbols.in. */"; } /^@SYMBOL_RULES@$$/ { count = 0; while (getline < "$(srcdir)/libinterp/corefcn/oct-tex-symbols.in") { if ($$0 !~ /^#.*/ && NF == 3) { printf("\"\\\\%s\" { yylval->sym = %d; return SYM; }\n", $$1, count); count++; } } getline } ! /^@SYMBOL_RULES@$$/ { print }' $< > $@-t && \ mv $@-t $@ -libinterp/corefcn/oct-tex-symbols.cc: libinterp/corefcn/oct-tex-symbols.in | libinterp/corefcn/$(octave-dirstamp) +libinterp/corefcn/oct-tex-symbols.cc: libinterp/corefcn/oct-tex-symbols.in | libinterp/corefcn/$(octave_dirstamp) $(AM_V_GEN)rm -f $@-t && \ $(AWK) 'BEGIN { print "// DO NOT EDIT. AUTOMATICALLY GENERATED FROM oct-tex-symbols.in."; print "static uint32_t symbol_codes[][2] = {"; count = 0; } END { print "};"; printf("static int num_symbol_codes = %d;\n", count); } !/^#/ && (NF == 3) { printf(" { %s, %s },\n", $$2, $$3); count++; }' $< > $@-t && \ mv $@-t $@
--- a/libinterp/module.mk Thu Jul 07 18:24:50 2016 -0400 +++ b/libinterp/module.mk Thu Jul 07 16:11:47 2016 -0700 @@ -228,18 +228,18 @@ ## Special rules: ## Mostly for sources which must be built before rest of compilation. -libinterp/build-env.cc: libinterp/build-env.in.cc build-aux/subst-config-vals.sh | libinterp/$(octave-dirstamp) +libinterp/build-env.cc: libinterp/build-env.in.cc build-aux/subst-config-vals.sh | libinterp/$(octave_dirstamp) $(AM_V_GEN)$(call simple-filter-rule,build-aux/subst-config-vals.sh) -libinterp/build-env-features.cc: config.h libinterp/build-env-features.sh | libinterp/$(octave-dirstamp) +libinterp/build-env-features.cc: config.h libinterp/build-env-features.sh | libinterp/$(octave_dirstamp) $(AM_V_GEN)rm -f $@-t && \ $(SHELL) $(srcdir)/libinterp/build-env-features.sh $< > $@-t && \ mv $@-t $@ -libinterp/version.h: libinterp/version.in.h build-aux/mk-version-h.sh | libinterp/$(octave-dirstamp) +libinterp/version.h: libinterp/version.in.h build-aux/mk-version-h.sh | libinterp/$(octave_dirstamp) $(AM_V_GEN)$(call simple-filter-rule,build-aux/mk-version-h.sh) -libinterp/liboctinterp-build-info.cc: libinterp/liboctinterp-build-info.in.cc HG-ID | libinterp/$(octave-dirstamp) +libinterp/liboctinterp-build-info.cc: libinterp/liboctinterp-build-info.in.cc HG-ID | libinterp/$(octave_dirstamp) $(AM_V_GEN)rm -f $@-t && \ $(SED) \ -e "s|%NO_EDIT_WARNING%|DO NOT EDIT! Generated automatically by Makefile|" \ @@ -252,12 +252,12 @@ mkbuiltins_dld_opt = --disable-dl endif -libinterp/builtins.cc: $(ALL_DEFUN_FILES) libinterp/mkbuiltins | libinterp/$(octave-dirstamp) +libinterp/builtins.cc: $(ALL_DEFUN_FILES) libinterp/mkbuiltins | libinterp/$(octave_dirstamp) $(AM_V_GEN)rm -f $@-t && \ $(SHELL) $(srcdir)/libinterp/mkbuiltins "$(srcdir)" --source $(mkbuiltins_dld_opt) $(ALL_DEFUN_FILES) > $@-t && \ mv $@-t $@ -libinterp/builtin-defun-decls.h: $(ALL_DEFUN_FILES) libinterp/mkbuiltins | libinterp/$(octave-dirstamp) +libinterp/builtin-defun-decls.h: $(ALL_DEFUN_FILES) libinterp/mkbuiltins | libinterp/$(octave_dirstamp) $(AM_V_GEN)rm -f $@-t && \ $(SHELL) $(srcdir)/libinterp/mkbuiltins "$(srcdir)" --header $(mkbuiltins_dld_opt) $(ALL_DEFUN_FILES) > $@-t && \ $(simple_move_if_change_rule) @@ -265,7 +265,7 @@ if AMCOND_ENABLE_DYNAMIC_LINKING DLDFCN_PKG_ADD_FILE = libinterp/dldfcn/PKG_ADD -libinterp/dldfcn/PKG_ADD: $(DLDFCN_DEFUN_FILES) libinterp/mk-pkg-add | libinterp/$(octave-dirstamp) +libinterp/dldfcn/PKG_ADD: $(DLDFCN_DEFUN_FILES) libinterp/mk-pkg-add | libinterp/$(octave_dirstamp) $(AM_V_GEN)rm -f $@-t && \ $(SHELL) $(srcdir)/libinterp/mk-pkg-add "$(srcdir)" $(DLDFCN_DEFUN_FILES) > $@-t && \ mv $@-t $@ @@ -273,7 +273,7 @@ DOCSTRING_FILES += $(srcdir)/libinterp/DOCSTRINGS -$(srcdir)/libinterp/DOCSTRINGS: $(ALL_DEFUN_FILES) | libinterp/$(octave-dirstamp) +$(srcdir)/libinterp/DOCSTRINGS: $(ALL_DEFUN_FILES) | libinterp/$(octave_dirstamp) $(AM_V_GEN)rm -f libinterp/DOCSTRINGS-t && \ $(PERL) $(srcdir)/libinterp/gendoc.pl "$(srcdir)" $(ALL_DEFUN_FILES) > libinterp/DOCSTRINGS-t && \ $(call move_if_change_rule,libinterp/DOCSTRINGS-t,$@) @@ -282,6 +282,8 @@ $(OCT_FILES) \ $(DLDFCN_PKG_ADD_FILE) +DIRSTAMP_FILES += libinterp/$(octave_dirstamp) + install-data-hook: install-oct install-built-in-docstrings uninstall-local: uninstall-oct uninstall-built-in-docstrings
--- a/liboctave/module.mk Thu Jul 07 18:24:50 2016 -0400 +++ b/liboctave/module.mk Thu Jul 07 16:11:47 2016 -0700 @@ -110,13 +110,14 @@ nobase_liboctavetests_DATA = $(LIBOCTAVE_TST_FILES) -liboctave/liboctave-build-info.cc: liboctave/liboctave-build-info.in.cc HG-ID | liboctave/$(octave-dirstamp) +liboctave/liboctave-build-info.cc: liboctave/liboctave-build-info.in.cc HG-ID | liboctave/$(octave_dirstamp) $(AM_V_GEN)rm -f $@-t && \ $(SED) \ -e "s|%NO_EDIT_WARNING%|DO NOT EDIT! Generated automatically by Makefile|" \ -e "s|%OCTAVE_HG_ID%|$(HG_ID_VAR)|" $< > $@-t && \ $(simple_move_if_change_rule) +DIRSTAMP_FILES += liboctave/$(octave_dirstamp) EXTRA_DIST += $(liboctave_EXTRA_DIST)
--- a/scripts/module.mk Thu Jul 07 18:24:50 2016 -0400 +++ b/scripts/module.mk Thu Jul 07 16:11:47 2016 -0700 @@ -106,11 +106,13 @@ DOCSTRING_FILES += $(srcdir)/scripts/DOCSTRINGS -$(srcdir)/scripts/DOCSTRINGS: $(FCN_FILES) $(GEN_FCN_FILES_IN) | scripts/$(octave-dirstamp) +$(srcdir)/scripts/DOCSTRINGS: $(FCN_FILES) $(GEN_FCN_FILES_IN) | scripts/$(octave_dirstamp) $(AM_V_GEN)rm -f scripts/DOCSTRINGS-t && \ $(PERL) $(srcdir)/scripts/mkdoc.pl "$(srcdir)" $(FCN_FILES) $(GEN_FCN_FILES_IN) > scripts/DOCSTRINGS-t && \ $(call move_if_change_rule,scripts/DOCSTRINGS-t,$@) +DIRSTAMP_FILES += scripts/$(octave_dirstamp) + check-m-sources: @echo "checking whether files in source tree are listed in module.mk files..."; \ for f in $$(find $(srcdir)/scripts -name '*.m'); do \
--- a/src/module.mk Thu Jul 07 18:24:50 2016 -0400 +++ b/src/module.mk Thu Jul 07 16:11:47 2016 -0700 @@ -206,7 +206,7 @@ src/main.cc: src/main.in.cc build-aux/subst-default-vals.sh | src/$(octave_dirstamp) $(AM_V_GEN)$(call simple-filter-rule,build-aux/subst-default-vals.sh) -src/octave-build-info.cc: src/octave-build-info.in.cc HG-ID | src/$(octave-dirstamp) +src/octave-build-info.cc: src/octave-build-info.in.cc HG-ID | src/$(octave_dirstamp) $(AM_V_GEN)rm -f $@-t && \ $(SED) \ -e "s|%NO_EDIT_WARNING%|DO NOT EDIT! Generated automatically by Makefile|" \