[master] 26c3d5b Whitespace cleanup

[Poul-Henning Kamp]

commit 26c3d5bd14d4f359f3c9a2f55b2312ed43632c64
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Mon Jan 16 11:21:00 2017 +0000

    Whitespace cleanup

diff --git a/bin/varnishtest/tests/a00009.vtc b/bin/varnishtest/tests/a00009.vtc
index 202ec4d..c783c44 100644
--- a/bin/varnishtest/tests/a00009.vtc
+++ b/bin/varnishtest/tests/a00009.vtc
@@ -49,7 +49,7 @@ shell {
 }
 
 shell -expect {VCL compiled.} {
-	varnishadm -n ${tmpdir}/v0 vcl.load vcl1 ${tmpdir}/vcl 
+	varnishadm -n ${tmpdir}/v0 vcl.load vcl1 ${tmpdir}/vcl
 }
 
 shell -expect {active      auto/warm          - vcl1} {
diff --git a/include/Makefile.am b/include/Makefile.am
index 3c01782..31cf0c4 100644
--- a/include/Makefile.am
+++ b/include/Makefile.am
@@ -115,7 +115,7 @@ $(GENERATED_H): $(top_srcdir)/lib/libvcc/generate.py $(top_srcdir)/include/vrt.h
 	mkdir -p tbl
 	@PYTHON@ $(top_srcdir)/lib/libvcc/generate.py $(top_srcdir) $(top_builddir)
 
-BUILT_SOURCES = vcs_version.h vmod_abi.h
+BUILT_SOURCES = $(GENERATED_H)
 MAINTAINERCLEANFILES = vcs_version.h
 
 CLEANFILES = \
diff --git a/lib/libvcc/generate.py b/lib/libvcc/generate.py
index 9797273..2f27243 100755
--- a/lib/libvcc/generate.py
+++ b/lib/libvcc/generate.py
@@ -1381,18 +1381,18 @@ fp_vclvar.close()
 
 if os.path.isdir(os.path.join(srcroot, ".git")):
 	v = subprocess.check_output([
-		"git --git-dir=" + os.path.join(srcroot, ".git") + 
+		"git --git-dir=" + os.path.join(srcroot, ".git") +
 		" show -s --pretty=format:%h"
 	], shell=True, universal_newlines=True)
 	b = subprocess.check_output([
-		"git --git-dir=" + os.path.join(srcroot, ".git") + 
-	 	" rev-parse --abbrev-ref HEAD"
+		"git --git-dir=" + os.path.join(srcroot, ".git") +
+		" rev-parse --abbrev-ref HEAD"
 	], shell=True, universal_newlines=True)
 	b = b.strip()
 else:
 	b = "NOGIT"
 	v = "NOGIT"
-		
+
 vcsfn = os.path.join(srcroot, "include", "vcs_version.h")
 
 try: