diff options
author | Feng Xiao <xiaofeng@google.com> | 2015-08-25 18:00:26 -0700 |
---|---|---|
committer | Feng Xiao <xiaofeng@google.com> | 2015-08-25 18:00:26 -0700 |
commit | 5da0b46811a103bd1a953f496d4bcd5ff45d3736 (patch) | |
tree | 0936b4a6d43832a8c9a671e4b780cd5e19bb398b /Makefile.am | |
parent | ed91f89f73f703590444f7c9ed816f1e3c3d9221 (diff) | |
parent | ff7bdad231d037802fd457ee4fd65e0291d366d7 (diff) | |
download | protobuf-5da0b46811a103bd1a953f496d4bcd5ff45d3736.tar.gz protobuf-5da0b46811a103bd1a953f496d4bcd5ff45d3736.tar.bz2 protobuf-5da0b46811a103bd1a953f496d4bcd5ff45d3736.zip |
Merge pull request #734 from TeBoring/beta-1
Fix bugs on windows
Diffstat (limited to 'Makefile.am')
-rw-r--r-- | Makefile.am | 59 |
1 files changed, 32 insertions, 27 deletions
diff --git a/Makefile.am b/Makefile.am index fad35a09..0e137c0e 100644 --- a/Makefile.am +++ b/Makefile.am @@ -594,33 +594,38 @@ ruby_EXTRA_DIST= \ all_EXTRA_DIST=$(csharp_EXTRA_DIST) $(java_EXTRA_DIST) $(javanano_EXTRA_DIST) $(objectivec_EXTRA_DIST) $(python_EXTRA_DIST) $(ruby_EXTRA_DIST) -EXTRA_DIST = $(@DIST_LANG@_EXTRA_DIST) \ - autogen.sh \ - generate_descriptor_proto.sh \ - README.md \ - INSTALL.txt \ - LICENSE \ - CONTRIBUTORS.txt \ - CHANGES.txt \ - update_file_lists.sh \ - cmake/CMakeLists.txt \ - cmake/libprotobuf.cmake \ - cmake/libprotobuf-lite.cmake \ - cmake/libprotoc.cmake \ - cmake/protoc.cmake \ - cmake/README.md \ - cmake/tests.cmake \ - editors/README.txt \ - editors/proto.vim \ - editors/protobuf-mode.el \ - 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 \ +EXTRA_DIST = $(@DIST_LANG@_EXTRA_DIST) \ + autogen.sh \ + generate_descriptor_proto.sh \ + README.md \ + INSTALL.txt \ + LICENSE \ + CONTRIBUTORS.txt \ + CHANGES.txt \ + update_file_lists.sh \ + cmake/CMakeLists.txt \ + cmake/README.md \ + cmake/extract_includes.bat.in \ + cmake/install.cmake \ + cmake/libprotobuf.cmake \ + cmake/libprotobuf-lite.cmake \ + cmake/libprotoc.cmake \ + cmake/protobuf-config-version.cmake.in \ + cmake/protobuf-config.cmake.in \ + cmake/protobuf-module.cmake.in \ + cmake/protoc.cmake \ + cmake/tests.cmake \ + editors/README.txt \ + editors/proto.vim \ + editors/protobuf-mode.el \ + 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. |