RepoMirrors
/
prometheus
mirror of https://github.com/prometheus/prometheus
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #318 from prometheus/fix/build-path 

Update "build" -> ".build" in remaining Makefiles.
This commit is contained in:
Matt T. Proud 2013-06-26 08:53:01 -07:00
parent e3bc6fc9dc a310afd28f
commit 1bd8ee15f3
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
config/Makefile
View File

@ -24,5 +24,5 @@ include ../Makefile.INCLUDE
generated/config.pb.go: config.proto generated/config.pb.go: config.proto
$(MAKE) -C ../build goprotobuf-protoc-gen-go-stamp $(MAKE) -C ../.build goprotobuf-protoc-gen-go-stamp
$(PROTOC) --proto_path=$(PREFIX)/include:. --go_out=generated/ config.proto $(PROTOC) --proto_path=$(PREFIX)/include:. --go_out=generated/ config.proto

6
model/Makefile
View File

@ -20,12 +20,12 @@ include ../Makefile.INCLUDE
# In order to build the generated targets in this directory, run the # In order to build the generated targets in this directory, run the
# following: # following:
# #
# make -C build goprotobuf-protoc-gen-go-stamp # make -C .build goprotobuf-protoc-gen-go-stamp
generated/data.pb.go: data.proto generated/data.pb.go: data.proto
$(MAKE) -C ../build goprotobuf-protoc-gen-go-stamp $(MAKE) -C ../.build goprotobuf-protoc-gen-go-stamp
$(PROTOC) --proto_path=$(PREFIX)/include:. --include_imports --go_out=generated/ --descriptor_set_out=generated/descriptor.blob data.proto $(PROTOC) --proto_path=$(PREFIX)/include:. --include_imports --go_out=generated/ --descriptor_set_out=generated/descriptor.blob data.proto
generated/descriptor.blob: data.proto generated/descriptor.blob: data.proto
$(MAKE) -C ../build goprotobuf-protoc-gen-go-stamp $(MAKE) -C ../.build goprotobuf-protoc-gen-go-stamp
$(PROTOC) --proto_path=$(PREFIX)/include:. --include_imports --go_out=generated/ --descriptor_set_out=generated/descriptor.blob data.proto $(PROTOC) --proto_path=$(PREFIX)/include:. --include_imports --go_out=generated/ --descriptor_set_out=generated/descriptor.blob data.proto