aboutsummaryrefslogtreecommitdiff
path: root/src/Makefile.am
diff options
context:
space:
mode:
authorJon Skeet <skeet@pobox.com>2015-07-17 07:29:50 +0100
committerJon Skeet <skeet@pobox.com>2015-07-17 07:29:50 +0100
commit0f442a7533b1d06ce0092b28f10af481b99e1369 (patch)
tree4f9cb3ecb2d8ab4f9c138a06d645a3cc3dcdeef3 /src/Makefile.am
parentfa544f4835623be66d73e1d984121ab4a92e1650 (diff)
parent34878cb14eba4578d1d67d2dc93250729d492774 (diff)
downloadprotobuf-0f442a7533b1d06ce0092b28f10af481b99e1369.tar.gz
protobuf-0f442a7533b1d06ce0092b28f10af481b99e1369.tar.bz2
protobuf-0f442a7533b1d06ce0092b28f10af481b99e1369.zip
Merge pull request #611 from jskeet/csharp-wrappers
C# wrapper types
Diffstat (limited to 'src/Makefile.am')
-rw-r--r--src/Makefile.am4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/Makefile.am b/src/Makefile.am
index 18e27772..865e78d2 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -442,7 +442,9 @@ libprotoc_la_SOURCES = \
google/protobuf/compiler/csharp/csharp_source_generator_base.cc \
google/protobuf/compiler/csharp/csharp_source_generator_base.h \
google/protobuf/compiler/csharp/csharp_umbrella_class.cc \
- google/protobuf/compiler/csharp/csharp_umbrella_class.h
+ google/protobuf/compiler/csharp/csharp_umbrella_class.h \
+ google/protobuf/compiler/csharp/csharp_wrapper_field.cc \
+ google/protobuf/compiler/csharp/csharp_wrapper_field.h
bin_PROGRAMS = protoc
protoc_LDADD = $(PTHREAD_LIBS) libprotobuf.la libprotoc.la