diff options
author | Adam Cozzette <acozzette@google.com> | 2018-08-01 13:44:55 -0700 |
---|---|---|
committer | Adam Cozzette <acozzette@google.com> | 2018-08-01 13:44:55 -0700 |
commit | 94d55e529204cc8575bf1070dc1e2375dbc8a4c5 (patch) | |
tree | 20730e597f914fd2430c66b9bebe633e017a4fe0 /src/Makefile.am | |
parent | 3d62db3ecd5377025a458bca827ab4ca12d5c1f0 (diff) | |
parent | 48cb18e5c419ddd23d9badcfe4e9df7bde1979b2 (diff) | |
download | protobuf-94d55e529204cc8575bf1070dc1e2375dbc8a4c5.tar.gz protobuf-94d55e529204cc8575bf1070dc1e2375dbc8a4c5.tar.bz2 protobuf-94d55e529204cc8575bf1070dc1e2375dbc8a4c5.zip |
Merge branch '3.6.x' into merge-3-6-x
Diffstat (limited to 'src/Makefile.am')
-rw-r--r-- | src/Makefile.am | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index 825bb285..9f829bf6 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -164,7 +164,7 @@ nobase_include_HEADERS = \ lib_LTLIBRARIES = libprotobuf-lite.la libprotobuf.la libprotoc.la libprotobuf_lite_la_LIBADD = $(PTHREAD_LIBS) -libprotobuf_lite_la_LDFLAGS = -version-info 16:0:0 -export-dynamic -no-undefined +libprotobuf_lite_la_LDFLAGS = -version-info 17:0:0 -export-dynamic -no-undefined if HAVE_LD_VERSION_SCRIPT libprotobuf_lite_la_LDFLAGS += -Wl,--version-script=$(srcdir)/libprotobuf-lite.map EXTRA_libprotobuf_lite_la_DEPENDENCIES = libprotobuf-lite.map @@ -210,7 +210,7 @@ libprotobuf_lite_la_SOURCES = \ google/protobuf/io/zero_copy_stream_impl_lite.cc libprotobuf_la_LIBADD = $(PTHREAD_LIBS) -libprotobuf_la_LDFLAGS = -version-info 16:0:0 -export-dynamic -no-undefined +libprotobuf_la_LDFLAGS = -version-info 17:0:0 -export-dynamic -no-undefined if HAVE_LD_VERSION_SCRIPT libprotobuf_la_LDFLAGS += -Wl,--version-script=$(srcdir)/libprotobuf.map EXTRA_libprotobuf_la_DEPENDENCIES = libprotobuf.map @@ -301,7 +301,7 @@ libprotobuf_la_SOURCES = \ nodist_libprotobuf_la_SOURCES = $(nodist_libprotobuf_lite_la_SOURCES) libprotoc_la_LIBADD = $(PTHREAD_LIBS) libprotobuf.la -libprotoc_la_LDFLAGS = -version-info 16:0:0 -export-dynamic -no-undefined +libprotoc_la_LDFLAGS = -version-info 17:0:0 -export-dynamic -no-undefined if HAVE_LD_VERSION_SCRIPT libprotoc_la_LDFLAGS += -Wl,--version-script=$(srcdir)/libprotoc.map EXTRA_libprotoc_la_DEPENDENCIES = libprotoc.map |