diff options
| author | Bo Yang <teboring@teboring-macpro.roam.corp.google.com> | 2015-05-25 12:48:03 -0700 |
|---|---|---|
| committer | Bo Yang <teboring@teboring-macpro.roam.corp.google.com> | 2015-05-25 12:48:03 -0700 |
| commit | 50a765ba03ddf311a4facc78104903e3ba5b3e8b (patch) | |
| tree | 01b36604d8f6a9579fa160e43477f381f22524d7 /Makefile.am | |
| parent | ad0a5cab521d86fcadb8991427395e77daca71a6 (diff) | |
| download | protobuf-50a765ba03ddf311a4facc78104903e3ba5b3e8b.tar.gz protobuf-50a765ba03ddf311a4facc78104903e3ba5b3e8b.tar.bz2 protobuf-50a765ba03ddf311a4facc78104903e3ba5b3e8b.zip | |
Fix bugs in objective-c.
Diffstat (limited to 'Makefile.am')
| -rw-r--r-- | Makefile.am | 49 |
1 files changed, 33 insertions, 16 deletions
diff --git a/Makefile.am b/Makefile.am index d9535149..e4ca4c12 100644 --- a/Makefile.am +++ b/Makefile.am @@ -213,15 +213,31 @@ javanano_EXTRA_DIST= objectivec_EXTRA_DIST= \ objectivec/DevTools/check_version_stamps.sh \ + objectivec/DevTools/full_mac_build.sh \ objectivec/DevTools/pddm.py \ objectivec/DevTools/pddm_tests.py \ - objectivec/generate_descriptors_proto.sh \ - 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/Timestamp.pbobjc.h \ - objectivec/google/protobuf/Timestamp.pbobjc.m \ + 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 \ + objectivec//google/protobuf/Empty.pbobjc.m \ + objectivec//google/protobuf/FieldMask.pbobjc.h \ + objectivec//google/protobuf/FieldMask.pbobjc.m \ + objectivec//google/protobuf/SourceContext.pbobjc.h \ + objectivec//google/protobuf/SourceContext.pbobjc.m \ + objectivec//google/protobuf/Struct.pbobjc.h \ + objectivec//google/protobuf/Struct.pbobjc.m \ + objectivec//google/protobuf/Timestamp.pbobjc.h \ + objectivec//google/protobuf/Timestamp.pbobjc.m \ + objectivec//google/protobuf/Type.pbobjc.h \ + objectivec//google/protobuf/Type.pbobjc.m \ + objectivec//google/protobuf/Wrappers.pbobjc.h \ + objectivec//google/protobuf/Wrappers.pbobjc.m \ objectivec/GPBArray.h \ objectivec/GPBArray.m \ objectivec/GPBArray_PackagePrivate.h \ @@ -277,6 +293,7 @@ objectivec_EXTRA_DIST= \ objectivec/ProtocolBuffers_OSX.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings \ objectivec/ProtocolBuffers_OSX.xcodeproj/xcshareddata/xcschemes/PerformanceTests.xcscheme \ objectivec/ProtocolBuffers_OSX.xcodeproj/xcshareddata/xcschemes/ProtocolBuffers.xcscheme \ + objectivec/README.md \ objectivec/Tests/Filter1.txt \ objectivec/Tests/Filter2.txt \ objectivec/Tests/golden_message \ @@ -311,15 +328,15 @@ objectivec_EXTRA_DIST= \ objectivec/Tests/GPBWireFormatTests.m \ objectivec/Tests/iOSTestHarness/AppDelegate.m \ objectivec/Tests/iOSTestHarness/en.lproj/InfoPlist.strings \ - objectivec/Tests/iOSTestHarness/Images.xcassets/AppIcon.appiconset/Contents.json \ - objectivec/Tests/iOSTestHarness/Images.xcassets/AppIcon.appiconset/iPad6.png \ - objectivec/Tests/iOSTestHarness/Images.xcassets/AppIcon.appiconset/iPad6@2x.png \ - objectivec/Tests/iOSTestHarness/Images.xcassets/AppIcon.appiconset/iPad7.png \ - objectivec/Tests/iOSTestHarness/Images.xcassets/AppIcon.appiconset/iPad7@2x.png \ - objectivec/Tests/iOSTestHarness/Images.xcassets/AppIcon.appiconset/iPhone6.png \ - objectivec/Tests/iOSTestHarness/Images.xcassets/AppIcon.appiconset/iPhone6@2x.png \ - objectivec/Tests/iOSTestHarness/Images.xcassets/AppIcon.appiconset/iPhone7@2x.png \ - objectivec/Tests/iOSTestHarness/Images.xcassets/AppIcon.appiconset/iPhone7@3x.png \ + objectivec/Tests/iOSTestHarness/Images.xcassets/AppIcon.appiconset/Contents.json \ + objectivec/Tests/iOSTestHarness/Images.xcassets/AppIcon.appiconset/iPad6.png \ + objectivec/Tests/iOSTestHarness/Images.xcassets/AppIcon.appiconset/iPad6@2x.png \ + objectivec/Tests/iOSTestHarness/Images.xcassets/AppIcon.appiconset/iPad7.png \ + objectivec/Tests/iOSTestHarness/Images.xcassets/AppIcon.appiconset/iPad7@2x.png \ + objectivec/Tests/iOSTestHarness/Images.xcassets/AppIcon.appiconset/iPhone6.png \ + objectivec/Tests/iOSTestHarness/Images.xcassets/AppIcon.appiconset/iPhone6@2x.png \ + objectivec/Tests/iOSTestHarness/Images.xcassets/AppIcon.appiconset/iPhone7@2x.png \ + objectivec/Tests/iOSTestHarness/Images.xcassets/AppIcon.appiconset/iPhone7@3x.png \ objectivec/Tests/iOSTestHarness/Images.xcassets/LaunchImage.launchimage/Contents.json \ objectivec/Tests/iOSTestHarness/Info.plist \ objectivec/Tests/iOSTestHarness/LaunchScreen.xib \ |