1 files changed, 50 insertions, 6 deletions

diff --git a/cpp/Makefile.am b/cpp/Makefile.am
index c1b4981..aba7e28 100644
--- a/cpp/Makefile.am
+++ b/cpp/Makefile.am
@@ -1,9 +1,38 @@
-lib_LTLIBRARIES = libmsgpack.la
+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
+
 
 libmsgpack_la_SOURCES = \
 		object.cpp
 
+libmsgpack_la_LIBADD = -lmsgpackc
+
+# -version-info CURRENT:REVISION:AGE
+libmsgpack_la_LDFLAGS = -version-info 2:0:0
+
+
 nobase_include_HEADERS = \
+		msgpack/pack_define.h \
+		msgpack/pack_template.h \
+		msgpack/unpack_define.h \
+		msgpack/unpack_template.h \
+		msgpack/sysdep.h \
+		msgpack.h \
+		msgpack/sbuffer.h \
+		msgpack/vrefbuffer.h \
+		msgpack/zbuffer.h \
+		msgpack/pack.h \
+		msgpack/unpack.h \
+		msgpack/object.h \
+		msgpack/zone.h \
 		msgpack.hpp \
 		msgpack/sbuffer.hpp \
 		msgpack/vrefbuffer.hpp \
@@ -30,16 +59,31 @@ nobase_include_HEADERS = \
 		msgpack/type/tr1/unordered_map.hpp \
 		msgpack/type/tr1/unordered_set.hpp
 
-libmsgpack_la_LIBADD = -L../c -lmsgpackc
 
-# -version-info CURRENT:REVISION:AGE
-libmsgpack_la_LDFLAGS = -version-info 2:0:0
+# 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 = \
+		msgpack_vc8.vcproj \
+		msgpack_vc8.sln \
+		msgpack_vc8.postbuild.bat
+
 
 check_PROGRAMS = \
-  msgpack_test
+		msgpackc_test \
+		msgpack_test
 
-msgpack_test_SOURCES = test.cpp
+msgpackc_test_SOURCES = msgpackc_test.cpp
+msgpackc_test_CXXFLAGS = -I$(top_srcdir) -I$(top_srcdir)/c
+msgpackc_test_LDADD = libmsgpackc.la -lgtest_main
+
+msgpack_test_SOURCES = msgpack_test.cpp
 msgpack_test_CXXFLAGS = -I$(top_srcdir) -I$(top_srcdir)/c -I$(top_srcdir)/cpp
 msgpack_test_LDADD = libmsgpack.la -lgtest_main
 
 TESTS = $(check_PROGRAMS)
+