diff options
| author | Paul Smith <psmith@gnu.org> | 2019-09-08 15:41:20 -0400 |
|---|---|---|
| committer | Paul Smith <psmith@gnu.org> | 2019-09-09 18:38:31 -0400 |
| commit | bde990bfeaa8797723e11cad216a9b074fa804fa (patch) | |
| tree | f311ba982969eb3ee6ea4370b7e7791d5e10f076 /maintMakefile | |
| parent | 60e54608bdfa29c57ac4d934f413a8cf100c38d2 (diff) | |
| download | make-git-bde990bfeaa8797723e11cad216a9b074fa804fa.tar.gz | |
Rework the creation of build.sh so it's not a template.
* build.sh: Rename from build.template. Get the list of objects
from the Makefile. Move configure-replaced variables ...
* build.cfg.in: to this new .in file.
* configure.ac: Remove special handling of build.sh.in and add
build.cfg as a generated file.
* Makefile.am (EXTRA_DIST): Remove build.sh.in and add build.sh
and build.cfg.in for build.sh.in.
* maintMakefile: Remove handling for build.template. Treat
build.sh as a source file, not a generated file.
* .gitignore: Ignore generated build.cfg file.
Diffstat (limited to 'maintMakefile')
| -rw-r--r-- | maintMakefile | 18 |
1 files changed, 4 insertions, 14 deletions
diff --git a/maintMakefile b/maintMakefile index b47e7145..0a44a623 100644 --- a/maintMakefile +++ b/maintMakefile @@ -85,16 +85,6 @@ Basic.mk: Basic.mk.template .dep_segment Makefile $(word 2,$^) >>$@ chmod a-w $@ -# Construct build.sh.in -# -build.sh.in: build.template Makefile - rm -f $@ - sed -e 's@%objs%@$(patsubst %.o,%.$${OBJEXT},$(filter-out src/remote-%,$(make_OBJECTS)))@g' \ - $< > $@ - chmod a-w+x $@ - -all: build.sh.in - # Use automake to build a dependency list file, for Makebase.mk. # @@ -266,9 +256,9 @@ $(CONFIG_CHECKS): checkcfg.%: distdir $(AM_DISTCHECK_CONFIGURE_FLAGS) $(DISTCHECK_CONFIGURE_FLAGS) exec >>'checkcfg.$*.log' 2>&1; set -x; \ cd $(distdir)/_build \ - && ./build.sh \ - && ./make $(AM_MAKEFLAGS) check-local \ - && ./make $(AM_MAKEFLAGS) clean + && OUTDIR=_bld ../build.sh \ + && _bld/make $(AM_MAKEFLAGS) check-local \ + && _bld/make $(AM_MAKEFLAGS) clean exec >>'checkcfg.$*.log' 2>&1; set -x; \ cd $(distdir)/_build \ && $(NR_MAKE) $(AM_MAKEFLAGS) CFLAGS='$(AM_CFLAGS)' \ @@ -405,7 +395,7 @@ $(COV_BUILD_FILE): $(filter %.c %.h,$(DISTFILES)) CFLAGS='$(AM_CFLAGS)' PATH="$${COVERITY_PATH:+$$COVERITY_PATH/bin:}$$PATH"; \ cd '$(distdir)'/_build \ - && cov-build --dir cov-int ./build.sh + && cov-build --dir cov-int ../build.sh rm -f '$@' (cd '$(distdir)'/_build && tar czf - cov-int) > '$@' |