diff options
| author | fanquake <fanquake@gmail.com> | 2020-12-28 15:36:47 +0800 |
|---|---|---|
| committer | fanquake <fanquake@gmail.com> | 2020-12-28 16:48:06 +0800 |
| commit | ddbf7a6f5051b6d7faed54828445d6eaadcd8441 (patch) | |
| tree | 44f4bae36f55931749d04c6f1c50a706910e4432 | |
| parent | 4a8f4ac4fc07c59a0bfdbb7c15a50cf5b4364312 (diff) | |
| parent | 5e0dedb111ed9db03914b9dac36cf081974c2918 (diff) | |
Merge #20684: build: Define .INTERMEDIATE target once only
5e0dedb111ed9db03914b9dac36cf081974c2918 build: Define .INTERMEDIATE target once only (Hennadii Stepanov)
Pull request description:
A new warning was introduced in https://github.com/bitcoin/bitcoin/pull/20470/commits/22437fc72e78ba3845a3953853d40093de32c395 (#20470):
```
$ ./autogen.sh
...
Makefile.am:335: warning: .INTERMEDIATE was already defined in condition !BUILD_DARWIN, which is included in condition TRUE ...
Makefile.am:139: ... '.INTERMEDIATE' previously defined here
...
```
Fixed in this PR.
ACKs for top commit:
jonatack:
Tested and very light review ACK 5e0dedb111ed9db03914b9dac36cf081974c2918
Tree-SHA512: ecf8de79ba394c36ee84e0b8d3ba78587e0f856259e9731e6bbb38d0baebfd083eb44d7ef6a386dd9e4508dd64fec1c2b9a007e175fbd4d986e845b1c300a649
| -rw-r--r-- | Makefile.am | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/Makefile.am b/Makefile.am index 3cf51c71b5..b4a55907df 100644 --- a/Makefile.am +++ b/Makefile.am @@ -12,6 +12,7 @@ if ENABLE_MAN SUBDIRS += doc/man endif .PHONY: deploy FORCE +.INTERMEDIATE: $(OSX_TEMP_ISO) $(COVERAGE_INFO) export PYTHONPATH @@ -137,7 +138,6 @@ $(APP_DIST_DIR)/Applications: $(APP_DIST_EXTRAS): $(APP_DIST_DIR)/$(OSX_APP)/Contents/MacOS/Bitcoin-Qt -.INTERMEDIATE: $(OSX_TEMP_ISO) $(OSX_TEMP_ISO): $(APP_DIST_EXTRAS) $(XORRISOFS) -D -l -V "$(OSX_VOLNAME)" -no-pad -r -dir-mode 0755 -o $@ dist @@ -333,8 +333,6 @@ EXTRA_DIST += \ CLEANFILES = $(OSX_DMG) $(BITCOIN_WIN_INSTALLER) -.INTERMEDIATE: $(COVERAGE_INFO) - DISTCHECK_CONFIGURE_FLAGS = --enable-man doc/doxygen/.stamp: doc/Doxyfile FORCE |