matthieu/frr
1
0
Fork 0
forked from Mirror/frr
Code Pull requests Activity

build: fix not building docs w/o sphinx

Browse source 
Can't build manpages without sphinx-build, oops...

Signed-off-by: David Lamparter <equinox@diac24.net>
This commit is contained in:
David Lamparter 2018-09-05 11:25:24 +02:00
parent 55e6c1329f
commit f4f2f2ccac
20 changed files with 35 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
bfdd/subdir.am
View file

@ -7,7 +7,7 @@ noinst_LIBRARIES += bfdd/libbfd.a
sbin_PROGRAMS += bfdd/bfdd sbin_PROGRAMS += bfdd/bfdd
dist_examples_DATA += bfdd/bfdd.conf.sample dist_examples_DATA += bfdd/bfdd.conf.sample
vtysh_scan += $(top_srcdir)/bfdd/bfdd_vty.c vtysh_scan += $(top_srcdir)/bfdd/bfdd_vty.c
rstman8_DATA += $(MANBUILD)/bfdd.8 man8 += $(MANBUILD)/bfdd.8
endif endif
bfdd_libbfd_a_SOURCES = \ bfdd_libbfd_a_SOURCES = \

2
bgpd/subdir.am
View file

@ -42,7 +42,7 @@ endif
if RPKI if RPKI
module_LTLIBRARIES += bgpd/bgpd_rpki.la module_LTLIBRARIES += bgpd/bgpd_rpki.la
endif endif
rstman8_DATA += $(MANBUILD)/bgpd.8 man8 += $(MANBUILD)/bgpd.8
endif endif
bgpd_libbgp_a_SOURCES = \ bgpd_libbgp_a_SOURCES = \

11
configure.ac
View file

@ -1351,8 +1351,13 @@ FRR_INCLUDES
])dnl ])dnl
dnl disable doc check dnl disable doc check
AC_CHECK_PROGS([SPHINXBUILD], [sphinx-build sphinx-build3 sphinx-build2], [no]) AC_CHECK_PROGS([SPHINXBUILD], [sphinx-build sphinx-build3 sphinx-build2], [/bin/false])
AM_CONDITIONAL(DOC, test "${enable_doc}" != "no") if test "$SPHINXBUILD" = "/bin/false"; then
if test "${enable_doc}" = "yes"; then
AC_MSG_ERROR([Documentation was explicitly requested with --enable-doc but sphinx-build is not available. Please disable docs or install sphinx.])
fi
fi
AM_CONDITIONAL(DOC, test "${enable_doc}" != "no" -a "$SPHINXBUILD" != "/bin/false")
AM_CONDITIONAL(DOC_HTML, test "${enable_doc_html}" = "yes") AM_CONDITIONAL(DOC_HTML, test "${enable_doc_html}" = "yes")
dnl -------------------- dnl --------------------
@ -2077,6 +2082,6 @@ The above user and group must have read/write access to the state file
directory and to the config files in the config file directory." directory and to the config files in the config file directory."
if test "${enable_doc}" != "no";then if test "${enable_doc}" != "no";then
AS_IF([test "x$SPHINXBUILD" = xno], AS_IF([test "$SPHINXBUILD" = /bin/false],
AC_MSG_WARN(sphinx-build is missing but required to build documentation)) AC_MSG_WARN(sphinx-build is missing but required to build documentation))
fi fi

10
doc/manpages/subdir.am
View file

@ -47,10 +47,16 @@ rstman8dir = $(mandir)/man8
rstman1_DATA = rstman1_DATA =
rstman8_DATA = rstman8_DATA =
rstman1_DATA += $(MANBUILD)/frr.1 if DOC
rstman1_DATA += $(man1)
rstman8_DATA += $(man8)
endif # DOC
man1 = $(MANBUILD)/frr.1
man8 =
# dependency # dependency
$(rstman8_DATA) $(rstman1_DATA): $(MANBUILD)/man.stamp $(man8) $(man1): $(MANBUILD)/man.stamp
# #
# hook-ins for clean / doc # hook-ins for clean / doc

2
eigrpd/subdir.am
View file

@ -11,7 +11,7 @@ vtysh_scan += \
$(top_srcdir)/eigrpd/eigrp_vty.c \ $(top_srcdir)/eigrpd/eigrp_vty.c \
# end # end
# $(top_srcdir)/eigrpd/eigrp_routemap.c # $(top_srcdir)/eigrpd/eigrp_routemap.c
rstman8_DATA += $(MANBUILD)/eigrpd.8 man8 += $(MANBUILD)/eigrpd.8
endif endif
eigrpd_libeigrp_a_SOURCES = \ eigrpd_libeigrp_a_SOURCES = \

2
isisd/subdir.am
View file

@ -15,7 +15,7 @@ vtysh_scan += \
$(top_srcdir)/isisd/isis_vty_isisd.c \ $(top_srcdir)/isisd/isis_vty_isisd.c \
$(top_srcdir)/isisd/isisd.c \ $(top_srcdir)/isisd/isisd.c \
# end # end
rstman8_DATA += $(MANBUILD)/isisd.8 man8 += $(MANBUILD)/isisd.8
endif endif
if FABRICD if FABRICD

2
ldpd/subdir.am
View file

@ -7,7 +7,7 @@ noinst_LIBRARIES += ldpd/libldp.a
sbin_PROGRAMS += ldpd/ldpd sbin_PROGRAMS += ldpd/ldpd
dist_examples_DATA += ldpd/ldpd.conf.sample dist_examples_DATA += ldpd/ldpd.conf.sample
vtysh_scan += $(top_srcdir)/ldpd/ldp_vty_cmds.c vtysh_scan += $(top_srcdir)/ldpd/ldp_vty_cmds.c
rstman8_DATA += $(MANBUILD)/ldpd.8 man8 += $(MANBUILD)/ldpd.8
endif endif
ldpd_libldp_a_SOURCES = \ ldpd_libldp_a_SOURCES = \

2
nhrpd/subdir.am
View file

@ -5,7 +5,7 @@
if NHRPD if NHRPD
sbin_PROGRAMS += nhrpd/nhrpd sbin_PROGRAMS += nhrpd/nhrpd
vtysh_scan += $(top_srcdir)/nhrpd/nhrp_vty.c vtysh_scan += $(top_srcdir)/nhrpd/nhrp_vty.c
rstman8_DATA += $(MANBUILD)/nhrpd.8 man8 += $(MANBUILD)/nhrpd.8
endif endif
nhrpd_nhrpd_LDADD = lib/libfrr.la @LIBCAP@ @CARES_LIBS@ nhrpd_nhrpd_LDADD = lib/libfrr.la @LIBCAP@ @CARES_LIBS@

2
ospf6d/subdir.am
View file

@ -26,7 +26,7 @@ vtysh_scan += \
if SNMP if SNMP
module_LTLIBRARIES += ospf6d/ospf6d_snmp.la module_LTLIBRARIES += ospf6d/ospf6d_snmp.la
endif endif
rstman8_DATA += $(MANBUILD)/ospf6d.8 man8 += $(MANBUILD)/ospf6d.8
endif endif
ospf6d_libospf6_a_SOURCES = \ ospf6d_libospf6_a_SOURCES = \

2
ospfclient/subdir.am
View file

@ -5,7 +5,7 @@
if OSPFCLIENT if OSPFCLIENT
lib_LTLIBRARIES += ospfclient/libfrrospfapiclient.la lib_LTLIBRARIES += ospfclient/libfrrospfapiclient.la
sbin_PROGRAMS += ospfclient/ospfclient sbin_PROGRAMS += ospfclient/ospfclient
rstman8_DATA += $(MANBUILD)/ospfclient.8 man8 += $(MANBUILD)/ospfclient.8
endif endif
ospfclient_libfrrospfapiclient_la_LDFLAGS = -version-info 0:0:0 ospfclient_libfrrospfapiclient_la_LDFLAGS = -version-info 0:0:0

2
ospfd/subdir.am
View file

@ -19,7 +19,7 @@ vtysh_scan += \
if SNMP if SNMP
module_LTLIBRARIES += ospfd/ospfd_snmp.la module_LTLIBRARIES += ospfd/ospfd_snmp.la
endif endif
rstman8_DATA += $(MANBUILD)/ospfd.8 man8 += $(MANBUILD)/ospfd.8
endif endif
ospfd_libfrrospf_a_SOURCES = \ ospfd_libfrrospf_a_SOURCES = \

2
pbrd/subdir.am
View file

@ -10,7 +10,7 @@ vtysh_scan += \
$(top_srcdir)/pbrd/pbr_vty.c \ $(top_srcdir)/pbrd/pbr_vty.c \
$(top_srcdir)/pbrd/pbr_debug.c \ $(top_srcdir)/pbrd/pbr_debug.c \
# end # end
rstman8_DATA += $(MANBUILD)/pbrd.8 man8 += $(MANBUILD)/pbrd.8
endif endif
pbrd_libpbr_a_SOURCES = \ pbrd_libpbr_a_SOURCES = \

4
pimd/subdir.am
View file

@ -9,8 +9,8 @@ bin_PROGRAMS += pimd/mtracebis
noinst_PROGRAMS += pimd/test_igmpv3_join noinst_PROGRAMS += pimd/test_igmpv3_join
dist_examples_DATA += pimd/pimd.conf.sample dist_examples_DATA += pimd/pimd.conf.sample
vtysh_scan += $(top_srcdir)/pimd/pim_cmd.c vtysh_scan += $(top_srcdir)/pimd/pim_cmd.c
rstman8_DATA += $(MANBUILD)/pimd.8 man8 += $(MANBUILD)/pimd.8
rstman8_DATA += $(MANBUILD)/mtracebis.8 man8 += $(MANBUILD)/mtracebis.8
endif endif
pimd_libpim_a_SOURCES = \ pimd_libpim_a_SOURCES = \

2
ripd/subdir.am
View file

@ -17,7 +17,7 @@ vtysh_scan += \
if SNMP if SNMP
module_LTLIBRARIES += ripd/ripd_snmp.la module_LTLIBRARIES += ripd/ripd_snmp.la
endif endif
rstman8_DATA += $(MANBUILD)/ripd.8 man8 += $(MANBUILD)/ripd.8
endif endif
ripd_librip_a_SOURCES = \ ripd_librip_a_SOURCES = \

2
ripngd/subdir.am
View file

@ -12,7 +12,7 @@ vtysh_scan += \
$(top_srcdir)/ripngd/ripng_zebra.c \ $(top_srcdir)/ripngd/ripng_zebra.c \
$(top_srcdir)/ripngd/ripngd.c \ $(top_srcdir)/ripngd/ripngd.c \
# end # end
rstman8_DATA += $(MANBUILD)/ripngd.8 man8 += $(MANBUILD)/ripngd.8
endif endif
ripngd_libripng_a_SOURCES = \ ripngd_libripng_a_SOURCES = \

2
sharpd/subdir.am
View file

@ -7,7 +7,7 @@ noinst_LIBRARIES += sharpd/libsharp.a
sbin_PROGRAMS += sharpd/sharpd sbin_PROGRAMS += sharpd/sharpd
dist_examples_DATA += sharpd/sharpd.conf.sample dist_examples_DATA += sharpd/sharpd.conf.sample
vtysh_scan += $(top_srcdir)/sharpd/sharp_vty.c vtysh_scan += $(top_srcdir)/sharpd/sharp_vty.c
rstman8_DATA += $(MANBUILD)/sharpd.8 man8 += $(MANBUILD)/sharpd.8
endif endif
sharpd_libsharp_a_SOURCES = \ sharpd_libsharp_a_SOURCES = \

2
staticd/subdir.am
View file

@ -7,7 +7,7 @@ noinst_LIBRARIES += staticd/libstatic.a
sbin_PROGRAMS += staticd/staticd sbin_PROGRAMS += staticd/staticd
dist_examples_DATA += staticd/staticd.conf.sample dist_examples_DATA += staticd/staticd.conf.sample
vtysh_scan += $(top_srcdir)/staticd/static_vty.c vtysh_scan += $(top_srcdir)/staticd/static_vty.c
rstman8_DATA += $(MANBUILD)/staticd.8 man8 += $(MANBUILD)/staticd.8
endif endif
staticd_libstatic_a_SOURCES = \ staticd_libstatic_a_SOURCES = \

2
vtysh/subdir.am
View file

@ -5,7 +5,7 @@
if VTYSH if VTYSH
bin_PROGRAMS += vtysh/vtysh bin_PROGRAMS += vtysh/vtysh
dist_examples_DATA += vtysh/vtysh.conf.sample dist_examples_DATA += vtysh/vtysh.conf.sample
rstman1_DATA += $(MANBUILD)/vtysh.1 man1 += $(MANBUILD)/vtysh.1
endif endif
vtysh_vtysh_SOURCES = \ vtysh_vtysh_SOURCES = \

2
watchfrr/subdir.am
View file

@ -5,7 +5,7 @@
if WATCHFRR if WATCHFRR
sbin_PROGRAMS += watchfrr/watchfrr sbin_PROGRAMS += watchfrr/watchfrr
vtysh_scan += $(top_srcdir)/watchfrr/watchfrr_vty.c vtysh_scan += $(top_srcdir)/watchfrr/watchfrr_vty.c
rstman8_DATA += $(MANBUILD)/watchfrr.8 man8 += $(MANBUILD)/watchfrr.8
endif endif
noinst_HEADERS += \ noinst_HEADERS += \

2
zebra/subdir.am
View file

@ -32,7 +32,7 @@ if FPM
module_LTLIBRARIES += zebra/zebra_fpm.la module_LTLIBRARIES += zebra/zebra_fpm.la
endif endif
rstman8_DATA += $(MANBUILD)/zebra.8 man8 += $(MANBUILD)/zebra.8
## endif ZEBRA ## endif ZEBRA
endif endif