Skip to content

Commit ddbf7a6

Browse files
committed
Merge bitcoin#20684: build: Define .INTERMEDIATE target once only
5e0dedb build: Define .INTERMEDIATE target once only (Hennadii Stepanov) Pull request description: A new warning was introduced in bitcoin@22437fc (bitcoin#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 5e0dedb Tree-SHA512: ecf8de79ba394c36ee84e0b8d3ba78587e0f856259e9731e6bbb38d0baebfd083eb44d7ef6a386dd9e4508dd64fec1c2b9a007e175fbd4d986e845b1c300a649
2 parents 4a8f4ac + 5e0dedb commit ddbf7a6

File tree

1 file changed

+1
-3
lines changed

1 file changed

+1
-3
lines changed

Makefile.am

+1-3
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ if ENABLE_MAN
1212
SUBDIRS += doc/man
1313
endif
1414
.PHONY: deploy FORCE
15+
.INTERMEDIATE: $(OSX_TEMP_ISO) $(COVERAGE_INFO)
1516

1617
export PYTHONPATH
1718

@@ -137,7 +138,6 @@ $(APP_DIST_DIR)/Applications:
137138

138139
$(APP_DIST_EXTRAS): $(APP_DIST_DIR)/$(OSX_APP)/Contents/MacOS/Bitcoin-Qt
139140

140-
.INTERMEDIATE: $(OSX_TEMP_ISO)
141141
$(OSX_TEMP_ISO): $(APP_DIST_EXTRAS)
142142
$(XORRISOFS) -D -l -V "$(OSX_VOLNAME)" -no-pad -r -dir-mode 0755 -o $@ dist
143143

@@ -333,8 +333,6 @@ EXTRA_DIST += \
333333

334334
CLEANFILES = $(OSX_DMG) $(BITCOIN_WIN_INSTALLER)
335335

336-
.INTERMEDIATE: $(COVERAGE_INFO)
337-
338336
DISTCHECK_CONFIGURE_FLAGS = --enable-man
339337

340338
doc/doxygen/.stamp: doc/Doxyfile FORCE

0 commit comments

Comments
 (0)