diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2014-06-11 08:16:45 +0200 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2014-06-11 08:25:55 +0200 |
| commit | ec7be4a11c1a547d78f844e339a1c5db4f587a49 (patch) | |
| tree | a7902e85b957657e375113ced1e483f26ee083fb | |
| parent | 40c3781365825d665f2da8a7151035678f9b5d26 (diff) | |
| parent | 77a055d04979dc2b3ec4064e99c69259a4216f12 (diff) | |
| download | bitcoin-ec7be4a11c1a547d78f844e339a1c5db4f587a49.tar.xz | |
Merge pull request #4322
77a055d build: Add a top-level forwarding target for src/* objects (Cory Fields)
| -rw-r--r-- | Makefile.am | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Makefile.am b/Makefile.am index 04f8368dd7..719af42ac7 100644 --- a/Makefile.am +++ b/Makefile.am @@ -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) |