[master] 9c31eb7 Reflect required vdef->vrt->vcl order

[Poul-Henning Kamp]

commit 9c31eb702852c5c214644e06f439e93e5cb5549c
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Sat Sep 23 10:10:36 2017 +0000

    Reflect required vdef->vrt->vcl order

diff --git a/include/Makefile.am b/include/Makefile.am
index a77cae9..b3401c2 100644
--- a/include/Makefile.am
+++ b/include/Makefile.am
@@ -127,8 +127,8 @@ noinst_PROGRAMS = vbm_test
 
 vbm_test_SOURCES = vbm_test.c vbm.h
 
-vrt.c: vrt.h
-	cp $(srcdir)/vrt.h $@
+vrt.c: Makefile.am vdef.h vrt.h
+	cat $(srcdir)/vdef.h $(srcdir)/vrt.h > $@
 
 vrt_test: vrt.c
 	echo "exec ${CC} -c -o _vrt_test vrt.c" > $@
diff --git a/lib/libvcc/generate.py b/lib/libvcc/generate.py
index e65f215..2f24b78 100755
--- a/lib/libvcc/generate.py
+++ b/lib/libvcc/generate.py
@@ -1300,8 +1300,8 @@ vcl_output_lang_h(struct vsb *sb)
 """)
 
 emit_file(fo, srcroot, "include/vdef.h")
-emit_file(fo, buildroot, "include/vcl.h")
 emit_file(fo, srcroot, "include/vrt.h")
+emit_file(fo, buildroot, "include/vcl.h")
 emit_file(fo, buildroot, "include/vrt_obj.h")
 
 fo.write("\n}\n")