Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
varnish-cache
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Commits
Open sidebar
varnishcache
varnish-cache
Commits
a5f678f4
Commit
a5f678f4
authored
Feb 17, 2014
by
Federico G. Schwindt
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Revert
5c3ce452
,
e85e0aae
and
6131dc97
for now
They break the build if parallelised and make jenkins upset
parent
c14936bc
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
15 deletions
+3
-15
Makefile.am
lib/libvmod_directors/Makefile.am
+1
-13
Makefile.am
lib/libvmod_std/Makefile.am
+2
-2
No files found.
lib/libvmod_directors/Makefile.am
View file @
a5f678f4
...
...
@@ -6,8 +6,6 @@ AM_CPPFLAGS = \
-I
$(top_srcdir)
/bin/varnishd
\
-I
$(top_builddir)
/include
dist_man_MANS
=
vmod_directors.3
vmoddir
=
$(pkglibdir)
/vmods
vmod_srcdir
=
$(top_srcdir)
/lib/libvmod_directors
vmodtool
=
$(top_srcdir)
/lib/libvcc/vmodtool.py
...
...
@@ -28,7 +26,7 @@ nodist_libvmod_directors_la_SOURCES = \
vcc_if.h
# BUILT_SOURCES is only a hack and dependency tracking does not help for the first build
vdir.lo fall_back.lo hash.lo random.lo round_robin.lo
vmod_directors.rst vmod_directors.man.rst
:
vcc_if.h
vdir.lo fall_back.lo hash.lo random.lo round_robin.lo
:
vcc_if.h
vcc_if.c vcc_if.h
:
$(vmodtool) $(vmod_srcdir)/vmod.vcc
@
PYTHON@
$(vmodtool)
$(vmod_srcdir)
/vmod.vcc
...
...
@@ -38,13 +36,3 @@ EXTRA_DIST = vmod.vcc
CLEANFILES
=
$(builddir)
/vcc_if.c
$(builddir)
/vcc_if.h
\
$(builddir)
/vmod_directors.rst
\
$(builddir)
/vmod_directors.man.rst
vmod_directors.3
:
$(vmod_srcdir)/vmod_directors.man.rst
if
HAVE_RST2MAN
${RST2MAN}
$?
$@
else
@echo
"========================================"
@echo
"You need rst2man installed to make dist"
@echo
"========================================"
@false
endif
lib/libvmod_std/Makefile.am
View file @
a5f678f4
...
...
@@ -26,7 +26,7 @@ nodist_libvmod_std_la_SOURCES = \
vcc_if.h
# BUILT_SOURCES is only a hack and dependency tracking does not help for the first build
vmod_std.lo vmod_std_fileread.lo vmod_std_conversions.lo
vmod_std.rst vmod_std.man.rst
:
vcc_if.h
vmod_std.lo vmod_std_fileread.lo vmod_std_conversions.lo
:
vcc_if.h
vcc_if.c vcc_if.h
:
$(vmodtool) $(vmod_srcdir)/vmod.vcc
@
PYTHON@
$(vmodtool)
$(vmod_srcdir)
/vmod.vcc
...
...
@@ -37,7 +37,7 @@ CLEANFILES = $(builddir)/vcc_if.c $(builddir)/vcc_if.h \
$(builddir)
/vmod_std.rst
\
$(builddir)
/vmod_std.man.rst
vmod_std.3
:
$(
vmod_srcdir)/vmod_std.man
.rst
vmod_std.3
:
$(
top_srcdir)/doc/sphinx/reference/vmod_std
.rst
if
HAVE_RST2MAN
${RST2MAN}
$?
$@
else
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment