[master] 4e1133e8b try to fix the make race for real

Nils Goroll nils.goroll at uplex.de
Tue Mar 10 16:55:06 UTC 2020

commit 4e1133e8b031eaf88016a1dceed561e03da957ba
Author: Nils Goroll <nils.goroll at uplex.de>
Date:   Tue Mar 10 17:53:31 2020 +0100

    try to fix the make race for real
    b365be2d281944d5c79be92ff73b3dc02c5db6be was not correct in that I put
    vcc_compile.h in the wrong place, it should have been added to GEN_H,
    not as a dependency for GEN_H
    I also realized that we should wait for the last file generate.py

diff --git a/lib/libvcc/Makefile.am b/lib/libvcc/Makefile.am
index 09ed89b36..ce550df7a 100644
--- a/lib/libvcc/Makefile.am
+++ b/lib/libvcc/Makefile.am
@@ -50,11 +50,15 @@ vcc_obj.c: \
 	@PYTHON@ $(top_srcdir)/lib/libvcc/generate.py \
 	    $(top_srcdir) $(top_builddir)
+## this list is not complete, but it contains important files
+## used as includes and the last file built by generate.py
 GEN_H = \
 	vcc_fixed_token.c \
-	vcc_token_defs.h
+	vcc_token_defs.h \
+	vcc_compile.h \
+	tbl/vrt_stv_var.h
-$(GEN_H): vcc_obj.c vcc_compile.h
+$(GEN_H): vcc_obj.c
 GENERATED_H = vcc_obj.c $(GEN_H)

More information about the varnish-commit mailing list