aboutsummaryrefslogtreecommitdiff
path: root/src/Makefile.am
diff options
context:
space:
mode:
authorpliard@google.com <pliard@google.com@630680e5-0e50-0410-840e-4b1c322b438d>2012-03-02 13:04:36 +0000
committerpliard@google.com <pliard@google.com@630680e5-0e50-0410-840e-4b1c322b438d>2012-03-02 13:04:36 +0000
commitf5de486b533e0f0a22d7a4b3606619dda65e294d (patch)
tree1f6b70d56972daa90ddd5c38e81db5a875e8814c /src/Makefile.am
parentcb6dd4ef5f82e41e06179dcd57d3b1d9246ad6ac (diff)
downloadprotobuf-f5de486b533e0f0a22d7a4b3606619dda65e294d.tar.gz
protobuf-f5de486b533e0f0a22d7a4b3606619dda65e294d.tar.bz2
protobuf-f5de486b533e0f0a22d7a4b3606619dda65e294d.zip
Add atomicops from V8.
Diffstat (limited to 'src/Makefile.am')
-rw-r--r--src/Makefile.am8
1 files changed, 8 insertions, 0 deletions
diff --git a/src/Makefile.am b/src/Makefile.am
index 327339a9..1929c50e 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -38,7 +38,14 @@ MAINTAINERCLEANFILES = \
Makefile.in
nobase_include_HEADERS = \
+ google/protobuf/stubs/atomicops.h \
+ google/protobuf/stubs/atomicops_internals_arm_gcc.h \
+ google/protobuf/stubs/atomicops_internals_mips_gcc.h \
+ google/protobuf/stubs/atomicops_internals_x86_gcc.h \
+ google/protobuf/stubs/atomicops_internals_x86_macosx.h \
+ google/protobuf/stubs/atomicops_internals_x86_msvc.h \
google/protobuf/stubs/common.h \
+ google/protobuf/stubs/platform_macros.h \
google/protobuf/stubs/once.h \
google/protobuf/descriptor.h \
google/protobuf/descriptor.pb.h \
@@ -79,6 +86,7 @@ lib_LTLIBRARIES = libprotobuf-lite.la libprotobuf.la libprotoc.la
libprotobuf_lite_la_LIBADD = $(PTHREAD_LIBS)
libprotobuf_lite_la_LDFLAGS = -version-info 7:0:0 -export-dynamic -no-undefined
libprotobuf_lite_la_SOURCES = \
+ google/protobuf/stubs/atomicops_internals_x86_gcc.cc \
google/protobuf/stubs/common.cc \
google/protobuf/stubs/once.cc \
google/protobuf/stubs/hash.h \