diff --git a/Makefile.am b/Makefile.am
index f620c720eeea18ad506679f23bd5ae06483ed087..4e24ecf9576520ca37f9270e892bc3be92dbf21d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -55,10 +55,13 @@ NEWS: $(top_srcdir)/docs/news.xsl $(top_srcdir)/docs/news.html.in
 	   | perl -pe 's/[ \t]+$$//'				\
 	   > $@-t && mv $@-t $@ ; fi
 
-$(top_srcdir)/HACKING: $(top_srcdir)/docs/hacking1.xsl $(top_srcdir)/docs/hacking2.xsl \
-                       $(top_srcdir)/docs/wrapstring.xsl $(top_srcdir)/docs/hacking.html.in
+$(top_srcdir)/HACKING: $(top_srcdir)/docs/hacking1.xsl \
+			$(top_srcdir)/docs/hacking2.xsl \
+			$(top_srcdir)/docs/wrapstring.xsl \
+			$(top_srcdir)/docs/hacking.html.in
 	$(AM_V_GEN)if [ -x $(XSLTPROC) ] ; then \
-	   $(XSLTPROC) --nonet $(top_srcdir)/docs/hacking1.xsl $(top_srcdir)/docs/hacking.html.in | \
+	   $(XSLTPROC) --nonet $(top_srcdir)/docs/hacking1.xsl \
+		$(top_srcdir)/docs/hacking.html.in | \
 	   $(XSLTPROC) --nonet $(top_srcdir)/docs/hacking2.xsl - \
 	   | perl -0777 -pe 's/\n\n+$$/\n/' \
 	   > $@-t && mv $@-t $@ ; fi;
diff --git a/cfg.mk b/cfg.mk
index aae1d0e471b248278df02bb30d0cd44d111ffa0b..13de26869022872f3e9e6677e4be0b12a3c0e978 100644
--- a/cfg.mk
+++ b/cfg.mk
@@ -694,6 +694,10 @@ sc_prohibit_long_lines:
 	in_vc_files='\.arg[sv]'						\
 	halt='Wrap long lines in expected output files'			\
 	  $(_sc_search_regexp)
+	@prohibit='.{80}'						\
+	in_vc_files='Makefile\.am'					\
+	halt='Wrap long lines in Makefiles'				\
+	  $(_sc_search_regexp)
 
 sc_copyright_format:
 	@require='Copyright .*Red 'Hat', Inc\.'				\
diff --git a/daemon/Makefile.am b/daemon/Makefile.am
index e8a8371585965ebca2da529ea217cf606c1369c8..ad7544c4dc47940df329be78e1a0e1a78d8fe4d4 100644
--- a/daemon/Makefile.am
+++ b/daemon/Makefile.am
@@ -217,14 +217,16 @@ libvirtd.policy: libvirtd.policy.in $(top_builddir)/config.status
 	mv $@-t $@
 BUILT_SOURCES += libvirtd.policy
 
-install-data-local: install-init-redhat install-init-systemd install-init-upstart \
+install-data-local: install-init-redhat install-init-systemd \
+		install-init-upstart \
 		install-data-sasl install-data-polkit \
 		install-logrotate install-sysctl
 	$(MKDIR_P) $(DESTDIR)$(localstatedir)/log/libvirt \
 		   $(DESTDIR)$(localstatedir)/run/libvirt \
 		   $(DESTDIR)$(localstatedir)/lib/libvirt
 
-uninstall-local:: uninstall-init-redhat uninstall-init-systemd uninstall-init-upstart \
+uninstall-local:: uninstall-init-redhat uninstall-init-systemd \
+		uninstall-init-upstart \
 		uninstall-data-sasl uninstall-data-polkit \
 		uninstall-logrotate uninstall-sysctl
 	rmdir $(DESTDIR)$(localstatedir)/log/libvirt || :
@@ -280,10 +282,14 @@ install-logrotate: $(LOGROTATE_CONFS)
 		   $(DESTDIR)$(localstatedir)/log/libvirt/lxc/ \
 		   $(DESTDIR)$(localstatedir)/log/libvirt/uml/ \
 		   $(DESTDIR)$(sysconfdir)/logrotate.d/
-	$(INSTALL_DATA) libvirtd.logrotate $(DESTDIR)$(sysconfdir)/logrotate.d/libvirtd
-	$(INSTALL_DATA) libvirtd.qemu.logrotate $(DESTDIR)$(sysconfdir)/logrotate.d/libvirtd.qemu
-	$(INSTALL_DATA) libvirtd.lxc.logrotate $(DESTDIR)$(sysconfdir)/logrotate.d/libvirtd.lxc
-	$(INSTALL_DATA) libvirtd.uml.logrotate $(DESTDIR)$(sysconfdir)/logrotate.d/libvirtd.uml
+	$(INSTALL_DATA) libvirtd.logrotate \
+		$(DESTDIR)$(sysconfdir)/logrotate.d/libvirtd
+	$(INSTALL_DATA) libvirtd.qemu.logrotate \
+		$(DESTDIR)$(sysconfdir)/logrotate.d/libvirtd.qemu
+	$(INSTALL_DATA) libvirtd.lxc.logrotate \
+		$(DESTDIR)$(sysconfdir)/logrotate.d/libvirtd.lxc
+	$(INSTALL_DATA) libvirtd.uml.logrotate \
+		$(DESTDIR)$(sysconfdir)/logrotate.d/libvirtd.uml
 
 uninstall-logrotate:
 	rm -f $(DESTDIR)$(sysconfdir)/logrotate.d/libvirtd \
@@ -423,7 +429,8 @@ $(srcdir)/libvirtd.8.in: libvirtd.pod.in $(top_srcdir)/configure.ac
 if WITH_SASL
 install-data-sasl:
 	$(MKDIR_P) $(DESTDIR)$(sysconfdir)/sasl2/
-	$(INSTALL_DATA) $(srcdir)/libvirtd.sasl $(DESTDIR)$(sysconfdir)/sasl2/libvirt.conf
+	$(INSTALL_DATA) $(srcdir)/libvirtd.sasl \
+		$(DESTDIR)$(sysconfdir)/sasl2/libvirt.conf
 
 uninstall-data-sasl:
 	rm -f $(DESTDIR)$(sysconfdir)/sasl2/libvirt.conf
diff --git a/docs/Makefile.am b/docs/Makefile.am
index f453c4c936aa2d9a0720695132f0694c34eb5669..aabee442a0536ccf56211dccd307880d155d5c81 100644
--- a/docs/Makefile.am
+++ b/docs/Makefile.am
@@ -162,17 +162,23 @@ todo.html.in: todo.pl
 		|| { rm $@ && exit 1; }; \
 	else \
 		echo "Stubbing $@"; \
-		echo "<html xmlns=\"http://www.w3.org/1999/xhtml\"><body><h1>Todo list unavailable: no config file</h1></body></html>" > $@ ; \
+		printf "%s\n" \
+		  "<html xmlns=\"http://www.w3.org/1999/xhtml\">" \
+		  "<body>" \
+		  "<h1>Todo list unavailable: no config file</h1>" \
+		  "</body></html>" > $@ ; \
 	fi
 
 todo:
 	rm -f todo.html.in
 	$(MAKE) todo.html
 
-hvsupport.html.in: $(srcdir)/hvsupport.pl $(srcdir)/../src/libvirt_public.syms \
+hvsupport.html.in: $(srcdir)/hvsupport.pl \
+		$(srcdir)/../src/libvirt_public.syms \
 	$(srcdir)/../src/libvirt_qemu.syms $(srcdir)/../src/libvirt_lxc.syms \
 	$(srcdir)/../src/driver.h
-	$(AM_V_GEN)$(PERL) $(srcdir)/hvsupport.pl $(srcdir)/../src > $@ || { rm $@ && exit 1; }
+	$(AM_V_GEN)$(PERL) $(srcdir)/hvsupport.pl $(srcdir)/../src > $@ \
+		|| { rm $@ && exit 1; }
 
 .PHONY: todo
 
@@ -277,7 +283,8 @@ clean-local:
 	rm -f *~ *.bak *.hierarchy *.signals *-unused.txt *.html
 
 maintainer-clean-local: clean-local
-	rm -rf $(srcdir)/libvirt-api.xml $(srcdir)/libvirt-refs.xml todo.html.in hvsupport.html.in
+	rm -rf $(srcdir)/libvirt-api.xml $(srcdir)/libvirt-refs.xml \
+		todo.html.in hvsupport.html.in
 	rm -rf $(srcdir)/libvirt-qemu-api.xml $(srcdir)/libvirt-qemu-refs.xml
 	rm -rf $(srcdir)/libvirt-lxc-api.xml $(srcdir)/libvirt-lxc-refs.xml
 	rm -rf $(APIBUILD_STAMP)
diff --git a/python/Makefile.am b/python/Makefile.am
index b3e858fe3f99cd84735a891d846129d265ff4951..9e957d1673a332265467e2a5e0a9d0e90f21eafc 100644
--- a/python/Makefile.am
+++ b/python/Makefile.am
@@ -78,7 +78,8 @@ nodist_libvirtmod_la_SOURCES = libvirt.c libvirt.h
 # need extra flags here
 libvirtmod_la_CFLAGS = $(WARN_CFLAGS) $(WARN_PYTHON_CFLAGS)
 
-libvirtmod_la_LDFLAGS = -module -avoid-version -shared -L$(top_builddir)/src/.libs \
+libvirtmod_la_LDFLAGS = -module -avoid-version -shared \
+	-L$(top_builddir)/src/.libs \
 	$(CYGWIN_EXTRA_LDFLAGS)
 libvirtmod_la_LIBADD = $(mylibs) \
 	$(CYGWIN_EXTRA_LIBADD) $(CYGWIN_EXTRA_PYTHON_LIBADD)
@@ -89,7 +90,8 @@ nodist_libvirtmod_qemu_la_SOURCES = libvirt-qemu.c libvirt-qemu.h
 # need extra flags here
 libvirtmod_qemu_la_CFLAGS = $(WARN_PYTHON_CFLAGS)
 
-libvirtmod_qemu_la_LDFLAGS = -module -avoid-version -shared -L$(top_builddir)/src/.libs \
+libvirtmod_qemu_la_LDFLAGS = -module -avoid-version -shared \
+	-L$(top_builddir)/src/.libs \
 	$(CYGWIN_EXTRA_LDFLAGS)
 libvirtmod_qemu_la_LIBADD = $(myqemulibs) \
 	$(CYGWIN_EXTRA_LIBADD) $(CYGWIN_EXTRA_PYTHON_LIBADD)
@@ -100,25 +102,29 @@ nodist_libvirtmod_lxc_la_SOURCES = libvirt-lxc.c libvirt-lxc.h
 # need extra flags here
 libvirtmod_lxc_la_CFLAGS = $(WARN_PYTHON_CFLAGS)
 
-libvirtmod_lxc_la_LDFLAGS = -module -avoid-version -shared -L$(top_builddir)/src/.libs \
+libvirtmod_lxc_la_LDFLAGS = -module -avoid-version -shared \
+	-L$(top_builddir)/src/.libs \
 	$(CYGWIN_EXTRA_LDFLAGS)
 libvirtmod_lxc_la_LIBADD = $(mylxclibs) \
 	$(CYGWIN_EXTRA_LIBADD) $(CYGWIN_EXTRA_PYTHON_LIBADD)
 
 GENERATE = generator.py
-API_DESC = $(top_srcdir)/docs/libvirt-api.xml $(srcdir)/libvirt-override-api.xml
+API_DESC = $(top_srcdir)/docs/libvirt-api.xml \
+	$(srcdir)/libvirt-override-api.xml
 GENERATED= libvirt-export.c \
 	   libvirt.c \
 	   libvirt.h \
 	   libvirt.py
 
-QEMU_API_DESC = $(top_srcdir)/docs/libvirt-qemu-api.xml $(srcdir)/libvirt-qemu-override-api.xml
+QEMU_API_DESC = $(top_srcdir)/docs/libvirt-qemu-api.xml \
+	$(srcdir)/libvirt-qemu-override-api.xml
 QEMU_GENERATED= libvirt-qemu-export.c \
 	   libvirt-qemu.c \
 	   libvirt-qemu.h \
 	   libvirt_qemu.py
 
-LXC_API_DESC = $(top_srcdir)/docs/libvirt-lxc-api.xml $(srcdir)/libvirt-lxc-override-api.xml
+LXC_API_DESC = $(top_srcdir)/docs/libvirt-lxc-api.xml \
+	$(srcdir)/libvirt-lxc-override-api.xml
 LXC_GENERATED= libvirt-lxc-export.c \
 	   libvirt-lxc.c \
 	   libvirt-lxc.h \
diff --git a/src/Makefile.am b/src/Makefile.am
index 8fa868061f6e2614df30e89a30a3921f38e9d5e0..b397be74a194918a744ae6c0490b29e7283a403c 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -154,7 +154,8 @@ BUILT_SOURCES += $(srcdir)/util/virkeymaps.h
 
 $(srcdir)/util/virkeymaps.h: $(srcdir)/util/keymaps.csv	\
 		$(srcdir)/util/virkeycode-mapgen.py
-	$(AM_V_GEN)$(PYTHON) $(srcdir)/util/virkeycode-mapgen.py <$(srcdir)/util/keymaps.csv >$@
+	$(AM_V_GEN)$(PYTHON) $(srcdir)/util/virkeycode-mapgen.py \
+	  <$(srcdir)/util/keymaps.csv >$@
 
 EXTRA_DIST += util/virthreadpthread.c util/virthreadwin32.c
 
@@ -1219,7 +1220,8 @@ $(HYPERV_DRIVER_GENERATED): $(HYPERV_GENERATED_STAMP)
 
 $(HYPERV_GENERATED_STAMP): $(srcdir)/hyperv/hyperv_wmi_generator.input \
                             $(srcdir)/hyperv/hyperv_wmi_generator.py
-	$(AM_V_GEN)srcdir=$(srcdir) $(PYTHON) $(srcdir)/hyperv/hyperv_wmi_generator.py \
+	$(AM_V_GEN)srcdir=$(srcdir) $(PYTHON) \
+	  $(srcdir)/hyperv/hyperv_wmi_generator.py \
 	  && touch $@
 
 MAINTAINERCLEANFILES += $(HYPERV_DRIVER_GENERATED) $(HYPERV_GENERATED_STAMP)
@@ -1248,7 +1250,10 @@ libvirt_driver_network_la_SOURCES =
 libvirt_driver_network_la_LIBADD = libvirt_driver_network_impl.la
 if WITH_DRIVER_MODULES
 mod_LTLIBRARIES += libvirt_driver_network.la
-libvirt_driver_network_la_LIBADD += ../gnulib/lib/libgnu.la $(LIBNL_LIBS) $(DBUS_LIBS)
+libvirt_driver_network_la_LIBADD += ../gnulib/lib/libgnu.la \
+	$(LIBNL_LIBS) \
+	$(DBUS_LIBS) \
+	$(NULL)
 libvirt_driver_network_la_LDFLAGS = -module -avoid-version $(AM_LDFLAGS)
 else
 noinst_LTLIBRARIES += libvirt_driver_network.la
@@ -1456,7 +1461,8 @@ libvirt_security_manager_la_SOURCES += $(SECURITY_DRIVER_APPARMOR_SOURCES)
 libvirt_security_manager_la_CFLAGS += $(APPARMOR_CFLAGS)
 endif
 
-libvirt_driver_access_la_SOURCES = $(ACCESS_DRIVER_SOURCES) $(ACCESS_DRIVER_GENERATED)
+libvirt_driver_access_la_SOURCES = \
+	$(ACCESS_DRIVER_SOURCES) $(ACCESS_DRIVER_GENERATED)
 noinst_LTLIBRARIES += libvirt_driver_access.la
 libvirt_la_BUILT_LIBADD += libvirt_driver_access.la
 libvirt_driver_access_la_CFLAGS = \
@@ -1576,7 +1582,8 @@ check-local: check-augeas
 	check-augeas-lockd \
 	$(NULL)
 
-check-augeas: check-augeas-qemu check-augeas-lxc check-augeas-sanlock check-augeas-lockd
+check-augeas: check-augeas-qemu check-augeas-lxc check-augeas-sanlock \
+	check-augeas-lockd
 
 AUG_GENTEST = $(PERL) $(top_srcdir)/build-aux/augeas-gentest.pl
 EXTRA_DIST += $(top_srcdir)/build-aux/augeas-gentest.pl
@@ -1723,7 +1730,8 @@ EXTRA_DIST += \
 
 BUILT_SOURCES += $(GENERATED_SYM_FILES)
 
-libvirt.syms: libvirt_public.syms $(USED_SYM_FILES) $(ACCESS_DRIVER_SYM_FILES) \
+libvirt.syms: libvirt_public.syms $(USED_SYM_FILES) \
+		$(ACCESS_DRIVER_SYM_FILES) \
 		$(top_builddir)/config.status
 	$(AM_V_GEN)rm -f $@-tmp $@ ; \
 	printf '# WARNING: generated from the following:\n# $^\n\n' >$@-tmp && \
@@ -1739,21 +1747,24 @@ libvirt.syms: libvirt_public.syms $(USED_SYM_FILES) $(ACCESS_DRIVER_SYM_FILES) \
 libvirt.def: libvirt.syms
 	$(AM_V_GEN)rm -f -- $@-tmp $@ ; \
 	printf 'EXPORTS\n' > $@-tmp && \
-	sed -e '/^$$/d; /#/d; /:/d; /}/d; /\*/d; /LIBVIRT_/d; s/[	 ]*\(.*\)\;/    \1/g' $^ >> $@-tmp && \
+	sed -e '/^$$/d; /#/d; /:/d; /}/d; /\*/d; /LIBVIRT_/d'	\
+	    -e 's/[	 ]*\(.*\)\;/    \1/g' $^ >> $@-tmp && \
 	chmod a-w $@-tmp && \
 	mv $@-tmp libvirt.def
 
 libvirt_qemu.def: $(srcdir)/libvirt_qemu.syms
 	$(AM_V_GEN)rm -f -- $@-tmp $@ ; \
 	printf 'EXPORTS\n' > $@-tmp && \
-	sed -e '/^$$/d; /#/d; /:/d; /}/d; /\*/d; /LIBVIRT_/d; s/[	 ]*\(.*\)\;/    \1/g' $^ >> $@-tmp && \
+	sed -e '/^$$/d; /#/d; /:/d; /}/d; /\*/d; /LIBVIRT_/d'	\
+	    -e 's/[	 ]*\(.*\)\;/    \1/g' $^ >> $@-tmp && \
 	chmod a-w $@-tmp && \
 	mv $@-tmp libvirt_qemu.def
 
 libvirt_lxc.def: $(srcdir)/libvirt_lxc.syms
 	$(AM_V_GEN)rm -f -- $@-tmp $@ ; \
 	printf 'EXPORTS\n' > $@-tmp && \
-	sed -e '/^$$/d; /#/d; /:/d; /}/d; /\*/d; /LIBVIRT_/d; s/[	 ]*\(.*\)\;/    \1/g' $^ >> $@-tmp && \
+	sed -e '/^$$/d; /#/d; /:/d; /}/d; /\*/d; /LIBVIRT_/d'	\
+	    -e 's/[	 ]*\(.*\)\;/    \1/g' $^ >> $@-tmp && \
 	chmod a-w $@-tmp && \
 	mv $@-tmp libvirt_lxc.def
 
@@ -1829,7 +1840,8 @@ RPC_PROBE_FILES = $(srcdir)/rpc/virnetprotocol.x \
 libvirt_functions.stp: $(RPC_PROBE_FILES) $(srcdir)/rpc/gensystemtap.pl
 	$(AM_V_GEN)$(PERL) -w $(srcdir)/rpc/gensystemtap.pl $(RPC_PROBE_FILES) > $@
 
-%_probes.stp: %_probes.d $(srcdir)/dtrace2systemtap.pl $(top_builddir)/config.status
+%_probes.stp: %_probes.d $(srcdir)/dtrace2systemtap.pl \
+		$(top_builddir)/config.status
 	$(AM_V_GEN)$(PERL) -w $(srcdir)/dtrace2systemtap.pl \
 	  $(DTRACE2SYSTEMTAP_FLAGS) $(bindir) $(sbindir) $(libdir) $< > $@
 
@@ -1879,7 +1891,10 @@ lockd_la_CFLAGS = -I$(top_srcdir)/src/conf \
 		$(XDR_CFLAGS) \
 		$(AM_CFLAGS)
 lockd_la_LDFLAGS = -module -avoid-version
-lockd_la_LIBADD = ../gnulib/lib/libgnu.la libvirt-net-rpc.la libvirt-net-rpc-client.la
+lockd_la_LIBADD = ../gnulib/lib/libgnu.la \
+	libvirt-net-rpc.la \
+	libvirt-net-rpc-client.la \
+	$(NULL)
 augeas_DATA += locking/libvirt_lockd.aug
 augeastest_DATA += test_libvirt_lockd.aug
 CLEANFILES += test_libvirt_lockd.aug
@@ -2334,19 +2349,19 @@ if WITH_NETWORK
 	$(MKDIR_P) "$(DESTDIR)$(localstatedir)/lib/libvirt/network"
 	$(MKDIR_P) "$(DESTDIR)$(localstatedir)/lib/libvirt/dnsmasq"
 	$(MKDIR_P) "$(DESTDIR)$(localstatedir)/run/libvirt/network"
-	$(MKDIR_P) "$(DESTDIR)$(sysconfdir)/libvirt/qemu/networks/autostart"
+	$(MKDIR_P) "$(DESTDIR)$(confdir)/qemu/networks/autostart"
 	$(INSTALL_DATA) $(srcdir)/network/default.xml \
-	  $(DESTDIR)$(sysconfdir)/libvirt/qemu/networks/default.xml
+	  $(DESTDIR)$(confdir)/qemu/networks/default.xml
 	test -z "$(UUID)" || \
 	  { sed -e "s,</name>,</name>\n  <uuid>$(UUID)</uuid>," \
-	      $(DESTDIR)$(sysconfdir)/libvirt/qemu/networks/default.xml > \
-	      $(DESTDIR)$(sysconfdir)/libvirt/qemu/networks/default.xml.t && \
-	    cp $(DESTDIR)$(sysconfdir)/libvirt/qemu/networks/default.xml.t \
-	      $(DESTDIR)$(sysconfdir)/libvirt/qemu/networks/default.xml && \
-	    rm $(DESTDIR)$(sysconfdir)/libvirt/qemu/networks/default.xml.t; }
-	test -e $(DESTDIR)$(sysconfdir)/libvirt/qemu/networks/autostart/default.xml || \
+	      $(DESTDIR)$(confdir)/qemu/networks/default.xml > \
+	      $(DESTDIR)$(confdir)/qemu/networks/default.xml.t && \
+	    cp $(DESTDIR)$(confdir)/qemu/networks/default.xml.t \
+	      $(DESTDIR)$(confdir)/qemu/networks/default.xml && \
+	    rm $(DESTDIR)$(confdir)/qemu/networks/default.xml.t; }
+	test -e $(DESTDIR)$(confdir)/qemu/networks/autostart/default.xml || \
 	   ln -s ../default.xml \
-	    $(DESTDIR)$(sysconfdir)/libvirt/qemu/networks/autostart/default.xml
+	    $(DESTDIR)$(confdir)/qemu/networks/autostart/default.xml
 endif
 
 uninstall-local:: uninstall-init uninstall-systemd
@@ -2385,10 +2400,10 @@ if WITH_XEN
 	rmdir "$(DESTDIR)$(localstatedir)/lib/libvirt/xen" ||:
 endif
 if WITH_NETWORK
-	rm -f $(DESTDIR)$(sysconfdir)/libvirt/qemu/networks/autostart/default.xml
-	rm -f $(DESTDIR)$(sysconfdir)/libvirt/qemu/networks/default.xml
-	rmdir "$(DESTDIR)$(sysconfdir)/libvirt/qemu/networks/autostart" || :
-	rmdir "$(DESTDIR)$(sysconfdir)/libvirt/qemu/networks" || :
+	rm -f $(DESTDIR)$(confdir)/qemu/networks/autostart/default.xml
+	rm -f $(DESTDIR)$(confdir)/qemu/networks/default.xml
+	rmdir "$(DESTDIR)$(confdir)/qemu/networks/autostart" || :
+	rmdir "$(DESTDIR)$(confdir)/qemu/networks" || :
 	rmdir "$(DESTDIR)$(localstatedir)/lib/libvirt/network" ||:
 	rmdir "$(DESTDIR)$(localstatedir)/run/libvirt/network" ||:
 endif
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 4c49151411c661b4612ff415414c268c3257fe85..47926b1b29e16576f12ca9bc86447491e7a8a112 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -294,7 +294,8 @@ TESTS = $(test_programs) \
 # intermediate shell variable, but must do all the expansion in make
 
 lv_abs_top_builddir=`cd '$(top_builddir)'; pwd`
-path_add = $(lv_abs_top_builddir)/daemon$(PATH_SEPARATOR)$(lv_abs_top_builddir)/tools$(PATH_SEPARATOR)$(lv_abs_top_builddir)/tests
+path_add = $(subst :,$(PATH_SEPARATOR),\
+	$(subst !,$(lv_abs_top_builddir)/,!daemon:!tools:!tests))
 
 TESTS_ENVIRONMENT =				\
   abs_top_builddir=$(lv_abs_top_builddir)	\
@@ -310,8 +311,10 @@ TESTS_ENVIRONMENT =				\
   $(VG)
 
 
+VALGRIND = valgrind --quiet --leak-check=full \
+	--suppressions=$(srcdir)/.valgrind.supp
 valgrind:
-	$(MAKE) check VG="libtool --mode=execute valgrind --quiet --leak-check=full --suppressions=$(srcdir)/.valgrind.supp"
+	$(MAKE) check VG="libtool --mode=execute $(VALGRIND)"
 
 sockettest_SOURCES = \
 	sockettest.c \
@@ -669,7 +672,8 @@ libsecurityselinuxhelper_la_LDFLAGS = -module -avoid-version \
 securityselinuxtest_SOURCES = \
 	securityselinuxtest.c testutils.h testutils.c
 securityselinuxtest_LDADD = $(LDADDS)
-securityselinuxtest_DEPENDENCIES = libsecurityselinuxhelper.la ../src/libvirt.la
+securityselinuxtest_DEPENDENCIES = libsecurityselinuxhelper.la \
+	../src/libvirt.la
 
 if WITH_QEMU
 if WITH_ATTR
@@ -677,11 +681,13 @@ securityselinuxlabeltest_SOURCES = \
 	securityselinuxlabeltest.c testutils.h testutils.c \
         testutilsqemu.h testutilsqemu.c
 securityselinuxlabeltest_LDADD = $(qemu_LDADDS)
-securityselinuxlabeltest_DEPENDENCIES = libsecurityselinuxhelper.la ../src/libvirt.la
+securityselinuxlabeltest_DEPENDENCIES = libsecurityselinuxhelper.la \
+	../src/libvirt.la
 endif
 endif
 endif
-EXTRA_DIST += securityselinuxtest.c securityselinuxlabeltest.c securityselinuxhelper.c
+EXTRA_DIST += securityselinuxtest.c securityselinuxlabeltest.c \
+	securityselinuxhelper.c
 
 virbuftest_SOURCES = \
 	virbuftest.c testutils.h testutils.c
@@ -725,7 +731,8 @@ endif
 
 libshunload_la_SOURCES = shunloadhelper.c
 libshunload_la_LIBADD = ../src/libvirt.la
-libshunload_la_LDFLAGS = -module -avoid-version -rpath /evil/libtool/hack/to/force/shared/lib/creation
+libshunload_la_LDFLAGS = -module -avoid-version \
+	-rpath /evil/libtool/hack/to/force/shared/lib/creation
 
 shunloadtest_SOURCES = \
 	shunloadtest.c
@@ -756,7 +763,8 @@ object_locking_SOURCES = object-locking.ml
 	ocamlfind ocamlopt $(CILOPTFLAGS) $(CILOPTINCS) $(CILOPTPACKAGES) -c $<
 
 object-locking: object-locking.cmx object-locking-files.txt
-	ocamlfind ocamlopt $(CILOPTFLAGS) $(CILOPTINCS) $(CILOPTPACKAGES) $(CILOPTLIBS) $< -o $@
+	ocamlfind ocamlopt $(CILOPTFLAGS) $(CILOPTINCS) $(CILOPTPACKAGES) \
+	  $(CILOPTLIBS) $< -o $@
 
 object-locking-files.txt:
 	find $(top_builddir)/src/ -name '*.i' > $@
@@ -765,4 +773,5 @@ else
 EXTRA_DIST += object-locking.ml
 endif
 
-CLEANFILES = *.cov *.gcov .libs/*.gcda .libs/*.gcno *.gcno *.gcda *.cmi *.cmx object-locking-files.txt
+CLEANFILES = *.cov *.gcov .libs/*.gcda .libs/*.gcno *.gcno *.gcda *.cmi *.cmx \
+	object-locking-files.txt