annotate build-aux/module.mk @ 30580:fdc30b576333

eliminate code duplication in oct-conf-post.in.h and octave-config.h * oct-conf-post-private.in.h, oct-conf-post-public.in.h: New files, split form oct-conf-post.in.h. * Makefile.am (libgnu/libgnu.la): Depend on oct-conf-post-public.h and oct-conf-post-private.h instead of oct-conf-post.h. (BUILT_SOURCES): Update. (nodist_octinclude_HEADERS): Add oct-conf-post-public.h to the list. * build-aux/module.mk (GEN_CONFIG_INC): Replace oct-conf-post.h with oct-conf-post-private.h and oct-conf-post-public.h. * configure.ac: Replace code using oct-conf-post.h with equivalent actions for oct-conf-post-private.h and oct-conf-post-public.h. * mk-octave-config-h.sh: Instead of generating code that is also duplicated in oct-conf-post.h, include the file oct-conf-post-public.h that is also included in Octave's config.h file.
author John W. Eaton <jwe@octave.org>
date Fri, 31 Dec 2021 09:28:05 -0500
parents 2d2bed795727
children 85723a361b2b
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
23574
5faefc310a21 move build-aux file lists and rules to build-aux/module.mk
John W. Eaton <jwe@octave.org>
parents: 23572
diff changeset
1 EXTRA_DIST += \
5faefc310a21 move build-aux file lists and rules to build-aux/module.mk
John W. Eaton <jwe@octave.org>
parents: 23572
diff changeset
2 %reldir%/OctJavaQry.class \
5faefc310a21 move build-aux file lists and rules to build-aux/module.mk
John W. Eaton <jwe@octave.org>
parents: 23572
diff changeset
3 %reldir%/OctJavaQry.java \
5faefc310a21 move build-aux file lists and rules to build-aux/module.mk
John W. Eaton <jwe@octave.org>
parents: 23572
diff changeset
4 %reldir%/changelog.tmpl \
5faefc310a21 move build-aux file lists and rules to build-aux/module.mk
John W. Eaton <jwe@octave.org>
parents: 23572
diff changeset
5 %reldir%/check-subst-vars.in.sh \
5faefc310a21 move build-aux file lists and rules to build-aux/module.mk
John W. Eaton <jwe@octave.org>
parents: 23572
diff changeset
6 %reldir%/find-defun-files.sh \
5faefc310a21 move build-aux file lists and rules to build-aux/module.mk
John W. Eaton <jwe@octave.org>
parents: 23572
diff changeset
7 %reldir%/find-files-with-tests.sh \
24077
e483dcb5777d build the source distribution archives reproducibly
Mike Miller <mtmiller@octave.org>
parents: 23709
diff changeset
8 %reldir%/get-source-mtime.sh \
25724
026133abb177 build: include inplace_edit.pl in tarball (bug #54349).
Rik <rik@octave.org>
parents: 24077
diff changeset
9 %reldir%/inplace_edit.pl \
23574
5faefc310a21 move build-aux file lists and rules to build-aux/module.mk
John W. Eaton <jwe@octave.org>
parents: 23572
diff changeset
10 %reldir%/mk-hg-id.sh \
5faefc310a21 move build-aux file lists and rules to build-aux/module.mk
John W. Eaton <jwe@octave.org>
parents: 23572
diff changeset
11 %reldir%/mk-octave-config-h.sh \
5faefc310a21 move build-aux file lists and rules to build-aux/module.mk
John W. Eaton <jwe@octave.org>
parents: 23572
diff changeset
12 %reldir%/mk-opts.pl \
25897
440eb4707570 reorganize rules for building .oct files
John W. Eaton <jwe@octave.org>
parents: 25725
diff changeset
13 %reldir%/mk-pkg-add.sh \
23574
5faefc310a21 move build-aux file lists and rules to build-aux/module.mk
John W. Eaton <jwe@octave.org>
parents: 23572
diff changeset
14 %reldir%/move-if-change \
5faefc310a21 move build-aux file lists and rules to build-aux/module.mk
John W. Eaton <jwe@octave.org>
parents: 23572
diff changeset
15 %reldir%/stl_algo.h-fixed \
5faefc310a21 move build-aux file lists and rules to build-aux/module.mk
John W. Eaton <jwe@octave.org>
parents: 23572
diff changeset
16 %reldir%/subst-config-vals.in.sh \
5faefc310a21 move build-aux file lists and rules to build-aux/module.mk
John W. Eaton <jwe@octave.org>
parents: 23572
diff changeset
17 %reldir%/subst-cross-config-vals.in.sh \
5faefc310a21 move build-aux file lists and rules to build-aux/module.mk
John W. Eaton <jwe@octave.org>
parents: 23572
diff changeset
18 %reldir%/subst-script-vals.in.sh \
5faefc310a21 move build-aux file lists and rules to build-aux/module.mk
John W. Eaton <jwe@octave.org>
parents: 23572
diff changeset
19 %reldir%/update-bug-status.sh
23572
0703d31e1ec0 new script for updating test status for fixed bugs
John W. Eaton <jwe@octave.org>
parents:
diff changeset
20
23709
3b68aeeabc40 rename some build scripts for consistency and move them to where they are used
John W. Eaton <jwe@octave.org>
parents: 23669
diff changeset
21 GEN_CONFIG_SHELL += \
23574
5faefc310a21 move build-aux file lists and rules to build-aux/module.mk
John W. Eaton <jwe@octave.org>
parents: 23572
diff changeset
22 %reldir%/subst-config-vals.sh \
5faefc310a21 move build-aux file lists and rules to build-aux/module.mk
John W. Eaton <jwe@octave.org>
parents: 23572
diff changeset
23 %reldir%/subst-cross-config-vals.sh \
5faefc310a21 move build-aux file lists and rules to build-aux/module.mk
John W. Eaton <jwe@octave.org>
parents: 23572
diff changeset
24 %reldir%/subst-script-vals.sh
5faefc310a21 move build-aux file lists and rules to build-aux/module.mk
John W. Eaton <jwe@octave.org>
parents: 23572
diff changeset
25
5faefc310a21 move build-aux file lists and rules to build-aux/module.mk
John W. Eaton <jwe@octave.org>
parents: 23572
diff changeset
26 $(GEN_CONFIG_SHELL) : %.sh : %.in.sh config.status
5faefc310a21 move build-aux file lists and rules to build-aux/module.mk
John W. Eaton <jwe@octave.org>
parents: 23572
diff changeset
27 $(AM_V_GEN)$(SHELL) config.status $@-tmp $@
5faefc310a21 move build-aux file lists and rules to build-aux/module.mk
John W. Eaton <jwe@octave.org>
parents: 23572
diff changeset
28
5faefc310a21 move build-aux file lists and rules to build-aux/module.mk
John W. Eaton <jwe@octave.org>
parents: 23572
diff changeset
29 GEN_CONFIG_INC = \
30580
fdc30b576333 eliminate code duplication in oct-conf-post.in.h and octave-config.h
John W. Eaton <jwe@octave.org>
parents: 28578
diff changeset
30 oct-conf-post-private.h \
fdc30b576333 eliminate code duplication in oct-conf-post.in.h and octave-config.h
John W. Eaton <jwe@octave.org>
parents: 28578
diff changeset
31 oct-conf-post-public.h
23574
5faefc310a21 move build-aux file lists and rules to build-aux/module.mk
John W. Eaton <jwe@octave.org>
parents: 23572
diff changeset
32
5faefc310a21 move build-aux file lists and rules to build-aux/module.mk
John W. Eaton <jwe@octave.org>
parents: 23572
diff changeset
33 $(GEN_CONFIG_INC) : %.h : %.in.h config.status
5faefc310a21 move build-aux file lists and rules to build-aux/module.mk
John W. Eaton <jwe@octave.org>
parents: 23572
diff changeset
34 $(AM_V_GEN)$(SHELL) config.status $@-tmp $@
5faefc310a21 move build-aux file lists and rules to build-aux/module.mk
John W. Eaton <jwe@octave.org>
parents: 23572
diff changeset
35
5faefc310a21 move build-aux file lists and rules to build-aux/module.mk
John W. Eaton <jwe@octave.org>
parents: 23572
diff changeset
36 ### utility rules to aid development
23572
0703d31e1ec0 new script for updating test status for fixed bugs
John W. Eaton <jwe@octave.org>
parents:
diff changeset
37
0703d31e1ec0 new script for updating test status for fixed bugs
John W. Eaton <jwe@octave.org>
parents:
diff changeset
38 ALL_TEST_FILES = \
28578
2d2bed795727 include liboctave files in list of all files containing tests
John W. Eaton <jwe@octave.org>
parents: 25897
diff changeset
39 $(addprefix $(srcdir)/, $(LIBOCTAVE_TST_FILES_SRC)) \
23572
0703d31e1ec0 new script for updating test status for fixed bugs
John W. Eaton <jwe@octave.org>
parents:
diff changeset
40 $(addprefix $(srcdir)/, $(LIBINTERP_TST_FILES_SRC)) \
0703d31e1ec0 new script for updating test status for fixed bugs
John W. Eaton <jwe@octave.org>
parents:
diff changeset
41 $(addprefix $(srcdir)/, $(FCN_FILES_WITH_TESTS)) \
0703d31e1ec0 new script for updating test status for fixed bugs
John W. Eaton <jwe@octave.org>
parents:
diff changeset
42 $(addprefix $(srcdir)/, $(TEST_FILES))
0703d31e1ec0 new script for updating test status for fixed bugs
John W. Eaton <jwe@octave.org>
parents:
diff changeset
43
0703d31e1ec0 new script for updating test status for fixed bugs
John W. Eaton <jwe@octave.org>
parents:
diff changeset
44 ## Tag bug IDs in tests as fixed
0703d31e1ec0 new script for updating test status for fixed bugs
John W. Eaton <jwe@octave.org>
parents:
diff changeset
45 update-bug-status:
0703d31e1ec0 new script for updating test status for fixed bugs
John W. Eaton <jwe@octave.org>
parents:
diff changeset
46 $(SHELL) $(srcdir)/%reldir%/update-bug-status.sh $(ALL_TEST_FILES)
0703d31e1ec0 new script for updating test status for fixed bugs
John W. Eaton <jwe@octave.org>
parents:
diff changeset
47 .PHONY: update-bug-status