← Back to branch summary

~ubuntu-branches/debian/squeeze/protobuf/squeeze

~ubuntu-branches/debian/squeeze/protobuf/squeeze

« back to all changes in this revision

Viewing changes to src/Makefile.am

Committer: Bazaar Package Importer
Author(s): Julien Cristau
Date: 2009-06-02 16:19:00 UTC
mfrom: (1.1.2 upstream)
Revision ID: james.westby@ubuntu.com-20090602161900-vm176i3ryt35yk91

Tags: 2.0.3-2.2

* Non-maintainer upload.
* Fix FTBFS from -2.1: don't fail when we can't clean up the java build,
  such as when openjdk isn't installed.
* Disable parallel builds, because libtool is made of fail (if binary-arch
  and build-indep run concurrently, we relink a library while it's being
  used; that doesn't work so well).

files added:
debian/libprotobuf3.install

debian/pkg-test.sh

m4/ac_system_extensions.m4

m4/libtool.m4

m4/ltoptions.m4

m4/ltsugar.m4

m4/ltversion.m4

m4/lt~obsolete.m4

python/google/protobuf/internal/containers.py

python/google/protobuf/internal/type_checkers.py

src/google/protobuf/compiler/package_info.h

src/google/protobuf/io/package_info.h

src/google/protobuf/package_info.h

src/google/protobuf/stubs/structurally_valid.cc

src/google/protobuf/stubs/structurally_valid_unittest.cc

src/google/protobuf/unittest_custom_options.proto

src/gtest/CHANGES

src/gtest/CONTRIBUTORS

src/gtest/COPYING

src/gtest/README

src/gtest/gen_gtest_pred_impl.py

files removed:
debian/libprotobuf0.install

debian/libprotobuf0.postinst

debian/libprotobuf0.postrm

files modified:
CHANGES.txt

CONTRIBUTORS.txt

COPYING.txt

Makefile.am

Makefile.in

README.txt

aclocal.m4

autogen.sh

config.h.in

configure

configure.ac

debian/changelog

debian/control

debian/copyright

debian/java-build.xml

debian/libprotobuf-java.links

debian/protoc.xml

debian/rules

editors/proto.vim

examples/list_people.py

generate_descriptor_proto.sh

java/README.txt

java/pom.xml

java/src/main/java/com/google/protobuf/AbstractMessage.java

java/src/main/java/com/google/protobuf/ByteString.java

java/src/main/java/com/google/protobuf/CodedInputStream.java

java/src/main/java/com/google/protobuf/CodedOutputStream.java

java/src/main/java/com/google/protobuf/Descriptors.java

java/src/main/java/com/google/protobuf/DynamicMessage.java

java/src/main/java/com/google/protobuf/ExtensionRegistry.java

java/src/main/java/com/google/protobuf/FieldSet.java

java/src/main/java/com/google/protobuf/GeneratedMessage.java

java/src/main/java/com/google/protobuf/InvalidProtocolBufferException.java

java/src/main/java/com/google/protobuf/Message.java

java/src/main/java/com/google/protobuf/RpcCallback.java

java/src/main/java/com/google/protobuf/RpcChannel.java

java/src/main/java/com/google/protobuf/RpcController.java

java/src/main/java/com/google/protobuf/RpcUtil.java

java/src/main/java/com/google/protobuf/Service.java

java/src/main/java/com/google/protobuf/TextFormat.java

java/src/main/java/com/google/protobuf/UninitializedMessageException.java

java/src/main/java/com/google/protobuf/UnknownFieldSet.java

java/src/main/java/com/google/protobuf/WireFormat.java

java/src/test/java/com/google/protobuf/AbstractMessageTest.java

java/src/test/java/com/google/protobuf/CodedInputStreamTest.java

java/src/test/java/com/google/protobuf/CodedOutputStreamTest.java

java/src/test/java/com/google/protobuf/DescriptorsTest.java

java/src/test/java/com/google/protobuf/DynamicMessageTest.java

java/src/test/java/com/google/protobuf/GeneratedMessageTest.java

java/src/test/java/com/google/protobuf/MessageTest.java

java/src/test/java/com/google/protobuf/ServiceTest.java

java/src/test/java/com/google/protobuf/TestUtil.java

java/src/test/java/com/google/protobuf/TextFormatTest.java

java/src/test/java/com/google/protobuf/UnknownFieldSetTest.java

java/src/test/java/com/google/protobuf/WireFormatTest.java

java/src/test/java/com/google/protobuf/multiple_files_test.proto

ltmain.sh *

python/README.txt

python/google/protobuf/descriptor.py

python/google/protobuf/internal/decoder.py

python/google/protobuf/internal/decoder_test.py

python/google/protobuf/internal/descriptor_test.py

python/google/protobuf/internal/encoder.py

python/google/protobuf/internal/encoder_test.py

python/google/protobuf/internal/generator_test.py

python/google/protobuf/internal/input_stream.py

python/google/protobuf/internal/input_stream_test.py

python/google/protobuf/internal/message_listener.py

python/google/protobuf/internal/more_extensions.proto

python/google/protobuf/internal/more_messages.proto

python/google/protobuf/internal/output_stream.py

python/google/protobuf/internal/output_stream_test.py

python/google/protobuf/internal/reflection_test.py

python/google/protobuf/internal/service_reflection_test.py

python/google/protobuf/internal/test_util.py

python/google/protobuf/internal/text_format_test.py

python/google/protobuf/internal/wire_format.py

python/google/protobuf/internal/wire_format_test.py

python/google/protobuf/message.py

python/google/protobuf/reflection.py

python/google/protobuf/service.py

python/google/protobuf/service_reflection.py

python/google/protobuf/text_format.py

python/setup.py

src/Makefile.am

src/Makefile.in

src/google/protobuf/compiler/code_generator.cc

src/google/protobuf/compiler/code_generator.h

src/google/protobuf/compiler/command_line_interface.cc

src/google/protobuf/compiler/command_line_interface.h

src/google/protobuf/compiler/command_line_interface_unittest.cc

src/google/protobuf/compiler/cpp/cpp_bootstrap_unittest.cc

src/google/protobuf/compiler/cpp/cpp_enum.cc

src/google/protobuf/compiler/cpp/cpp_enum.h

src/google/protobuf/compiler/cpp/cpp_enum_field.cc

src/google/protobuf/compiler/cpp/cpp_enum_field.h

src/google/protobuf/compiler/cpp/cpp_extension.cc

src/google/protobuf/compiler/cpp/cpp_extension.h

src/google/protobuf/compiler/cpp/cpp_field.cc

src/google/protobuf/compiler/cpp/cpp_field.h

src/google/protobuf/compiler/cpp/cpp_file.cc

src/google/protobuf/compiler/cpp/cpp_file.h

src/google/protobuf/compiler/cpp/cpp_generator.cc

src/google/protobuf/compiler/cpp/cpp_generator.h

src/google/protobuf/compiler/cpp/cpp_helpers.cc

src/google/protobuf/compiler/cpp/cpp_helpers.h

src/google/protobuf/compiler/cpp/cpp_message.cc

src/google/protobuf/compiler/cpp/cpp_message.h

src/google/protobuf/compiler/cpp/cpp_message_field.cc

src/google/protobuf/compiler/cpp/cpp_message_field.h

src/google/protobuf/compiler/cpp/cpp_primitive_field.cc

src/google/protobuf/compiler/cpp/cpp_primitive_field.h

src/google/protobuf/compiler/cpp/cpp_service.cc

src/google/protobuf/compiler/cpp/cpp_service.h

src/google/protobuf/compiler/cpp/cpp_string_field.cc

src/google/protobuf/compiler/cpp/cpp_string_field.h

src/google/protobuf/compiler/cpp/cpp_test_bad_identifiers.proto

src/google/protobuf/compiler/cpp/cpp_unittest.cc

src/google/protobuf/compiler/importer.cc

src/google/protobuf/compiler/importer.h

src/google/protobuf/compiler/importer_unittest.cc

src/google/protobuf/compiler/java/java_enum.cc

src/google/protobuf/compiler/java/java_enum.h

src/google/protobuf/compiler/java/java_enum_field.cc

src/google/protobuf/compiler/java/java_enum_field.h

src/google/protobuf/compiler/java/java_extension.cc

src/google/protobuf/compiler/java/java_extension.h

src/google/protobuf/compiler/java/java_field.cc

src/google/protobuf/compiler/java/java_field.h

src/google/protobuf/compiler/java/java_file.cc

src/google/protobuf/compiler/java/java_file.h

src/google/protobuf/compiler/java/java_generator.cc

src/google/protobuf/compiler/java/java_generator.h

src/google/protobuf/compiler/java/java_helpers.cc

src/google/protobuf/compiler/java/java_helpers.h

src/google/protobuf/compiler/java/java_message.cc

src/google/protobuf/compiler/java/java_message.h

src/google/protobuf/compiler/java/java_message_field.cc

src/google/protobuf/compiler/java/java_message_field.h

src/google/protobuf/compiler/java/java_primitive_field.cc

src/google/protobuf/compiler/java/java_primitive_field.h

src/google/protobuf/compiler/java/java_service.cc

src/google/protobuf/compiler/java/java_service.h

src/google/protobuf/compiler/main.cc

src/google/protobuf/compiler/parser.cc

src/google/protobuf/compiler/parser.h

src/google/protobuf/compiler/parser_unittest.cc

src/google/protobuf/compiler/python/python_generator.cc

src/google/protobuf/compiler/python/python_generator.h

src/google/protobuf/descriptor.cc

src/google/protobuf/descriptor.h

src/google/protobuf/descriptor.pb.cc

src/google/protobuf/descriptor.pb.h

src/google/protobuf/descriptor.proto

src/google/protobuf/descriptor_database.cc

src/google/protobuf/descriptor_database.h

src/google/protobuf/descriptor_database_unittest.cc

src/google/protobuf/descriptor_unittest.cc

src/google/protobuf/dynamic_message.cc

src/google/protobuf/dynamic_message.h

src/google/protobuf/dynamic_message_unittest.cc

src/google/protobuf/extension_set.cc

src/google/protobuf/extension_set.h

src/google/protobuf/extension_set_unittest.cc

src/google/protobuf/generated_message_reflection.cc

src/google/protobuf/generated_message_reflection.h

src/google/protobuf/generated_message_reflection_unittest.cc

src/google/protobuf/io/coded_stream.cc

src/google/protobuf/io/coded_stream.h

src/google/protobuf/io/coded_stream_unittest.cc

src/google/protobuf/io/printer.cc

src/google/protobuf/io/printer.h

src/google/protobuf/io/printer_unittest.cc

src/google/protobuf/io/tokenizer.cc

src/google/protobuf/io/tokenizer.h

src/google/protobuf/io/tokenizer_unittest.cc

src/google/protobuf/io/zero_copy_stream.cc

src/google/protobuf/io/zero_copy_stream.h

src/google/protobuf/io/zero_copy_stream_impl.cc

src/google/protobuf/io/zero_copy_stream_impl.h

src/google/protobuf/io/zero_copy_stream_unittest.cc

src/google/protobuf/message.cc

src/google/protobuf/message.h

src/google/protobuf/message_unittest.cc

src/google/protobuf/reflection_ops.cc

src/google/protobuf/reflection_ops.h

src/google/protobuf/reflection_ops_unittest.cc

src/google/protobuf/repeated_field.cc

src/google/protobuf/repeated_field.h

src/google/protobuf/repeated_field_unittest.cc

src/google/protobuf/service.cc

src/google/protobuf/service.h

src/google/protobuf/stubs/common.cc

src/google/protobuf/stubs/common.h

src/google/protobuf/stubs/common_unittest.cc

src/google/protobuf/stubs/hash.cc

src/google/protobuf/stubs/hash.h

src/google/protobuf/stubs/map-util.cc

src/google/protobuf/stubs/map-util.h

src/google/protobuf/stubs/stl_util-inl.cc

src/google/protobuf/stubs/stl_util-inl.h

src/google/protobuf/stubs/strutil.cc

src/google/protobuf/stubs/strutil.h

src/google/protobuf/stubs/strutil_unittest.cc

src/google/protobuf/stubs/substitute.cc

src/google/protobuf/stubs/substitute.h

src/google/protobuf/test_util.cc

src/google/protobuf/test_util.h

src/google/protobuf/testing/file.cc

src/google/protobuf/testing/file.h

src/google/protobuf/testing/googletest.cc

src/google/protobuf/testing/googletest.h

src/google/protobuf/text_format.cc

src/google/protobuf/text_format.h

src/google/protobuf/text_format_unittest.cc

src/google/protobuf/unittest.proto

src/google/protobuf/unittest_embed_optimize_for.proto

src/google/protobuf/unittest_import.proto

src/google/protobuf/unittest_mset.proto

src/google/protobuf/unittest_optimize_for.proto

src/google/protobuf/unknown_field_set.cc

src/google/protobuf/unknown_field_set.h

src/google/protobuf/unknown_field_set_unittest.cc

src/google/protobuf/wire_format.cc

src/google/protobuf/wire_format.h

src/google/protobuf/wire_format_inl.h

src/google/protobuf/wire_format_unittest.cc

src/gtest/gtest-death-test.cc

src/gtest/gtest.cc

src/gtest/internal/gtest-internal.h

src/gtest/internal/gtest-port.h

vsprojects/libprotobuf.vcproj

vsprojects/libprotoc.vcproj

vsprojects/readme.txt

vsprojects/tests.vcproj

Show diffs side-by-side

added added

removed removed

src/Makefile.am

55

55

lib_LTLIBRARIES = libprotobuf.la libprotoc.la

56

56

57

57

libprotobuf_la_LIBADD = $(PTHREAD_LIBS)

58

libprotobuf_la_LDFLAGS = -version-info 0:0:0

58

libprotobuf_la_LDFLAGS = -version-info 3:0:0

59

59

libprotobuf_la_SOURCES = \

60

60

google/protobuf/stubs/common.cc \

61

61

google/protobuf/stubs/hash.cc \

68

68

google/protobuf/stubs/substitute.h \

69

69

google/protobuf/stubs/strutil.cc \

70

70

google/protobuf/stubs/strutil.h \

71

google/protobuf/stubs/structurally_valid.cc \

71

72

google/protobuf/descriptor.cc \

72

73

google/protobuf/descriptor.pb.cc \

73

74

google/protobuf/descriptor_database.cc \

90

91

google/protobuf/compiler/parser.cc

91

92

92

93

libprotoc_la_LIBADD = $(PTHREAD_LIBS) libprotobuf.la

93

libprotoc_la_LDFLAGS = -version-info 0:0:0

94

libprotoc_la_LDFLAGS = -version-info 3:0:0

94

95

libprotoc_la_SOURCES = \

95

96

google/protobuf/compiler/code_generator.cc \

96

97

google/protobuf/compiler/command_line_interface.cc \

152

153

google/protobuf/unittest_mset.proto \

153

154

google/protobuf/unittest_optimize_for.proto \

154

155

google/protobuf/unittest_embed_optimize_for.proto \

156

google/protobuf/unittest_custom_options.proto \

155

157

google/protobuf/compiler/cpp/cpp_test_bad_identifiers.proto

156

158

157

159

EXTRA_DIST = \

159

161

solaris/libstdc++.la \

160

162

google/protobuf/testdata/golden_message \

161

163

google/protobuf/testdata/text_format_unittest_data.txt \

162

google/protobuf/testdata/text_format_unittest_extensions_data.txt

164

google/protobuf/testdata/text_format_unittest_extensions_data.txt \

165

google/protobuf/package_info.h \

166

google/protobuf/io/package_info.h \

167

google/protobuf/compiler/package_info.h \

168

gtest/CHANGES \

169

gtest/CONTRIBUTORS \

170

gtest/COPYING \

171

gtest/README \

172

gtest/gen_gtest_pred_impl.py

163

173

164

174

protoc_outputs = \

165

175

google/protobuf/unittest.pb.cc \

172

182

google/protobuf/unittest_optimize_for.pb.h \

173

183

google/protobuf/unittest_embed_optimize_for.pb.cc \

174

184

google/protobuf/unittest_embed_optimize_for.pb.h \

185

google/protobuf/unittest_custom_options.pb.cc \

186

google/protobuf/unittest_custom_options.pb.h \

175

187

google/protobuf/compiler/cpp/cpp_test_bad_identifiers.pb.cc \

176

188

google/protobuf/compiler/cpp/cpp_test_bad_identifiers.pb.h

177

189

193

205

194

206

$(protoc_outputs): unittest_proto_middleman

195

207

196

noinst_PROGRAMS = protobuf-test

208

check_PROGRAMS = protobuf-test

197

209

protobuf_test_LDADD = $(PTHREAD_LIBS) libprotobuf.la libprotoc.la

198

210

protobuf_test_SOURCES = \

199

211

google/protobuf/stubs/common_unittest.cc \

200

212

google/protobuf/stubs/strutil_unittest.cc \

213

google/protobuf/stubs/structurally_valid_unittest.cc \

201

214

google/protobuf/descriptor_database_unittest.cc \

202

215

google/protobuf/descriptor_unittest.cc \

203

216

google/protobuf/dynamic_message_unittest.cc \

Older »