Mercurial > octave-libtiff
changeset 23574:5faefc310a21
move build-aux file lists and rules to build-aux/module.mk
* build-aux/module.mk: Move build-aux file lists and rules here from
Makefile.am.
author | John W. Eaton <jwe@octave.org> |
---|---|
date | Fri, 09 Jun 2017 15:32:33 -0400 |
parents | 1b4f4ec53b4a |
children | e95738a119da |
files | Makefile.am build-aux/module.mk |
diffstat | 2 files changed, 44 insertions(+), 44 deletions(-) [+] |
line wrap: on
line diff
--- a/Makefile.am Fri Jun 09 17:44:57 2017 -0400 +++ b/Makefile.am Fri Jun 09 15:32:33 2017 -0400 @@ -113,50 +113,9 @@ INSTALL \ NEWS \ README \ - build-aux/OctJavaQry.class \ - build-aux/OctJavaQry.java \ - build-aux/changelog.tmpl \ - build-aux/check-subst-vars.in.sh \ - build-aux/find-defun-files.sh \ - build-aux/find-files-with-tests.sh \ - build-aux/mk-builtins.pl \ - build-aux/mk-default-qt-settings.in.sh \ - build-aux/mk-f77-def.in.sh \ - build-aux/mk-hg-id.sh \ - build-aux/mk-mxarray-h.in.sh \ - build-aux/mk-octave-config-h.sh \ - build-aux/mk-opts.pl \ - build-aux/mk-version-h.in.sh \ - build-aux/move-if-change \ - build-aux/stl_algo.h-fixed \ - build-aux/subst-config-vals.in.sh \ - build-aux/subst-cross-config-vals.in.sh \ - build-aux/subst-default-vals.in.sh \ - build-aux/subst-f77-isnan-macro.in.sh \ - build-aux/subst-script-vals.in.sh \ run-octave.in \ $(BUILT_DISTFILES) -GEN_CONFIG_SHELL = \ - build-aux/mk-default-qt-settings.sh \ - build-aux/mk-f77-def.sh \ - build-aux/mk-mxarray-h.sh \ - build-aux/mk-version-h.sh \ - build-aux/subst-config-vals.sh \ - build-aux/subst-cross-config-vals.sh \ - build-aux/subst-default-vals.sh \ - build-aux/subst-f77-isnan-macro.sh \ - build-aux/subst-script-vals.sh - -$(GEN_CONFIG_SHELL) : %.sh : %.in.sh config.status - $(AM_V_GEN)$(SHELL) config.status $@-tmp $@ - -GEN_CONFIG_INC = \ - oct-conf-post.h - -$(GEN_CONFIG_INC) : %.h : %.in.h config.status - $(AM_V_GEN)$(SHELL) config.status $@-tmp $@ - AUTOCONF_SUBST_VARS = @AUTOCONF_SUBST_VARS@ ALL_SUBST_VARS = \ $(AUTOCONF_SUBST_VARS) \
--- a/build-aux/module.mk Fri Jun 09 17:44:57 2017 -0400 +++ b/build-aux/module.mk Fri Jun 09 15:32:33 2017 -0400 @@ -1,7 +1,48 @@ -## utility rules to aid development +EXTRA_DIST += \ + %reldir%/OctJavaQry.class \ + %reldir%/OctJavaQry.java \ + %reldir%/changelog.tmpl \ + %reldir%/check-subst-vars.in.sh \ + %reldir%/find-defun-files.sh \ + %reldir%/find-files-with-tests.sh \ + %reldir%/mk-builtins.pl \ + %reldir%/mk-default-qt-settings.in.sh \ + %reldir%/mk-f77-def.in.sh \ + %reldir%/mk-hg-id.sh \ + %reldir%/mk-mxarray-h.in.sh \ + %reldir%/mk-octave-config-h.sh \ + %reldir%/mk-opts.pl \ + %reldir%/mk-version-h.in.sh \ + %reldir%/move-if-change \ + %reldir%/stl_algo.h-fixed \ + %reldir%/subst-config-vals.in.sh \ + %reldir%/subst-cross-config-vals.in.sh \ + %reldir%/subst-default-vals.in.sh \ + %reldir%/subst-f77-isnan-macro.in.sh \ + %reldir%/subst-script-vals.in.sh \ + %reldir%/update-bug-status.sh -EXTRA_DIST += \ - %reldir%/update-bug-status.sh +GEN_CONFIG_SHELL = \ + %reldir%/mk-default-qt-settings.sh \ + %reldir%/mk-f77-def.sh \ + %reldir%/mk-mxarray-h.sh \ + %reldir%/mk-version-h.sh \ + %reldir%/subst-config-vals.sh \ + %reldir%/subst-cross-config-vals.sh \ + %reldir%/subst-default-vals.sh \ + %reldir%/subst-f77-isnan-macro.sh \ + %reldir%/subst-script-vals.sh + +$(GEN_CONFIG_SHELL) : %.sh : %.in.sh config.status + $(AM_V_GEN)$(SHELL) config.status $@-tmp $@ + +GEN_CONFIG_INC = \ + oct-conf-post.h + +$(GEN_CONFIG_INC) : %.h : %.in.h config.status + $(AM_V_GEN)$(SHELL) config.status $@-tmp $@ + +### utility rules to aid development ALL_TEST_FILES = \ $(addprefix $(srcdir)/, $(LIBINTERP_TST_FILES_SRC)) \