Merge pull request #4322
77a055d
build: Add a top-level forwarding target for src/* objects (Cory Fields)
This commit is contained in:
commit
ec7be4a11c
1 changed files with 3 additions and 3 deletions
|
@ -1,6 +1,6 @@
|
|||
ACLOCAL_AMFLAGS = -I src/m4
|
||||
SUBDIRS = src
|
||||
.PHONY: deploy
|
||||
.PHONY: deploy FORCE
|
||||
|
||||
GZIP_ENV="-9n"
|
||||
|
||||
|
@ -53,8 +53,8 @@ $(BITCOIN_WIN_INSTALLER): $(BITCOIND_BIN) $(BITCOIN_QT_BIN) $(BITCOIN_CLI_BIN)
|
|||
@test -f $(MAKENSIS) && $(MAKENSIS) $(top_builddir)/share/setup.nsi || \
|
||||
echo error: could not build $@
|
||||
|
||||
$(BITCOIND_BIN) $(BITCOIN_QT_BIN) $(BITCOIN_CLI_BIN):
|
||||
make -C $(dir $@) $(notdir $@)
|
||||
$(if $(findstring src/,$(MAKECMDGOALS)),$(MAKECMDGOALS), none): FORCE
|
||||
$(MAKE) -C src $(patsubst src/%,%,$@)
|
||||
|
||||
$(OSX_APP)/Contents/PkgInfo:
|
||||
$(MKDIR_P) $(@D)
|
||||
|
|
Loading…
Reference in a new issue