Commit 19d989bd authored by Geoff Simmons's avatar Geoff Simmons

generate README.rst and check it into the top-level directory, and

ensure that it builds with make -j
parent 061ed1ca
Pipeline #80 skipped
...@@ -5,5 +5,27 @@ SUBDIRS = src ...@@ -5,5 +5,27 @@ SUBDIRS = src
DISTCHECK_CONFIGURE_FLAGS = \ DISTCHECK_CONFIGURE_FLAGS = \
VMOD_DIR='$${libdir}/varnish/vmods' VMOD_DIR='$${libdir}/varnish/vmods'
dist_man_MANS = src/vmod_re.3 EXTRA_DIST = README.rst LICENSE COPYING
doc_DATA = README.rst LICENSE COPYING
dist_man_MANS = vmod_re.3
MAINTAINERCLEANFILES = $(dist_man_MANS) MAINTAINERCLEANFILES = $(dist_man_MANS)
vmod_re.3: README.rst
README.rst: src/vmod_re.man.rst
cp src/vmod_re.man.rst README.rst
src/vmod_re.man.rst:
make -C src vmod_re.man.rst
%.1 %.2 %.3 %.4 %.5 %.6 %.7 %.8 %.9:
if HAVE_RST2MAN
${RST2MAN} $< $@
else
@echo "========================================"
@echo "You need rst2man installed to make dist"
@echo "========================================"
@false
endif
See src/vmod_re.vcc for the VMOD documentation, including installation
instructions. The 'make' command converts this file into the manpage
'vmod_re'.
See LICENSE for license and copyright notices.
\ No newline at end of file
This diff is collapsed.
...@@ -9,10 +9,9 @@ libvmod_re_la_SOURCES = \ ...@@ -9,10 +9,9 @@ libvmod_re_la_SOURCES = \
vcc_if.h \ vcc_if.h \
vmod_re.c vmod_re.c
man3_MANS = vmod_re.3 vcc_if.c: vcc_if.h
dist_man_MANS =
vcc_if.c vcc_if.h: @VMODTOOL@ $(top_srcdir)/src/vmod_re.vcc vcc_if.h vmod_re.man.rst: @VMODTOOL@ $(top_srcdir)/src/vmod_re.vcc
@VMODTOOL@ $(top_srcdir)/src/vmod_re.vcc @VMODTOOL@ $(top_srcdir)/src/vmod_re.vcc
VMOD_TESTS = $(top_srcdir)/src/tests/*.vtc VMOD_TESTS = $(top_srcdir)/src/tests/*.vtc
...@@ -23,16 +22,6 @@ $(top_srcdir)/src/tests/*.vtc: ...@@ -23,16 +22,6 @@ $(top_srcdir)/src/tests/*.vtc:
check: $(VMOD_TESTS) check: $(VMOD_TESTS)
vmod_re.3: $(top_srcdir)/src/vmod_re.man.rst
if HAVE_RST2MAN
${RST2MAN} vmod_re.man.rst $@
else
@echo "========================================"
@echo "You need rst2man installed to make dist"
@echo "========================================"
@false
endif
EXTRA_DIST = \ EXTRA_DIST = \
vmod_re.vcc \ vmod_re.vcc \
$(VMOD_TESTS) $(VMOD_TESTS)
......
#- #-
# Copyright (c) 2015 UPLEX Nils Goroll Systemoptimierung # Copyright (c) 2014-2015 UPLEX Nils Goroll Systemoptimierung
# All rights reserved # All rights reserved
# #
# Authors: Geoffrey Simmons <geoffrey.simmons@uplex.de> # This document is licensed under the same conditions as the libvmod-re
# Nils Goroll <nils.goroll@uplex.de> # project. See LICENSE for details.
#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions
# are met:
# 1. Redistributions of source code must retain the above copyright
# notice, this list of conditions and the following disclaimer.
# 2. Redistributions in binary form must reproduce the above copyright
# notice, this list of conditions and the following disclaimer in the
# documentation and/or other materials provided with the distribution.
#
# THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
# ARE DISCLAIMED. IN NO EVENT SHALL AUTHOR OR CONTRIBUTORS BE LIABLE
# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
# SUCH DAMAGE.
# #
# Author: Geoffrey Simmons <geoffrey.simmons@uplex.de>
$Module re 3 Varnish Module for Regular Expression Matching with Subexpression Capture $Module re 3 Varnish Module for Regular Expression Matching with Subexpression Capture
...@@ -311,11 +291,3 @@ SEE ALSO ...@@ -311,11 +291,3 @@ SEE ALSO
* vcl(7) * vcl(7)
* pcre(3) * pcre(3)
* http://lassekarstensen.wordpress.com/2013/12/19/converting-a-varnish-3-0-vmod-to-4-0/ * http://lassekarstensen.wordpress.com/2013/12/19/converting-a-varnish-3-0-vmod-to-4-0/
COPYRIGHT
=========
This document is licensed under the same license as the libvmod-re
project. See LICENSE for details.
* Copyright (c) 2014 UPLEX Nils Goroll Systemoptimierung
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