diff options
author | Feng Xiao <xfxyjwf@gmail.com> | 2014-12-02 15:47:00 -0800 |
---|---|---|
committer | Feng Xiao <xfxyjwf@gmail.com> | 2014-12-02 15:47:00 -0800 |
commit | e45149b4a77135a16663c98ef9815c289ded02e7 (patch) | |
tree | 7150592cd5aaa9bb33cfcd23ee8e38330e919042 /Makefile.am | |
parent | ef4311302f414ad70fecc4dd82953bc9933dcea4 (diff) | |
parent | 8f7dec8ee149aa00d43b7f19ee7d8027cbf8fb5d (diff) | |
download | protobuf-e45149b4a77135a16663c98ef9815c289ded02e7.tar.gz protobuf-e45149b4a77135a16663c98ef9815c289ded02e7.tar.bz2 protobuf-e45149b4a77135a16663c98ef9815c289ded02e7.zip |
Merge pull request #115 from xfxyjwf/fix_107
Add a ./configure flag "DIST_LANG".
Diffstat (limited to 'Makefile.am')
-rw-r--r-- | Makefile.am | 72 |
1 files changed, 39 insertions, 33 deletions
diff --git a/Makefile.am b/Makefile.am index 4a29e1cf..6bda5157 100644 --- a/Makefile.am +++ b/Makefile.am @@ -35,38 +35,7 @@ clean-local: pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = protobuf.pc protobuf-lite.pc -EXTRA_DIST = \ - autogen.sh \ - generate_descriptor_proto.sh \ - README.md \ - INSTALL.txt \ - LICENSE \ - CONTRIBUTORS.txt \ - CHANGES.txt \ - editors/README.txt \ - editors/proto.vim \ - editors/protobuf-mode.el \ - vsprojects/config.h \ - vsprojects/extract_includes.bat \ - vsprojects/libprotobuf.vcproj \ - vsprojects/libprotobuf-lite.vcproj \ - vsprojects/libprotoc.vcproj \ - vsprojects/protobuf.sln \ - vsprojects/protoc.vcproj \ - vsprojects/readme.txt \ - vsprojects/test_plugin.vcproj \ - vsprojects/tests.vcproj \ - vsprojects/lite-test.vcproj \ - vsprojects/convert2008to2005.sh \ - examples/README.txt \ - examples/Makefile \ - examples/addressbook.proto \ - examples/add_person.cc \ - examples/list_people.cc \ - examples/AddPerson.java \ - examples/ListPeople.java \ - examples/add_person.py \ - examples/list_people.py \ +java_EXTRA_DIST= \ java/src/main/java/com/google/protobuf/AbstractMessage.java \ java/src/main/java/com/google/protobuf/AbstractMessageLite.java \ java/src/main/java/com/google/protobuf/AbstractParser.java \ @@ -182,7 +151,9 @@ EXTRA_DIST = \ java/src/test/java/com/google/protobuf/test_check_utf8_size.proto \ java/src/test/java/com/google/protobuf/test_custom_options.proto \ java/pom.xml \ - java/README.txt \ + java/README.txt + +python_EXTRA_DIST= \ python/google/protobuf/internal/api_implementation.cc \ python/google/protobuf/internal/api_implementation.py \ python/google/protobuf/internal/api_implementation_default_test.py \ @@ -267,6 +238,41 @@ EXTRA_DIST = \ python/stubout.py \ python/README.txt +all_EXTRA_DIST=$(java_EXTRA_DIST) $(python_EXTRA_DIST) + +EXTRA_DIST = $(@DIST_LANG@_EXTRA_DIST) \ + autogen.sh \ + generate_descriptor_proto.sh \ + README.md \ + INSTALL.txt \ + LICENSE \ + CONTRIBUTORS.txt \ + CHANGES.txt \ + editors/README.txt \ + editors/proto.vim \ + editors/protobuf-mode.el \ + vsprojects/config.h \ + vsprojects/extract_includes.bat \ + vsprojects/libprotobuf.vcproj \ + vsprojects/libprotobuf-lite.vcproj \ + vsprojects/libprotoc.vcproj \ + vsprojects/protobuf.sln \ + vsprojects/protoc.vcproj \ + vsprojects/readme.txt \ + vsprojects/test_plugin.vcproj \ + vsprojects/tests.vcproj \ + vsprojects/lite-test.vcproj \ + vsprojects/convert2008to2005.sh \ + examples/README.txt \ + examples/Makefile \ + examples/addressbook.proto \ + examples/add_person.cc \ + examples/list_people.cc \ + examples/AddPerson.java \ + examples/ListPeople.java \ + examples/add_person.py \ + examples/list_people.py + # Deletes all the files generated by autogen.sh. MAINTAINERCLEANFILES = \ aclocal.m4 \ |