diff options
| author | Jisi Liu <jisi.liu@gmail.com> | 2016-03-30 11:43:44 -0700 |
|---|---|---|
| committer | Jisi Liu <jisi.liu@gmail.com> | 2016-03-30 11:43:44 -0700 |
| commit | 0de06f54bc8253ba39eee9e8cc4c5de487a48835 (patch) | |
| tree | e66dec08e23df554f5c29a1dbb4592388815e4ec /Makefile.am | |
| parent | 3b3c8abb9635eb3ea078a821a99c9ef29d66dff7 (diff) | |
| parent | a25e9964b126a79e8a99bced2207ddca22d6a1a9 (diff) | |
| download | protobuf-0de06f54bc8253ba39eee9e8cc4c5de487a48835.tar.gz protobuf-0de06f54bc8253ba39eee9e8cc4c5de487a48835.tar.bz2 protobuf-0de06f54bc8253ba39eee9e8cc4c5de487a48835.zip | |
Merge branch 'master' of github.com:google/protobuf
Diffstat (limited to 'Makefile.am')
| -rw-r--r-- | Makefile.am | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/Makefile.am b/Makefile.am index a95fda73..cadc7d8d 100644 --- a/Makefile.am +++ b/Makefile.am @@ -389,13 +389,11 @@ objectivec_EXTRA_DIST= \ objectivec/DevTools/full_mac_build.sh \ objectivec/DevTools/pddm.py \ objectivec/DevTools/pddm_tests.py \ - objectivec/generate_descriptors_proto.sh \ + objectivec/generate_well_known_types.sh \ objectivec/google/protobuf/Any.pbobjc.h \ objectivec/google/protobuf/Any.pbobjc.m \ objectivec/google/protobuf/Api.pbobjc.h \ objectivec/google/protobuf/Api.pbobjc.m \ - objectivec/google/protobuf/Descriptor.pbobjc.h \ - objectivec/google/protobuf/Descriptor.pbobjc.m \ objectivec/google/protobuf/Duration.pbobjc.h \ objectivec/google/protobuf/Duration.pbobjc.m \ objectivec/google/protobuf/Empty.pbobjc.h \ @@ -421,6 +419,7 @@ objectivec_EXTRA_DIST= \ objectivec/GPBCodedInputStream_PackagePrivate.h \ objectivec/GPBCodedOutputStream.h \ objectivec/GPBCodedOutputStream.m \ + objectivec/GPBCodedOutputStream_PackagePrivate.h \ objectivec/GPBDescriptor.h \ objectivec/GPBDescriptor.m \ objectivec/GPBDescriptor_PackagePrivate.h \ @@ -661,7 +660,6 @@ ruby_EXTRA_DIST= \ ruby/tests/repeated_field_test.rb \ ruby/tests/stress.rb \ ruby/tests/generated_code.proto \ - ruby/tests/generated_code.rb \ ruby/tests/generated_code_test.rb \ ruby/travis-test.sh |