Skip to content

Commit 5623326

Browse files
laanwjcodablock
authored andcommitted
Merge bitcoin#10228: build: regenerate bitcoin-config.h as necessary
91ab8f5 build: fix bitcoin-config.h regeneration after touching build files (Cory Fields) 3577603 build: remove wonky auto top-level convenience targets (Cory Fields) Tree-SHA512: 2e68634439eeb7eca43cd2858135a583bfe0cf146e021a8384a24f7267aacc6f99bdc7a6d497a04d32e6a03e9446f0f599afb5bd53346dadf19f47d5fb2ea9f9
1 parent ee3ff35 commit 5623326

File tree

2 files changed

+8
-3
lines changed

2 files changed

+8
-3
lines changed

Makefile.am

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -76,9 +76,6 @@ $(BITCOIN_WIN_INSTALLER): all-recursive
7676
echo error: could not build $@
7777
@echo built $@
7878

79-
$(if $(findstring src/,$(MAKECMDGOALS)),$(MAKECMDGOALS), none): FORCE
80-
$(MAKE) -C src $(patsubst src/%,%,$@)
81-
8279
$(OSX_APP)/Contents/PkgInfo:
8380
$(MKDIR_P) $(@D)
8481
@echo "APPL????" > $@

src/Makefile.am

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -541,6 +541,14 @@ DISTCLEANFILES = obj/build.h
541541

542542
EXTRA_DIST = $(CTAES_DIST)
543543

544+
545+
config/dash-config.h: config/stamp-h1
546+
@$(MAKE) -C $(top_builddir) $(subdir)/$(@)
547+
config/stamp-h1: $(top_srcdir)/$(subdir)/config/dash-config.h.in $(top_builddir)/config.status
548+
$(AM_V_at)$(MAKE) -C $(top_builddir) $(subdir)/$(@)
549+
$(top_srcdir)/$(subdir)/config/dash-config.h.in: $(am__configure_deps)
550+
$(AM_V_at)$(MAKE) -C $(top_srcdir) $(subdir)/config/dash-config.h.in
551+
544552
clean-local:
545553
-$(MAKE) -C secp256k1 clean
546554
-$(MAKE) -C univalue clean

0 commit comments

Comments
 (0)