- make proxy class a convenience library

diff --git a/client/Makefile.am b/client/Makefile.am
index 80a2a41b0e38383abf4cdf82d41ff9616411fb87..7e0598c3049a0af35a577d2bc034a27d83cf0c1f 100644 (file)
--- a/client/Makefile.am
+++ b/client/Makefile.am
@@ -6,14 +6,21 @@ SUBDIRS = utils
 
 AM_CPPFLAGS = -I$(top_srcdir) $(DBUS_CFLAGS)
 
-noinst_LTLIBRARIES = libclient.la
+noinst_LTLIBRARIES = libclient.la libproxy.la
 
 libclient_la_SOURCES =                 \
        types.cc        types.h         \
        commands.cc     commands.h      \
        errors.cc       errors.h
 
-libclient_la_LIBADD = utils/libutils.la ../dbus/libdbus.la
+libclient_la_LIBADD =                  \
+       utils/libutils.la               \
+       ../dbus/libdbus.la
+
+libproxy_la_SOURCES =                  \
+       proxy.cc        proxy.h         \
+       proxy-dbus.cc   proxy-dbus.h    \
+       proxy-lib.cc    proxy-lib.h
 
 bin_PROGRAMS = snapper
 
@@ -40,20 +47,18 @@ snapper_SOURCES =                                   \
        cmd-cleanup.cc                                  \
        cmd-debug.cc                                    \
        cleanup.cc              cleanup.h               \
-       proxy.cc                proxy.h                 \
-       proxy-dbus.cc           proxy-dbus.h            \
-       proxy-lib.cc            proxy-lib.h             \
        locker.cc               locker.h                \
        misc.cc                 misc.h                  \
        MyFiles.cc              MyFiles.h               \
        GlobalOptions.cc        GlobalOptions.h
 
 snapper_LDADD =                        \
+       libproxy.la                     \
        libclient.la                    \
        ../snapper/libsnapper.la        \
        utils/libutils.la               \
        ../dbus/libdbus.la              \
-       $(JSONC_LIBS)
+       $(JSON_C_LIBS)
 
 libexecdir = /usr/lib/snapper
 
@@ -62,13 +67,15 @@ libexec_PROGRAMS = systemd-helper
 systemd_helper_SOURCES =               \
        systemd-helper.cc               \
        cleanup.cc      cleanup.h       \
-       proxy.cc        proxy.h         \
-       proxy-dbus.cc   proxy-dbus.h    \
-       proxy-lib.cc    proxy-lib.h     \
        locker.cc       locker.h        \
        misc.cc         misc.h
 
-systemd_helper_LDADD = libclient.la ../snapper/libsnapper.la utils/libutils.la ../dbus/libdbus.la
+systemd_helper_LDADD =                         \
+       libproxy.la                     \
+       libclient.la                    \
+       ../snapper/libsnapper.la        \
+       utils/libutils.la               \
+       ../dbus/libdbus.la
 
 if ENABLE_BTRFS
 

diff --git a/configure.ac b/configure.ac
index 899d4744f55f1445c96fbf3a0cc3af14453bf114..a31471959610b0aefa08f4a4d4c2f8e70f64ee5e 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -184,7 +184,7 @@ fi
 
 PKG_CHECK_MODULES(DBUS, dbus-1)
 PKG_CHECK_MODULES(XML2, libxml-2.0)
-PKG_CHECK_MODULES(JSONC, json-c, [], [AC_MSG_WARN([Cannot find json-c. Please install libjson-c-devel])])
+PKG_CHECK_MODULES(JSON_C, json-c, [], [AC_MSG_WARN([Cannot find json-c. Please install libjson-c-devel])])
 PKG_CHECK_MODULES(ZLIB, zlib)
 
 # Conditional support for libbtrfsutil based on existence of pkg-config file

diff --git a/testsuite/Makefile.am b/testsuite/Makefile.am
index 4ae904b79da2013cc94753513b4ebc432851780b..a6289e1e044692a5bdb02a257c04c477ac83a09b 100644 (file)
--- a/testsuite/Makefile.am
+++ b/testsuite/Makefile.am
@@ -39,7 +39,7 @@ table_formatter_test_LDADD = -lboost_unit_test_framework ../client/utils/libutil
 
 csv_formatter_test_LDADD = -lboost_unit_test_framework ../client/utils/libutils.la
 
-json_formatter_test_LDADD = -lboost_unit_test_framework ../client/utils/libutils.la $(JSONC_LIBS)
+json_formatter_test_LDADD = -lboost_unit_test_framework ../client/utils/libutils.la $(JSON_C_LIBS)
 
 getopts_test_LDADD = -lboost_unit_test_framework ../client/utils/libutils.la
 

diff --git a/zypp-plugin/Makefile.am b/zypp-plugin/Makefile.am
index 2fd99b8cc28b766f33559d895ea9ace25172a5e5..de58ebefd2813de24c403269fa3794cfa1450955 100644 (file)
--- a/zypp-plugin/Makefile.am
+++ b/zypp-plugin/Makefile.am
@@ -9,7 +9,7 @@ if HAVE_ZYPP
 plugindir = /usr/lib/zypp/plugins/commit
 plugin_PROGRAMS = snapper-zypp-plugin
 
-AM_CPPFLAGS = $(DBUS_CFLAGS) $(XML2_CFLAGS) $(JSONC_CFLAGS)
+AM_CPPFLAGS = $(DBUS_CFLAGS) $(XML2_CFLAGS) $(JSON_C_CFLAGS)
 
 snapper_zypp_plugin_SOURCES = \
        snapper-zypp-plugin.cc snapper-zypp-plugin.h \
@@ -22,7 +22,7 @@ snapper_zypp_plugin_LDADD = \
        ../snapper/libsnapper.la \
        ../dbus/libdbus.la \
        ../stomp/libstomp.la \
-       $(JSONC_LIBS)
+       $(JSON_C_LIBS)
 
 check_PROGRAMS = solvable-matcher.test forwarding-zypp-plugin