aboutsummaryrefslogtreecommitdiff
path: root/examples
diff options
context:
space:
mode:
authorkenton@google.com <kenton@google.com@630680e5-0e50-0410-840e-4b1c322b438d>2009-05-06 20:41:30 +0000
committerkenton@google.com <kenton@google.com@630680e5-0e50-0410-840e-4b1c322b438d>2009-05-06 20:41:30 +0000
commite21c5734ecf61c21aa8393a8fbfb55aed8d486d6 (patch)
treec5e99d1976ba335e208a72ae18668042ac6c659a /examples
parent63e646b7ad6f18228c1807f8d18111ae96e86aa7 (diff)
downloadprotobuf-e21c5734ecf61c21aa8393a8fbfb55aed8d486d6.tar.gz
protobuf-e21c5734ecf61c21aa8393a8fbfb55aed8d486d6.tar.bz2
protobuf-e21c5734ecf61c21aa8393a8fbfb55aed8d486d6.zip
Make sure examples link properly.
Diffstat (limited to 'examples')
-rw-r--r--examples/Makefile4
-rw-r--r--examples/README.txt6
2 files changed, 7 insertions, 3 deletions
diff --git a/examples/Makefile b/examples/Makefile
index 999ee94a..36d0280b 100644
--- a/examples/Makefile
+++ b/examples/Makefile
@@ -22,10 +22,10 @@ protoc_middleman: addressbook.proto
@touch protoc_middleman
add_person_cpp: add_person.cc protoc_middleman
- c++ add_person.cc addressbook.pb.cc -lprotobuf -o add_person_cpp
+ c++ add_person.cc addressbook.pb.cc -lprotobuf -lpthread -o add_person_cpp
list_people_cpp: list_people.cc protoc_middleman
- c++ list_people.cc addressbook.pb.cc -lprotobuf -o list_people_cpp
+ c++ list_people.cc addressbook.pb.cc -lprotobuf -lpthread -o list_people_cpp
javac_middleman: AddPerson.java ListPeople.java protoc_middleman
javac AddPerson.java ListPeople.java com/example/tutorial/AddressBookProtos.java
diff --git a/examples/README.txt b/examples/README.txt
index b0d1a0c2..d22bf06c 100644
--- a/examples/README.txt
+++ b/examples/README.txt
@@ -15,7 +15,7 @@ creates the following executable files in the current directory:
add_person_java list_people_java
add_person_python list_people_python
-If you only want to compile examples in one language, use "make cpp",
+If you only want to compile examples in one language, use "make cpp"*,
"make java", or "make python".
All of these programs simply take an address book file as their parameter.
@@ -23,3 +23,7 @@ The add_person programs will create the file if it doesn't already exist.
These examples are part of the Protocol Buffers tutorial, located at:
http://code.google.com/apis/protocolbuffers/docs/tutorials.html
+
+* Note that on some platforms you may have to edit the Makefile and remove
+"-lpthread" from the linker commands (perhaps replacing it with something else).
+We didn't do this automatically because we wanted to keep the example simple.