diff options
| author | Jisi Liu <jisi.liu@gmail.com> | 2015-02-25 20:39:13 -0800 |
|---|---|---|
| committer | Jisi Liu <jisi.liu@gmail.com> | 2015-02-25 20:39:13 -0800 |
| commit | a86baaa25620e0de6e625e8997dc8f244fe0e06f (patch) | |
| tree | 456ee9d6b3874d5eefb21cd2e208a50933d05e3c | |
| parent | f8e7a46bc25468b3571b0621c47d6b4d258f8c9b (diff) | |
| download | protobuf-a86baaa25620e0de6e625e8997dc8f244fe0e06f.tar.gz protobuf-a86baaa25620e0de6e625e8997dc8f244fe0e06f.tar.bz2 protobuf-a86baaa25620e0de6e625e8997dc8f244fe0e06f.zip | |
Exclude pbconfg.h from dist, otherwise it breaks VS builds.
Change-Id: I7f745929b137b93c122448a4a2d9a7bbab6648d6
| -rw-r--r-- | src/Makefile.am | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index 0d34de1e..b27c6a17 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -126,7 +126,7 @@ nobase_include_HEADERS = \ google/protobuf/compiler/ruby/ruby_generator.h nobase_nodist_include_HEADERS = \ - $(public_config) + $(public_config) lib_LTLIBRARIES = libprotobuf-lite.la libprotobuf.la libprotoc.la @@ -152,8 +152,8 @@ libprotobuf_lite_la_SOURCES = \ google/protobuf/io/coded_stream.cc \ google/protobuf/io/coded_stream_inl.h \ google/protobuf/io/zero_copy_stream.cc \ - google/protobuf/io/zero_copy_stream_impl_lite.cc \ - $(public_config) + google/protobuf/io/zero_copy_stream_impl_lite.cc +nodist_libprotobuf_lite_la_SOURCES = $(public_config) libprotobuf_la_LIBADD = $(PTHREAD_LIBS) libprotobuf_la_LDFLAGS = -version-info 10:0:0 -export-dynamic -no-undefined @@ -185,6 +185,7 @@ libprotobuf_la_SOURCES = \ google/protobuf/io/zero_copy_stream_impl.cc \ google/protobuf/compiler/importer.cc \ google/protobuf/compiler/parser.cc +nodist_libprotobuf_la_SOURCES = $(nodist_libprotobuf_lite_la_SOURCES) libprotoc_la_LIBADD = $(PTHREAD_LIBS) libprotobuf.la libprotoc_la_LDFLAGS = -version-info 10:0:0 -export-dynamic -no-undefined |