projects
/
collectd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
libcollectdclient: Include <stdlib.h> and <string.h>.
[collectd.git]
/
Makefile.am
diff --git
a/Makefile.am
b/Makefile.am
index
866c103
..
65c8215
100644
(file)
--- a/
Makefile.am
+++ b/
Makefile.am
@@
-89,10
+89,12
@@
nodist_pkgconfig_DATA = \
pkginclude_HEADERS = \
src/libcollectdclient/collectd/client.h \
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/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
lib_LTLIBRARIES = libcollectdclient.la
@@
-135,7
+137,7
@@
check_PROGRAMS = \
test_utils_subst \
test_utils_time \
test_utils_vl_lookup \
test_utils_subst \
test_utils_time \
test_utils_vl_lookup \
- test_lib
_server
+ test_lib
collectd_network_parse
TESTS = $(check_PROGRAMS)
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/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
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)
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
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.
# libcollectdclient.so.
-test_lib
_server_SOURCES = src/libcollectdclient/server
_test.c
-test_lib
_server
_CPPFLAGS = \
+test_lib
collectd_network_parse_SOURCES = src/libcollectdclient/network_parse
_test.c
+test_lib
collectd_network_parse
_CPPFLAGS = \
$(AM_CPPFLAGS) \
-I$(srcdir)/src/libcollectdclient \
-I$(top_builddir)/src/libcollectdclient
$(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 \
liboconfig_la_SOURCES = \
src/liboconfig/oconfig.c \