.pb.h depends on .proto as well

Makefile

@@ -184,9 +184,7 @@ BASE_SOURCES = \
     src/base/containers/case_ignored_flat_map.cpp \
     src/base/iobuf.cpp
 
-BASE_PROTOS = $(filter %.proto,$(BASE_SOURCES))
-BASE_CFAMILIES = $(filter-out %.proto,$(BASE_SOURCES))
-BASE_OBJS = $(BASE_PROTOS:.proto=.pb.o) $(addsuffix .o, $(basename $(BASE_CFAMILIES)))
+BASE_OBJS = $(addsuffix .o, $(basename $(BASE_SOURCES)))
 BASE_DEBUG_OBJS = $(BASE_OBJS:.o=.dbg.o)
 
 BVAR_DIRS = src/bvar src/bvar/detail
@@ -308,7 +306,7 @@ output/bin:protoc-gen-mcpack
 	@mkdir -p $@
 	@cp $^ $@
 
-%.pb.cc:%.proto
+%.pb.cc %.pb.h:%.proto
 	@echo "Generating $@"
 	@$(PROTOC) --cpp_out=./src --proto_path=./src --proto_path=$(PROTOBUF_HDR) $<
 

example/echo_c++/Makefile

@@ -33,7 +33,7 @@ echo_server:$(PROTO_OBJS) $(SERVER_OBJS)
 	@echo "Linking $@"
 	@$(CXX) $(LIBPATHS) -Xlinker "-(" $^ -Wl,-Bstatic $(STATIC_LINKINGS) -Wl,-Bdynamic -Xlinker "-)" $(DYNAMIC_LINKINGS) -o $@
 
-%.pb.cc:%.proto
+%.pb.cc %.pb.h:%.proto
 	@echo "Generating $@"
 	@$(PROTOC) --cpp_out=. --proto_path=. $(PROTOC_EXTRA_ARGS) $<
 

example/http_c++/Makefile

@@ -43,7 +43,7 @@ http_server:$(PROTO_OBJS) $(SERVER_OBJS)
 	@echo "Linking $@"
 	@$(CXX) $(LIBPATHS) -Xlinker "-(" $^ -Wl,-Bstatic $(STATIC_LINKINGS) -Wl,-Bdynamic -Xlinker "-)" $(DYNAMIC_LINKINGS) -o $@
 
-%.pb.cc:%.proto
+%.pb.cc %.pb.h:%.proto
 	@echo "Generating $@"
 	@$(PROTOC) --cpp_out=. --proto_path=. $<
 

example/multi_threaded_echo_c++/Makefile

@@ -37,7 +37,7 @@ echo_server:$(PROTO_OBJS) $(SERVER_OBJS)
 	@echo "Linking $@"
 	@$(CXX) $(LIBPATHS) -Xlinker "-(" $^ -Wl,-Bstatic $(STATIC_LINKINGS) -Wl,-Bdynamic -Xlinker "-)" $(DYNAMIC_LINKINGS) -o $@
 
-%.pb.cc:%.proto
+%.pb.cc %.pb.h:%.proto
 	@echo "Generating $@"
 	@$(PROTOC) --cpp_out=. --proto_path=. $(PROTOC_EXTRA_ARGS) $<
 

test/Makefile

@@ -199,7 +199,7 @@ brpc_%_unittest:$(TEST_PROTO_OBJS) brpc_%_unittest.o ../libbase.dbg.a ../libbvar
 	@echo "Linking $@"
 	@$(CXX) -o $@ $(LIBPATHS) -Xlinker "-(" $^ -Wl,-Bstatic $(STATIC_LINKINGS) -Wl,-Bdynamic -Xlinker "-)" $(DYNAMIC_LINKINGS)
 
-%.pb.cc:%.proto
+%.pb.cc %.pb.h:%.proto
 	@echo "Generating $@"
 	@$(PROTOC) --cpp_out=. --proto_path=. --proto_path=../src --proto_path=$(PROTOBUF_HDR) $<