diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2017-04-21 10:59:01 +0200 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2017-04-21 11:12:29 +0200 |
| commit | 27faa6cccd8dc0c9345c73c424cb7f80dfb061e6 (patch) | |
| tree | 1ab0f8a8db583b94689c45d96a1b9760b8dcd0ef | |
| parent | f6f3b58a7250ddc582fd74976769a340beed08be (diff) | |
| parent | 91ab8f5a997dd1c838e2216fe1e676471bf680a3 (diff) | |
| download | bitcoin-27faa6cccd8dc0c9345c73c424cb7f80dfb061e6.tar.xz | |
Merge #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
| -rw-r--r-- | Makefile.am | 3 | ||||
| -rw-r--r-- | src/Makefile.am | 8 |
2 files changed, 8 insertions, 3 deletions
diff --git a/Makefile.am b/Makefile.am index e82704dbdf..3a56eea0c0 100644 --- a/Makefile.am +++ b/Makefile.am @@ -76,9 +76,6 @@ $(BITCOIN_WIN_INSTALLER): all-recursive echo error: could not build $@ @echo built $@ -$(if $(findstring src/,$(MAKECMDGOALS)),$(MAKECMDGOALS), none): FORCE - $(MAKE) -C src $(patsubst src/%,%,$@) - $(OSX_APP)/Contents/PkgInfo: $(MKDIR_P) $(@D) @echo "APPL????" > $@ diff --git a/src/Makefile.am b/src/Makefile.am index 69b5bb48ad..96b9a27f7b 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -462,6 +462,14 @@ DISTCLEANFILES = obj/build.h EXTRA_DIST = $(CTAES_DIST) + +config/bitcoin-config.h: config/stamp-h1 + @$(MAKE) -C $(top_builddir) $(subdir)/$(@) +config/stamp-h1: $(top_srcdir)/$(subdir)/config/bitcoin-config.h.in $(top_builddir)/config.status + $(AM_V_at)$(MAKE) -C $(top_builddir) $(subdir)/$(@) +$(top_srcdir)/$(subdir)/config/bitcoin-config.h.in: $(am__configure_deps) + $(AM_V_at)$(MAKE) -C $(top_srcdir) $(subdir)/config/bitcoin-config.h.in + clean-local: -$(MAKE) -C secp256k1 clean -$(MAKE) -C univalue clean |