Commit 821cb893 authored by Geoff Simmons's avatar Geoff Simmons

Fix make distcheck -- don't create README.rst unnecessarily in a build.

And fix duplicate targets in src/Makefile.
parent 3be02287
...@@ -5,21 +5,14 @@ SUBDIRS = src ...@@ -5,21 +5,14 @@ SUBDIRS = src
DISTCHECK_CONFIGURE_FLAGS = \ DISTCHECK_CONFIGURE_FLAGS = \
VMOD_DIR='$${libdir}/varnish/vmods' VMOD_DIR='$${libdir}/varnish/vmods'
EXTRA_DIST = README.rst LICENSE COPYING EXTRA_DIST = README.rst
doc_DATA = README.rst LICENSE COPYING dist_doc_DATA = README.rst LICENSE COPYING
dist_man_MANS = vmod_re2.3 README.rst: src/vmod_re2.vcc
MAINTAINERCLEANFILES = $(dist_man_MANS) $(MAKE) -C src vmod_re2.man.rst
vmod_re2.3: README.rst
README.rst: src/vmod_re2.man.rst
cp src/vmod_re2.man.rst README.rst cp src/vmod_re2.man.rst README.rst
src/vmod_re2.man.rst:
make -C src vmod_re2.man.rst
%.1 %.2 %.3 %.4 %.5 %.6 %.7 %.8 %.9: %.1 %.2 %.3 %.4 %.5 %.6 %.7 %.8 %.9:
if HAVE_RST2MAN if HAVE_RST2MAN
${RST2MAN} $< $@ ${RST2MAN} $< $@
......
...@@ -23,6 +23,9 @@ nodist_libvmod_re2_la_SOURCES = \ ...@@ -23,6 +23,9 @@ nodist_libvmod_re2_la_SOURCES = \
vcc_if.c \ vcc_if.c \
vcc_if.h vcc_if.h
dist_man_MANS = vmod_re2.3
MAINTAINERCLEANFILES = $(dist_man_MANS)
libvmod_re2_la_LIBADD = @RE2_LIBS@ libvmod_re2_la_LIBADD = @RE2_LIBS@
vmod_re2.lo: vcc_if.c vcc_if.h vmod_re2.lo: vcc_if.c vcc_if.h
...@@ -41,9 +44,6 @@ vre2/vre2.cpp: vre2/vre2.h ...@@ -41,9 +44,6 @@ vre2/vre2.cpp: vre2/vre2.h
vre2/vre2set.cpp: vre2/vre2set.h vre2/vre2set.cpp: vre2/vre2set.h
vcc_if.h vmod_re2.man.rst: @VMODTOOL@ $(top_srcdir)/src/vmod_re2.vcc
@VMODTOOL@ $(top_srcdir)/src/vmod_re2.vcc
VMOD_TESTS = $(top_srcdir)/src/tests/*.vtc VMOD_TESTS = $(top_srcdir)/src/tests/*.vtc
.PHONY: $(VMOD_TESTS) .PHONY: $(VMOD_TESTS)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment