Updated automake files.

diff --git a/base/Makefile.am b/base/Makefile.am
index f73a6b8944a36cd4dc59040cd178b61f9880fdb6..ef7f2ee0e1abc1c5684103556c1590e9d20c055f 100644 (file)
--- a/base/Makefile.am
+++ b/base/Makefile.am
@@ -19,6 +19,8 @@ libbase_la_SOURCES =  \
        configobject.h \
        cxx11-compat.h \
        delegate.h \
+       dictionary.cpp \
+       dictionary.h \
        event.h \
        exception.cpp \
        exception.h \
@@ -45,6 +47,8 @@ libbase_la_SOURCES =  \
        timer.h \
        unix.cpp \
        unix.h \
+       variant.cpp \
+       variant.h \
        win32.cpp \
        win32.h
 

diff --git a/jsonrpc/Makefile.am b/jsonrpc/Makefile.am
index feb406cacfbe317f6ad690c651597554b1677383..de82b89d494ae8ceab05c47171e3b4f77cf58c19 100644 (file)
--- a/jsonrpc/Makefile.am
+++ b/jsonrpc/Makefile.am
@@ -8,10 +8,14 @@ libjsonrpc_la_SOURCES =  \
        i2-jsonrpc.h \
        jsonrpcclient.cpp \
        jsonrpcclient.h \
-       jsonrpcmessage.cpp \
-       jsonrpcmessage.h \
+       jsonrpcrequest.cpp \
+       jsonrpcrequest.h \
+       jsonrpcresponse.cpp \
+       jsonrpcresponse.h \
        jsonrpcserver.cpp \
        jsonrpcserver.h \
+       message.cpp \
+       message.h \
        netstring.cpp \
        netstring.h
 

diff --git a/jsonrpc/jsonrpcrequest.message b/jsonrpc/jsonrpcrequest.message
deleted file mode 100644 (file)
index 5fee1a2..0000000
--- a/jsonrpc/jsonrpcrequest.message
+++ /dev/null
@@ -1,5 +0,0 @@
-JsonRpcRequest : Message
-       JsonRpc : string
-       Method : string
-       Params : Message
-       ID : string

diff --git a/jsonrpc/jsonrpcresponse.message b/jsonrpc/jsonrpcresponse.message
deleted file mode 100644 (file)
index 60cbeb7..0000000
--- a/jsonrpc/jsonrpcresponse.message
+++ /dev/null
@@ -1,5 +0,0 @@
-JsonRpcResponse : Message
-       JsonRpc : string
-       Result : string
-       Error : string
-       ID : string