[master] d2705d2 Make sure generate.py is only ran once also for parallel make.

Dag Haavi Finstad daghf at varnish-software.com
Tue Jan 27 15:44:50 CET 2015


commit d2705d20db68af210d6b4de19ee97080e494ebb2
Author: Dag Haavi Finstad <daghf at varnish-software.com>
Date:   Tue Jan 27 15:43:42 2015 +0100

    Make sure generate.py is only ran once also for parallel make.

diff --git a/include/Makefile.am b/include/Makefile.am
index cda44ee..bda6e37 100644
--- a/include/Makefile.am
+++ b/include/Makefile.am
@@ -87,7 +87,8 @@ nobase_noinst_HEADERS = \
 	vut.h \
 	vut_options.h
 
-tbl/vrt_stv_var.h tbl/vcl_returns.h tbl/vcc_types.h vcl.h vrt_obj.h: $(top_srcdir)/lib/libvcc/generate.py $(top_srcdir)/include/vrt.h
+tbl/vrt_stv_var.h tbl/vcl_returns.h tbl/vcc_types.h vrt_obj.h: vcl.h
+vcl.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)
 
diff --git a/lib/libvcc/Makefile.am b/lib/libvcc/Makefile.am
index c7e183d..b5a6574 100644
--- a/lib/libvcc/Makefile.am
+++ b/lib/libvcc/Makefile.am
@@ -38,8 +38,7 @@ dist_pkgdata_SCRIPTS = \
 	vmodtool.py
 
 vcc_obj.c vcc_fixed_token.c vcc_token_defs.h: \
-	$(srcdir)/generate.py $(top_srcdir)/include/vrt.h
-	@PYTHON@ $(srcdir)/generate.py $(srcdir) $(top_builddir)
+	$(top_builddir)/include/vcl.h
 
 CLEANFILES = $(builddir)/vcc_token_defs.h \
 	$(builddir)/vcc_fixed_token.c \



More information about the varnish-commit mailing list