summaryrefslogtreecommitdiff
path: root/cpp/Makefile.am
diff options
context:
space:
mode:
authorfrsyuki <frsyuki@users.sourceforge.jp>2010-04-25 07:56:19 +0900
committerfrsyuki <frsyuki@users.sourceforge.jp>2010-04-25 07:56:19 +0900
commit72160aac9a1536234700539eacc9bdc7bf6f9f61 (patch)
treed9a6df8bac5803024bfd1e2e92d0a58520d86ebc /cpp/Makefile.am
parent9df6916029e2eba4ca0f93578f631d34208e6415 (diff)
downloadmsgpack-python-72160aac9a1536234700539eacc9bdc7bf6f9f61.tar.gz
cpp: combines libmsgpackc and libmsgpack into libmsgpack
Diffstat (limited to 'cpp/Makefile.am')
-rw-r--r--cpp/Makefile.am26
1 files changed, 6 insertions, 20 deletions
diff --git a/cpp/Makefile.am b/cpp/Makefile.am
index a297ba7..f1a1d6c 100644
--- a/cpp/Makefile.am
+++ b/cpp/Makefile.am
@@ -1,22 +1,15 @@
-lib_LTLIBRARIES = libmsgpackc.la libmsgpack.la
-
-libmsgpackc_la_SOURCES = \
- unpack.c \
- object.c \
- vrefbuffer.c \
- zone.c
-
-# -version-info CURRENT:REVISION:AGE
-libmsgpackc_la_LDFLAGS = -version-info 2:0:0
+lib_LTLIBRARIES = libmsgpack.la
libmsgpack_la_SOURCES = \
+ unpack.c \
+ objectc.c \
+ vrefbuffer.c \
+ zone.c \
object.cpp
-libmsgpack_la_LIBADD = -lmsgpackc
-
# -version-info CURRENT:REVISION:AGE
-libmsgpack_la_LDFLAGS = -version-info 2:0:0
+libmsgpack_la_LDFLAGS = -version-info 3:0:0
nobase_include_HEADERS = \
@@ -60,13 +53,6 @@ nobase_include_HEADERS = \
msgpack/type/tr1/unordered_set.hpp
-# work around for duplicated object file name
-libmsgpackc_la_CFLAGS = $(AM_CFLAGS)
-libmsgpackc_la_CXXFLAGS = $(AM_CXXFLAGS)
-libmsgpack_la_CFLAGS = $(AM_CFLAGS)
-libmsgpack_la_CXXFLAGS = $(AM_CXXFLAGS)
-
-
EXTRA_DIST = \
README.md \
LICENSE \