X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=Makefile.am;h=65c821559eada77e68c65773aa2dad44602ac3fb;hb=1d429f78567323c11f00e9f6e5ea1765e7c5c8c7;hp=866c1037649c594d6d6642b8b886c9fc44f0d586;hpb=10d95b0cf8d2ffe1472cc65a4d403c9c1ca4118d;p=collectd.git

diff --git a/Makefile.am b/Makefile.am
index 866c1037..65c82155 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -89,10 +89,12 @@ nodist_pkgconfig_DATA = \
 
 pkginclude_HEADERS = \
 	src/libcollectdclient/collectd/client.h \
-	src/libcollectdclient/collectd/server.h \
-	src/libcollectdclient/collectd/network.h \
+	src/libcollectdclient/collectd/lcc_features.h \
 	src/libcollectdclient/collectd/network_buffer.h \
-	src/libcollectdclient/collectd/lcc_features.h
+	src/libcollectdclient/collectd/network.h \
+	src/libcollectdclient/collectd/network_parse.h \
+	src/libcollectdclient/collectd/server.h \
+	src/libcollectdclient/collectd/types.h
 
 lib_LTLIBRARIES = libcollectdclient.la
 
@@ -135,7 +137,7 @@ check_PROGRAMS = \
 	test_utils_subst \
 	test_utils_time \
 	test_utils_vl_lookup \
-	test_lib_server
+	test_libcollectd_network_parse
 
 
 TESTS = $(check_PROGRAMS)
@@ -474,13 +476,14 @@ libcollectdclient_la_SOURCES = \
 	src/libcollectdclient/client.c \
 	src/libcollectdclient/network.c \
 	src/libcollectdclient/network_buffer.c \
+	src/libcollectdclient/network_parse.c \
 	src/libcollectdclient/server.c
 libcollectdclient_la_CPPFLAGS = \
 	$(AM_CPPFLAGS) \
 	-I$(srcdir)/src/libcollectdclient \
 	-I$(top_builddir)/src/libcollectdclient \
 	-I$(srcdir)/src/daemon
-libcollectdclient_la_LDFLAGS = -version-info 1:0:0
+libcollectdclient_la_LDFLAGS = -version-info 2:0:1
 libcollectdclient_la_LIBADD = -lm
 if BUILD_WITH_LIBGCRYPT
 libcollectdclient_la_CPPFLAGS += $(GCRYPT_CPPFLAGS)
@@ -488,13 +491,18 @@ libcollectdclient_la_LDFLAGS += $(GCRYPT_LDFLAGS)
 libcollectdclient_la_LIBADD += $(GCRYPT_LIBS)
 endif
 
-# server_test.c includes server.c, so no need to link with
+# network_parse_test.c includes network_parse.c, so no need to link with
 # libcollectdclient.so.
-test_lib_server_SOURCES = src/libcollectdclient/server_test.c
-test_lib_server_CPPFLAGS = \
+test_libcollectd_network_parse_SOURCES = src/libcollectdclient/network_parse_test.c
+test_libcollectd_network_parse_CPPFLAGS = \
 	$(AM_CPPFLAGS) \
 	-I$(srcdir)/src/libcollectdclient \
 	-I$(top_builddir)/src/libcollectdclient
+if BUILD_WITH_LIBGCRYPT
+test_libcollectd_network_parse_CPPFLAGS += $(GCRYPT_CPPFLAGS)
+test_libcollectd_network_parse_LDFLAGS = $(GCRYPT_LDFLAGS)
+test_libcollectd_network_parse_LDADD = $(GCRYPT_LIBS)
+endif
 
 liboconfig_la_SOURCES = \
 	src/liboconfig/oconfig.c \