Merge pull request #4322

77a055d build: Add a top-level forwarding target for src/* objects (Cory Fields)
This commit is contained in:
Wladimir J. van der Laan 2014-06-11 08:16:45 +02:00
commit ec7be4a11c
No known key found for this signature in database
GPG Key ID: 74810B012346C9A6

View File

@ -1,6 +1,6 @@
ACLOCAL_AMFLAGS = -I src/m4 ACLOCAL_AMFLAGS = -I src/m4
SUBDIRS = src SUBDIRS = src
.PHONY: deploy .PHONY: deploy FORCE
GZIP_ENV="-9n" 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 || \ @test -f $(MAKENSIS) && $(MAKENSIS) $(top_builddir)/share/setup.nsi || \
echo error: could not build $@ echo error: could not build $@
$(BITCOIND_BIN) $(BITCOIN_QT_BIN) $(BITCOIN_CLI_BIN): $(if $(findstring src/,$(MAKECMDGOALS)),$(MAKECMDGOALS), none): FORCE
make -C $(dir $@) $(notdir $@) $(MAKE) -C src $(patsubst src/%,%,$@)
$(OSX_APP)/Contents/PkgInfo: $(OSX_APP)/Contents/PkgInfo:
$(MKDIR_P) $(@D) $(MKDIR_P) $(@D)