[master] 4ca19f0 Don't overwrite DISTCLEANFILES

Poul-Henning Kamp phk at FreeBSD.org
Fri Nov 25 22:40:04 CET 2016


commit 4ca19f06e82e7f03fcdfecce1732bf7e6b52328e
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Fri Nov 25 21:39:09 2016 +0000

    Don't overwrite DISTCLEANFILES

diff --git a/bin/varnishd/Makefile.am b/bin/varnishd/Makefile.am
index d629a4a..2d2057d 100644
--- a/bin/varnishd/Makefile.am
+++ b/bin/varnishd/Makefile.am
@@ -159,9 +159,6 @@ varnishd_LDADD = \
 	@PCRE_LIBS@ \
 	${DL_LIBS} ${PTHREAD_LIBS} ${NET_LIBS} ${LIBM} ${LIBUMEM}
 
-EXTRA_DIST = builtin.vcl
-DISTCLEANFILES = builtin_vcl.h
-
 noinst_PROGRAMS = vhp_gen_hufdec
 vhp_gen_hufdec_SOURCES = hpack/vhp_gen_hufdec.c
 vhp_gen_hufdec_CFLAGS = -include config.h
@@ -197,12 +194,16 @@ builtin_vcl.h:	builtin.vcl
 	    -e 's/$$/\\n"/' \
 	    -e 's/^/ "/' $(srcdir)/builtin.vcl >> $@
 
+EXTRA_DIST = builtin.vcl
+
 vhp_hufdec.h: vhp_gen_hufdec
 	$(AM_V_GEN) ./vhp_gen_hufdec > vhp_hufdec.h_
 	mv vhp_hufdec.h_ vhp_hufdec.h
 
+DISTCLEANFILES = builtin_vcl.h
+
 BUILT_SOURCES	=	vhp_hufdec.h
-DISTCLEANFILES	=	vhp_hufdec.h
+DISTCLEANFILES	+=	vhp_hufdec.h
 
 # Explicitly record dependency
 mgt/mgt_vcc.c:	builtin_vcl.h



More information about the varnish-commit mailing list