aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--CONTRIBUTING.md5
-rw-r--r--Makefile2
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.
diff --git a/Makefile b/Makefile
index 24f37ee..4ebbe32 100644
--- a/Makefile
+++ b/Makefile
@@ -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)