[master] 46f1557dd properly declare vtc_h2_dectbl.h to automake and git

Nils Goroll nils.goroll at uplex.de
Mon Aug 13 13:51:12 UTC 2018


commit 46f1557dd80ffbd75fab924e48ecfd020437b1e0
Author: Nils Goroll <nils.goroll at uplex.de>
Date:   Mon Aug 13 15:35:30 2018 +0200

    properly declare vtc_h2_dectbl.h to automake and git
    
    in order to have it build first and cleaned up
    
    fixes this issue when switching to an older branch:
    
    $ git checkout ...
    error: The following untracked working tree files would be overwritten
    by checkout:
            bin/varnishtest/vtc_h2_dectbl.h
    Please move or remove them before you switch branches.
    Aborting

diff --git a/.gitignore b/.gitignore
index cdba66f7f..113da821b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -51,6 +51,7 @@ cscope.*out
 # Various auto-generated code snippets
 /bin/varnishd/vhp_hufdec.h
 /bin/varnishd/vhp_gen_hufdec
+/bin/varnishtest/vtc_h2_dectbl.h
 /include/vcl.h
 /include/vrt_obj.h
 /include/vmod_abi.h
diff --git a/bin/varnishtest/Makefile.am b/bin/varnishtest/Makefile.am
index b34caa435..5c3cfae85 100644
--- a/bin/varnishtest/Makefile.am
+++ b/bin/varnishtest/Makefile.am
@@ -91,4 +91,8 @@ vtc_h2_dectbl.h: huffman_gen.py $(top_srcdir)/include/tbl/vhp_huffman.h
 	    $(top_srcdir)/include/tbl/vhp_huffman.h > $@_
 	mv $@_ $@
 
-CLEANFILES = $(builddir)/teken_state.h
+BUILT_SOURCES = vtc_h2_dectbl.h
+
+CLEANFILES = \
+	$(builddir)/teken_state.h	\
+	$(BUILT_SOURCES)


More information about the varnish-commit mailing list