view 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
line wrap: on
line source

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%/get-source-mtime.sh \
  %reldir%/inplace_edit.pl \
  %reldir%/mk-hg-id.sh \
  %reldir%/mk-octave-config-h.sh \
  %reldir%/mk-opts.pl \
  %reldir%/mk-pkg-add.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-script-vals.in.sh \
  %reldir%/update-bug-status.sh

GEN_CONFIG_SHELL += \
  %reldir%/subst-config-vals.sh \
  %reldir%/subst-cross-config-vals.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-private.h \
  oct-conf-post-public.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)/, $(LIBOCTAVE_TST_FILES_SRC)) \
  $(addprefix $(srcdir)/, $(LIBINTERP_TST_FILES_SRC)) \
  $(addprefix $(srcdir)/, $(FCN_FILES_WITH_TESTS)) \
  $(addprefix $(srcdir)/, $(TEST_FILES))

## Tag bug IDs in tests as fixed
update-bug-status:
	$(SHELL) $(srcdir)/%reldir%/update-bug-status.sh $(ALL_TEST_FILES)
.PHONY: update-bug-status