diff options
| author | Jisi Liu <liujisi@google.com> | 2017-08-07 11:47:29 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-08-07 11:47:29 -0700 |
| commit | 3afcded28a6aa9c44adf801ca5bff2133fcf3030 (patch) | |
| tree | cebd73fdf090a98c32ad1a1c996af9cc8f1f8ad6 /examples/Makefile | |
| parent | 176713d6fbbf72056b009f76e7625f267273bd75 (diff) | |
| parent | 8f4b8e430a0cf087af423be434cf8d837027c651 (diff) | |
| download | protobuf-3afcded28a6aa9c44adf801ca5bff2133fcf3030.tar.gz protobuf-3afcded28a6aa9c44adf801ca5bff2133fcf3030.tar.bz2 protobuf-3afcded28a6aa9c44adf801ca5bff2133fcf3030.zip | |
Merge pull request #3461 from TeBoring/3.4.xv3.4.0rc1
Merge master into 3.4.x
Diffstat (limited to 'examples/Makefile')
| -rw-r--r-- | examples/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/examples/Makefile b/examples/Makefile index 51f13426..d16bb56d 100644 --- a/examples/Makefile +++ b/examples/Makefile @@ -51,7 +51,7 @@ list_people_gotest: list_people.go list_people_go go test list_people.go list_people_test.go javac_middleman: AddPerson.java ListPeople.java protoc_middleman - javac AddPerson.java ListPeople.java com/example/tutorial/AddressBookProtos.java + javac -cp ../java/core/target/*.jar AddPerson.java ListPeople.java com/example/tutorial/AddressBookProtos.java @touch javac_middleman add_person_java: javac_middleman |