aboutsummaryrefslogtreecommitdiffstats
path: root/example
diff options
context:
space:
mode:
authorPetteri Aimonen <jpa@npb.mail.kapsi.fi>2011-08-23 16:16:33 +0000
committerPetteri Aimonen <jpa@npb.mail.kapsi.fi>2011-08-23 16:16:33 +0000
commit64ac18c8848d3071a16065c84fca3b5e7210ce95 (patch)
treeaf3f7a5d759e51ac6ada8d95ea6e946709fb6bab /example
parent9966a8c9b680ada47b6bd5fe96405c0abaf773e4 (diff)
Changed autogenerated file naming from foo.c to foo.pb.c
git-svn-id: https://svn.kapsi.fi/jpa/nanopb@965 e3a754e5-d11d-0410-8d38-ebb782a927b9
Diffstat (limited to 'example')
-rw-r--r--example/Makefile9
-rw-r--r--example/client.c2
-rw-r--r--example/server.c2
3 files changed, 8 insertions, 5 deletions
diff --git a/example/Makefile b/example/Makefile
index efc4a8d..14dd9fa 100644
--- a/example/Makefile
+++ b/example/Makefile
@@ -3,9 +3,12 @@ DEPS=../pb_decode.c ../pb_decode.h ../pb_encode.c ../pb_encode.h ../pb.h
all: server client
-%: %.c $(DEPS) fileproto.h
- $(CC) $(CFLAGS) -o $@ $< ../pb_decode.c ../pb_encode.c fileproto.c common.c
+clean:
+ rm -f server client fileproto.pb.c fileproto.pb.h
-fileproto.h: fileproto.proto ../generator/nanopb_generator.py
+%: %.c $(DEPS) fileproto.pb.h fileproto.pb.c
+ $(CC) $(CFLAGS) -o $@ $< ../pb_decode.c ../pb_encode.c fileproto.pb.c common.c
+
+fileproto.pb.c fileproto.pb.h: fileproto.proto ../generator/nanopb_generator.py
protoc -I. -I../generator -I/usr/include -ofileproto.pb $<
python ../generator/nanopb_generator.py fileproto.pb
diff --git a/example/client.c b/example/client.c
index f052057..95112e4 100644
--- a/example/client.c
+++ b/example/client.c
@@ -20,7 +20,7 @@
#include <pb_encode.h>
#include <pb_decode.h>
-#include "fileproto.h"
+#include "fileproto.pb.h"
#include "common.h"
bool printfile_callback(pb_istream_t *stream, const pb_field_t *field, void *arg)
diff --git a/example/server.c b/example/server.c
index 04f88f0..aba0667 100644
--- a/example/server.c
+++ b/example/server.c
@@ -20,7 +20,7 @@
#include <pb_encode.h>
#include <pb_decode.h>
-#include "fileproto.h"
+#include "fileproto.pb.h"
#include "common.h"
bool listdir_callback(pb_ostream_t *stream, const pb_field_t *field, const void *arg)