[master] 1a5f3e1 more serialization of generator snakes

Nils Goroll nils.goroll at uplex.de
Thu Oct 5 12:42:06 UTC 2017


commit 1a5f3e1f2d4408cd2337f1516f9d7367d028c33d
Author: Nils Goroll <nils.goroll at uplex.de>
Date:   Thu Oct 5 14:41:36 2017 +0200

    more serialization of generator snakes

diff --git a/include/Makefile.am b/include/Makefile.am
index dde6a89..9fb1da1 100644
--- a/include/Makefile.am
+++ b/include/Makefile.am
@@ -99,18 +99,21 @@ nobase_noinst_HEADERS = \
 	vtcp.h \
 	vtree.h
 
-GENERATED_H = \
+vmod_abi.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)
+
+GEN_H = \
 	tbl/vrt_stv_var.h \
 	tbl/vcl_returns.h \
 	tbl/vcc_types.h \
 	vrt_obj.h \
 	vcl.h \
-	vcs_version.h \
-	vmod_abi.h
+	vcs_version.h
 
-$(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)
+$(GEN_H): vmod_abi.h
+
+GENERATED_H = vmod_abi.h $(GEN_H)
 
 BUILT_SOURCES = $(GENERATED_H)
 MAINTAINERCLEANFILES = vcs_version.h
diff --git a/lib/libvarnishapi/Makefile.am b/lib/libvarnishapi/Makefile.am
index d0e8b64..5ad55d2 100644
--- a/lib/libvarnishapi/Makefile.am
+++ b/lib/libvarnishapi/Makefile.am
@@ -81,7 +81,9 @@ vsl2rst_SOURCES = \
 	$(top_srcdir)/include/tbl/vsl_tags.h \
 	$(top_srcdir)/include/tbl/vsl_tags_http.h
 
-vxp_fixed_token.c vxp_tokens.h: \
+vxp_fixed_token.c: vxp_tokens.h
+
+vxp_tokens.h: \
 	$(srcdir)/generate.py
 	@PYTHON@ $(srcdir)/generate.py $(srcdir) $(top_builddir)
 


More information about the varnish-commit mailing list