Skip to content

P
protobuf
Commit a86baaa2 authored by Jisi Liu's avatar Jisi Liu
Browse files
Options

Exclude pbconfg.h from dist, otherwise it breaks VS builds. 

Change-Id: I7f745929b137b93c122448a4a2d9a7bbab6648d6
parent f8e7a46b
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 3 deletions
src/Makefile.am
View file @ a86baaa2
...@@ -126,7 +126,7 @@ nobase_include_HEADERS = \ ...@@ -126,7 +126,7 @@ nobase_include_HEADERS = \
google/protobuf/compiler/ruby/ruby_generator.h google/protobuf/compiler/ruby/ruby_generator.h
nobase_nodist_include_HEADERS = \ nobase_nodist_include_HEADERS = \
$(public_config) $(public_config)
lib_LTLIBRARIES = libprotobuf-lite.la libprotobuf.la libprotoc.la lib_LTLIBRARIES = libprotobuf-lite.la libprotobuf.la libprotoc.la
...@@ -152,8 +152,8 @@ libprotobuf_lite_la_SOURCES = \ ...@@ -152,8 +152,8 @@ libprotobuf_lite_la_SOURCES = \
google/protobuf/io/coded_stream.cc \ google/protobuf/io/coded_stream.cc \
google/protobuf/io/coded_stream_inl.h \ google/protobuf/io/coded_stream_inl.h \
google/protobuf/io/zero_copy_stream.cc \ google/protobuf/io/zero_copy_stream.cc \
google/protobuf/io/zero_copy_stream_impl_lite.cc \ google/protobuf/io/zero_copy_stream_impl_lite.cc
$(public_config) nodist_libprotobuf_lite_la_SOURCES = $(public_config)
libprotobuf_la_LIBADD = $(PTHREAD_LIBS) libprotobuf_la_LIBADD = $(PTHREAD_LIBS)
libprotobuf_la_LDFLAGS = -version-info 10:0:0 -export-dynamic -no-undefined libprotobuf_la_LDFLAGS = -version-info 10:0:0 -export-dynamic -no-undefined
...@@ -185,6 +185,7 @@ libprotobuf_la_SOURCES = \ ...@@ -185,6 +185,7 @@ libprotobuf_la_SOURCES = \
google/protobuf/io/zero_copy_stream_impl.cc \ google/protobuf/io/zero_copy_stream_impl.cc \
google/protobuf/compiler/importer.cc \ google/protobuf/compiler/importer.cc \
google/protobuf/compiler/parser.cc google/protobuf/compiler/parser.cc
nodist_libprotobuf_la_SOURCES = $(nodist_libprotobuf_lite_la_SOURCES)
libprotoc_la_LIBADD = $(PTHREAD_LIBS) libprotobuf.la libprotoc_la_LIBADD = $(PTHREAD_LIBS) libprotobuf.la
libprotoc_la_LDFLAGS = -version-info 10:0:0 -export-dynamic -no-undefined libprotoc_la_LDFLAGS = -version-info 10:0:0 -export-dynamic -no-undefined
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment