X-Git-Url: https://git.octo.it/?p=collectd.git;a=blobdiff_plain;f=Makefile.am;h=e37716f676ddee44a11c3c86bce7d6cfd9fee4d5;hp=24c5b8c022451164fbb00c090d1c705fbad7fd66;hb=849f5394cce97a76da080f6cd9e5194b7f4ee0f0;hpb=b4c17cc31997759c0b0811cdc805910c6cb57424

diff --git a/Makefile.am b/Makefile.am
index 24c5b8c0..e37716f6 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -199,6 +199,8 @@ collectd_SOURCES = \
 	src/daemon/configfile.h \
 	src/daemon/filter_chain.c \
 	src/daemon/filter_chain.h \
+	src/daemon/globals.c \
+	src/daemon/globals.h \
 	src/daemon/meta_data.c \
 	src/daemon/meta_data.h \
 	src/daemon/plugin.c \
@@ -514,6 +516,7 @@ liboconfig_la_SOURCES = \
 	src/liboconfig/aux_types.h \
 	src/liboconfig/scanner.l \
 	src/liboconfig/parser.y
+liboconfig_la_CPPFLAGS = -I$(srcdir)/src/liboconfig $(AM_CPPFLAGS)
 liboconfig_la_LDFLAGS = -avoid-version $(LEXLIB)
 
 
@@ -1419,14 +1422,28 @@ python_la_CPPFLAGS = $(AM_CPPFLAGS) $(LIBPYTHON_CPPFLAGS)
 python_la_LDFLAGS = $(PLUGIN_LDFLAGS) $(LIBPYTHON_LDFLAGS)
 endif
 
+if HAVE_LIBMNL
+noinst_LTLIBRARIES += libtaskstats.la
+libtaskstats_la_SOURCES = \
+	src/utils_taskstats.c \
+	src/utils_taskstats.h
+libtaskstats_la_CFLAGS = $(AM_CFLAGS) $(BUILD_WITH_LIBMNL_CFLAGS)
+libtaskstats_la_LIBADD = $(BUILD_WITH_LIBMNL_LIBS)
+endif
+
 if BUILD_PLUGIN_PROCESSES
 pkglib_LTLIBRARIES += processes.la
 processes_la_SOURCES = src/processes.c
+processes_la_CPPFLAGS = $(AM_CPPFLAGS)
 processes_la_LDFLAGS = $(PLUGIN_LDFLAGS)
 processes_la_LIBADD =
 if BUILD_WITH_LIBKVM_GETPROCS
 processes_la_LIBADD += -lkvm
 endif
+if HAVE_LIBMNL
+processes_la_CPPFLAGS += -DHAVE_LIBTASKSTATS=1
+processes_la_LIBADD += libtaskstats.la
+endif
 endif
 
 if BUILD_PLUGIN_PROTOCOLS
@@ -1680,7 +1697,9 @@ endif
 
 if BUILD_PLUGIN_TURBOSTAT
 pkglib_LTLIBRARIES += turbostat.la
-turbostat_la_SOURCES = src/turbostat.c
+turbostat_la_SOURCES = \
+	src/turbostat.c \
+	src/msr-index.h
 turbostat_la_LDFLAGS = $(PLUGIN_LDFLAGS)
 endif