Squashed '3rdparty/machinetalk-protobuf/' changes from 46c9536..152d2a2

152d2a2 Merge pull request #18 from strahlex/machinekit3 e86a66e machinetalk-protobuf: added default PKG-CONFIG variable to make upstream merge possible e350cc0 machinetalk-protobuf: cleaning up duplicate comments bece831 machinetalk/mkwrapper: added per axis max-acceleration and max-velocity and simplified protobuf message update of config channel git-subtree-dir: 3rdparty/machinetalk-protobuf git-subtree-split: 152d2a27a326fd1dc3f90a33792c82d9c5538ba6
machinekit · Jul 20, 2015 · 3c0052a · 3c0052a
1 parent ad87138
commit 3c0052a
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/Makefile b/Makefile
@@ -43,6 +43,9 @@ PROTOBUFJS_GEN := js
 # the proto2js compiler
 PROTOJS := $(shell which proto2js)
 
+# pkg-config
+PKG_CONFIG := $(shell which pkg-config)
+
 # proto2js options - namespace
 #PROTOBUFJS_OPT := -commonjs=pb
 # http://en.wikipedia.org/wiki/Asynchronous_module_definition
@@ -59,7 +62,7 @@ PROTO_SPECS := $(wildcard $(PROTODIR)/*.proto)
 PROTOC := $(shell which protoc)
 
 # the directory where descriptor.proto lives:
-GPBINCLUDE :=  $(shell pkg-config --variable=includedir protobuf)
+GPBINCLUDE :=  $(shell $(PKG_CONFIG) --variable=includedir protobuf)
 DESCDIR    :=  $(GPBINCLUDE)/google/protobuf
 
 # object files generated during dependency resolving

diff --git a/proto/rtapicommand.proto b/proto/rtapicommand.proto
@@ -1,5 +1,4 @@
 import "nanopb.proto";
-
 // see README.msgid
 // msgid base: 900
 

diff --git a/proto/types.proto b/proto/types.proto
@@ -78,7 +78,6 @@ enum ObjectType {
     NAMED_VALUE       = 125;
 
     OT_ERROR          = 130;
-
 }
 
 enum RCS_STATUS {
-Original file line number
+Diff line change
@@ Expand Up / @@ -78,7 +78,6 @@ enum ObjectType { @@
         NAMED_VALUE       = 125;
         OT_ERROR          = 130;
     }
     enum RCS_STATUS {
@@ Expand Down @@