diff options
| author | Joe Richey joerichey@google.com <joerichey@google.com> | 2017-07-19 18:10:18 -0700 |
|---|---|---|
| committer | Joe Richey joerichey@google.com <joerichey@google.com> | 2017-07-19 18:10:18 -0700 |
| commit | 16ec9949f831efd21c78d5f0cb589c40cbbeea33 (patch) | |
| tree | d37a0569947deca92591bd996cd8df738101a3df | |
| parent | a7eb527485dfe8871f303740dec9e67c2ac6bda1 (diff) | |
Build system: no longer run make gen for make all
| -rw-r--r-- | CONTRIBUTING.md | 5 | ||||
| -rw-r--r-- | Makefile | 2 |
2 files changed, 4 insertions, 3 deletions
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 45c5487..1470fa4 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -96,8 +96,9 @@ be older than v3.0.0. In that case, just get the build [directly from GitHub](https://github.com/google/protobuf/releases/latest). After installing everything, running `make all` will run all the commands -mentioned above. As with `make test`, you can run the integration tests by -either using `make all MOUNT=/path/to/my/filesystem` or using the +mentioned above (except for `make gen` as different versions of protoc can +rearrange things differently). As with `make test`, you can run the integration +tests by either using `make all MOUNT=/path/to/my/filesystem` or using the `make test-setup` and `make test-teardown` commands. `make all` should always be run before submitting a pull request. @@ -82,7 +82,7 @@ override GO_FLAGS += --ldflags '$(GO_LINK_FLAGS)' .PHONY: default all default: $(NAME) -all: gen update format lint default test +all: update format lint default test $(NAME): $(SRC_FILES) go build $(GO_FLAGS) -o $(NAME) $(CMD_PKG) |