Mercurial > octave
diff libinterp/corefcn/module.mk @ 23709:3b68aeeabc40
rename some build scripts for consistency and move them to where they are used
* libgui/mk-default-qt-settings.in.sh: Rename from
build-aux/mk-default-qt-settings.in.sh.
* libinterp/mk-doc.pl: Rename from libinterp/gendoc.pl.
* libinterp/operators/mk-ops.sh: Rename from libinterp/mkops.
* scripts/mk-doc.pl: Rename from scripts/mkdoc.pl.
* libinterp/mk-builtins.pl: Rename from build-aux/mk-builtins.pl.
* liboctave/external/mk-f77-def.in.sh: Rename from
build-aux/mk-f77-def.in.sh.
* libinterp/corefcn/mk-mxarray-h.in.sh: Rename from
build-aux/mk-mxarray-h.in.sh.
* libinterp/mk-version-h.in.sh: Rename from
build-aux/mk-version-h.in.sh.
* libinterp/corefcn/genprops.awk: Rename from libinterp/genprops.awk.
* libinterp/corefcn/mk-errno-list.sh: Rename from
libinterp/mk-errno-list.
* libinterp/mk-pkg-add.sh: Rename from libinterp/mk-pkg-add.
* scripts/mk-pkg-add.sh: Rename from scripts/mk-pkg-add.
* Makefile.am, build-aux/module.mk, configure.ac, libgui/module.mk,
libinterp/corefcn/module.mk, libinterp/dldfcn/config-module.awk,
libinterp/module.mk, libinterp/operators/module.mk,
liboctave/external/module.mk, liboctave/external/ranlib/module.mk,
scripts/module.mk: Update.
| author | John W. Eaton <jwe@octave.org> |
|---|---|
| date | Tue, 27 Jun 2017 15:10:58 -0400 |
| parents | 81b141d265a3 |
| children | b95c430c0649 |
line wrap: on
line diff
--- a/libinterp/corefcn/module.mk Tue Jun 27 09:24:08 2017 -0700 +++ b/libinterp/corefcn/module.mk Tue Jun 27 15:10:58 2017 -0400 @@ -252,29 +252,29 @@ %reldir%/defaults.h: %reldir%/defaults.in.h build-aux/subst-default-vals.sh | %reldir%/$(octave_dirstamp) $(AM_V_GEN)$(call simple-filter-rule,build-aux/subst-default-vals.sh) -%reldir%/graphics.h: %reldir%/graphics.in.h libinterp/genprops.awk | %reldir%/$(octave_dirstamp) +%reldir%/graphics.h: %reldir%/graphics.in.h %reldir%/genprops.awk | %reldir%/$(octave_dirstamp) $(AM_V_GEN)rm -f $@-t && \ - $(AWK) -f $(srcdir)/libinterp/genprops.awk $< > $@-t && \ + $(AWK) -f $(srcdir)/%reldir%/genprops.awk $< > $@-t && \ mv $@-t $@ -%reldir%/graphics-props.cc: %reldir%/graphics.in.h libinterp/genprops.awk | %reldir%/$(octave_dirstamp) +%reldir%/graphics-props.cc: %reldir%/graphics.in.h %reldir%/genprops.awk | %reldir%/$(octave_dirstamp) $(AM_V_GEN)rm -f $@-t && \ - $(AWK) -v emit_graphics_props=1 -f $(srcdir)/libinterp/genprops.awk $< > $@-t && \ + $(AWK) -v emit_graphics_props=1 -f $(srcdir)/%reldir%/genprops.awk $< > $@-t && \ mv $@-t $@ -%reldir%/oct-errno.cc: %reldir%/oct-errno.in.cc | %reldir%/$(octave_dirstamp) +%reldir%/oct-errno.cc: %reldir%/oct-errno.in.cc %reldir%/mk-errno-list.sh | %reldir%/$(octave_dirstamp) $(AM_V_GEN)rm -f $@-t && \ if test -n "$(PERL)"; then \ - $(SHELL) $(srcdir)/libinterp/mk-errno-list --perl "$(PERL)" < $< > $@-t; \ + $(SHELL) $(srcdir)/%reldir%/mk-errno-list.sh --perl "$(PERL)" < $< > $@-t; \ elif test -n "$(PYTHON)"; then \ - $(SHELL) $(srcdir)/libinterp/mk-errno-list --python "$(PYTHON)" < $< > $@-t; \ + $(SHELL) $(srcdir)/%reldir%/mk-errno-list.sh --python "$(PYTHON)" < $< > $@-t; \ else \ $(SED) '/@SYSDEP_ERRNO_LIST@/D' $< > $@-t; \ fi && \ mv $@-t $@ -%reldir%/mxarray.h: %reldir%/mxarray.in.h build-aux/mk-mxarray-h.sh | %reldir%/$(octave_dirstamp) - $(AM_V_GEN)$(call simple-filter-rule,build-aux/mk-mxarray-h.sh) +%reldir%/mxarray.h: %reldir%/mxarray.in.h %reldir%/mk-mxarray-h.sh | %reldir%/$(octave_dirstamp) + $(AM_V_GEN)$(call simple-filter-rule,%reldir%/mk-mxarray-h.sh) %reldir%/oct-tex-lexer.ll: %reldir%/oct-tex-lexer.in.ll %reldir%/oct-tex-symbols.in | %reldir%/$(octave_dirstamp) $(AM_V_GEN)rm -f $@-t && \ @@ -311,9 +311,15 @@ libinterp_EXTRA_DIST += \ %reldir%/defaults.in.h \ + %reldir%/genprops.awk \ %reldir%/graphics.in.h \ + %reldir%/mk-errno-list.sh \ + %reldir%/mk-mxarray-h.in.sh \ %reldir%/mxarray.in.h \ %reldir%/oct-errno.in.cc \ %reldir%/oct-tex-lexer.in.ll \ %reldir%/oct-tex-parser.in.yy \ %reldir%/oct-tex-symbols.in + +GEN_CONFIG_SHELL += \ + %reldir%/mk-mxarray-h.sh