← Back to branch summary

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

« back to all changes in this revision

Viewing changes to 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).

Show diffs side-by-side

added added

removed removed

Lines of Context:
Makefile.am
2
2
 
3
3
ACLOCAL_AMFLAGS = -I m4
4
4
 
 
5
AUTOMAKE_OPTIONS = foreign
 
6
 
5
7
SUBDIRS = src
6
8
 
7
9
EXTRA_DIST =                                                                 \
68
70
  java/pom.xml                                                               \
69
71
  java/README.txt                                                            \
70
72
  python/google/protobuf/internal/generator_test.py                          \
 
73
  python/google/protobuf/internal/containers.py                              \
71
74
  python/google/protobuf/internal/decoder.py                                 \
72
75
  python/google/protobuf/internal/decoder_test.py                            \
73
76
  python/google/protobuf/internal/descriptor_test.py                         \
84
87
  python/google/protobuf/internal/service_reflection_test.py                 \
85
88
  python/google/protobuf/internal/test_util.py                               \
86
89
  python/google/protobuf/internal/text_format_test.py                        \
 
90
  python/google/protobuf/internal/type_checkers.py                           \
87
91
  python/google/protobuf/internal/wire_format.py                             \
88
92
  python/google/protobuf/internal/wire_format_test.py                        \
89
93
  python/google/protobuf/internal/__init__.py                                \