X-Git-Url: http://git.ipfire.org/?p=collecty.git;a=blobdiff_plain;f=Makefile.am;h=dcc7a9eb389c715b89bd02ccbb017d0368e59e8c;hp=80c19462d788f4c817a88b9d91669f8a30fc66b0;hb=HEAD;hpb=81b24bab60a154c7528b57803a707f4031807bfa

diff --git a/Makefile.am b/Makefile.am
index 80c1946..dcc7a9e 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -45,9 +45,13 @@ noinst_DATA =
 @INTLTOOL_POLICY_RULE@
 
 .PHONY: update-po
-update-po:
+update-po: po/POTFILES.in
 	$(MAKE) -C po update-po
 
+po/POTFILES.in: Makefile
+	find $(abs_srcdir)/src | \
+		grep -E "\.(in|py)$$" | sed -e "s@$(abs_srcdir)/@@g" | sort > $@
+
 DISTCHECK_CONFIGURE_FLAGS = \
 	--with-dbuspolicydir=$$dc_install_base/$(dbuspolicydir) \
 	--with-dbussystemservicedir=$$dc_install_base/$(dbussystemservicedir) \
@@ -67,34 +71,42 @@ dist_doc_DATA = \
 # ------------------------------------------------------------------------------
 
 dist_bin_SCRIPTS = \
-	src/collectyd \
-	src/collecty-client
+	src/scripts/collecty
+
+dist_sbin_SCRIPTS = \
+	src/scripts/collectyd
 
 collecty_PYTHON = \
 	src/collecty/__init__.py \
+	src/collecty/__version__.py \
 	src/collecty/bus.py \
 	src/collecty/client.py \
+	src/collecty/colours.py \
 	src/collecty/constants.py \
 	src/collecty/daemon.py \
 	src/collecty/errors.py \
 	src/collecty/i18n.py \
 	src/collecty/logger.py \
-	src/collecty/ping.py
+	src/collecty/util.py
 
 collectydir = $(pythondir)/collecty
 
 collectyplugins_PYTHON = \
 	src/collecty/plugins/base.py \
+	src/collecty/plugins/contextswitches.py \
 	src/collecty/plugins/conntrack.py \
-	src/collecty/plugins/cpu.py \
 	src/collecty/plugins/cpufreq.py \
+	src/collecty/plugins/df.py \
 	src/collecty/plugins/disk.py \
-	src/collecty/plugins/entropy.py \
 	src/collecty/plugins/__init__.py \
 	src/collecty/plugins/interface.py \
+	src/collecty/plugins/interrupts.py \
+	src/collecty/plugins/ipfrag.py \
 	src/collecty/plugins/latency.py \
 	src/collecty/plugins/loadavg.py \
 	src/collecty/plugins/memory.py \
+	src/collecty/plugins/psi.py \
+	src/collecty/plugins/processor.py \
 	src/collecty/plugins/sensors.py
 
 collectypluginsdir = $(collectydir)/plugins
@@ -103,11 +115,17 @@ pkgpyexec_LTLIBRARIES = \
 	_collecty.la
 
 _collecty_la_SOURCES = \
-	src/_collectymodule.c
+	src/_collecty/_collectymodule.c \
+	src/_collecty/_collectymodule.h \
+	src/_collecty/blockdev.c \
+	src/_collecty/ping.c \
+	src/_collecty/sensors.c \
+	src/_collecty/utils.c
 
 _collecty_la_CFLAGS = \
 	$(AM_CFLAGS) \
 	$(LIBATASMART_CFLAGS) \
+	$(OPING_CFLAGS) \
 	$(PYTHON_CFLAGS)
 
 _collecty_la_LDFLAGS = \
@@ -118,6 +136,7 @@ _collecty_la_LDFLAGS = \
 
 _collecty_la_LIBADD = \
 	$(LIBATASMART_LIBS) \
+	$(OPING_LIBS) \
 	$(PYTHON_LIBS) \
 	$(SENSORS_LIBS)
 
@@ -141,6 +160,9 @@ CLEANFILES += \
 
 # ------------------------------------------------------------------------------
 
+.PHONY: man
+man: $(MANPAGES) $(MANPAGES_HTML)
+
 if ENABLE_MANPAGES
 MANPAGES = \
 	man/collectyd.1
@@ -148,8 +170,6 @@ MANPAGES = \
 MANPAGES_XML  = $(patsubst %.1,%.xml,$(patsubst %.5,%.xml,$(MANPAGES)))
 MANPAGES_HTML = $(patsubst %.xml,%.html,$(MANPAGES_XML))
 
-man: $(MANPAGES) $(MANPAGES_HTML)
-
 man_MANS = \
 	$(MANPAGES)
 
@@ -196,7 +216,8 @@ substitutions = \
 	'|PACKAGE_NAME=$(PACKAGE_NAME)|' \
 	'|PACKAGE_VERSION=$(PACKAGE_VERSION)|' \
 	'|configsdir=$(configsdir)|' \
-	'|bindir=$(bindir)|'
+	'|bindir=$(bindir)|' \
+	'|sbindir=$(sbindir)|'
 
 SED_PROCESS = \
 	$(AM_V_GEN)$(MKDIR_P) $(dir $@) && \