X-Git-Url: http://git.ipfire.org/?p=collecty.git;a=blobdiff_plain;f=Makefile.am;h=62657b5ad513f5748e43467d459a2033ee1d10c8;hp=185e0de86716086339805385798b1af1622bcbe4;hb=HEAD;hpb=e9b8922397f94d6e697446812c9602f649f5109a

diff --git a/Makefile.am b/Makefile.am
index 185e0de..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,8 +71,10 @@ 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 \
@@ -80,7 +86,6 @@ collecty_PYTHON = \
 	src/collecty/daemon.py \
 	src/collecty/errors.py \
 	src/collecty/i18n.py \
-	src/collecty/locales.py \
 	src/collecty/logger.py \
 	src/collecty/util.py
 
@@ -93,7 +98,6 @@ collectyplugins_PYTHON = \
 	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 \
@@ -101,6 +105,7 @@ collectyplugins_PYTHON = \
 	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
 
@@ -155,6 +160,9 @@ CLEANFILES += \
 
 # ------------------------------------------------------------------------------
 
+.PHONY: man
+man: $(MANPAGES) $(MANPAGES_HTML)
+
 if ENABLE_MANPAGES
 MANPAGES = \
 	man/collectyd.1
@@ -162,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)
 
@@ -210,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 $@) && \