From 9c02fff2559f1c7cd93924af27a28a546ad4e197 Mon Sep 17 00:00:00 2001 From: Kiyoshi Mizumaru Date: Sat, 6 Aug 2022 03:17:23 +0900 Subject: [PATCH] Fix rule for java target in examples/Makefile --- examples/Makefile | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/examples/Makefile b/examples/Makefile index 1ed7f67fd18..2a64b64fe37 100644 --- a/examples/Makefile +++ b/examples/Makefile @@ -13,13 +13,14 @@ python: add_person_python list_people_python clean: rm -f add_person_cpp list_people_cpp add_person_java list_people_java add_person_python list_people_python - rm -f javac_middleman AddPerson*.class ListPeople*.class com/example/tutorial/*.class - rm -f protoc_middleman addressbook.pb.cc addressbook.pb.h addressbook_pb2.py com/example/tutorial/AddressBookProtos.java + rm -f javac_middleman AddPerson*.class ListPeople*.class com/example/tutorial/protos/*.class + rm -f protoc_middleman addressbook.pb.cc addressbook.pb.h addressbook_pb2.py com/example/tutorial/protos/*.java rm -f *.pyc rm -f go/tutorialpb/*.pb.go add_person_go list_people_go rm -f protoc_middleman_dart dart_tutorial/*.pb*.dart rmdir dart_tutorial 2>/dev/null || true rmdir tutorial 2>/dev/null || true + rmdir com/example/tutorial/protos 2>/dev/null || true rmdir com/example/tutorial 2>/dev/null || true rmdir com/example 2>/dev/null || true rmdir com 2>/dev/null || true @@ -63,7 +64,7 @@ list_people_gotest: go/tutorialpb/addressbook.pb.go cd go && go test ./cmd/list_people javac_middleman: AddPerson.java ListPeople.java protoc_middleman - javac -cp $$CLASSPATH AddPerson.java ListPeople.java com/example/tutorial/AddressBookProtos.java + javac -cp $$CLASSPATH AddPerson.java ListPeople.java com/example/tutorial/protos/*.java @touch javac_middleman add_person_java: javac_middleman