diff options
| author | David Lamparter <equinox@opensourcerouting.org> | 2017-08-04 10:36:34 +0200 |
|---|---|---|
| committer | David Lamparter <equinox@opensourcerouting.org> | 2017-08-04 11:13:55 +0200 |
| commit | 70d27c5b7decb53c27543a0d58f7cd1dcda3ba44 (patch) | |
| tree | d208609474bac2200bbb3df2d0c82ca658a24445 /doc | |
| parent | build: pre-generate built headers in configure (diff) | |
| download | frr-70d27c5b7decb53c27543a0d58f7cd1dcda3ba44.tar.xz frr-70d27c5b7decb53c27543a0d58f7cd1dcda3ba44.zip | |
build: clean up BUILT_SOURCES
BUILT_SOURCES doesn't do what the name suggests. What it actually means
is "these files should be built first when doing a 'make' without
explicit target" (or "make all").
It's pretty much almost always wrong to use BUILT_SOURCES, the only
correct use is when a file is needed by an unspecified / large set of
files.
Also remove version.h and route_types.h from dist tarball while we're at
it. configure will create them anyway.
Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/Makefile.am | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/doc/Makefile.am b/doc/Makefile.am index b2bdf91cd..47e87c7b9 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -45,18 +45,20 @@ figures_txt = $(figures_names_parts:%=fig%.txt) # provided by automake. If you are an automake wizard, please feel free to # compact it somehow. -# Built from defines.texi.in -BUILT_SOURCES = defines.texi - info_TEXINFOS = frr.texi # Have to manually specify the frr.pdf rule in order to allow # us to have a generic automatic .pdf rule to build the figure sources # because it cant just work from the png's directly it seems - contrary # to the documentation... -frr.pdf: $(info_TEXINFOS) $(figures_pdf) $(frr_TEXINFOS) +frr.pdf: $(info_TEXINFOS) $(figures_pdf) $(frr_TEXINFOS) defines.texi $(TEXI2PDF) -o "$@" $< || true +# don't ask me why the info file is in srcdir +$(srcdir)/frr.info: defines.texi +frr.dvi: defines.texi +frr.html: defines.texi + frr_TEXINFOS = appendix.texi basic.texi bgpd.texi isisd.texi filter.texi \ vnc.texi \ babeld.texi \ @@ -65,7 +67,7 @@ frr_TEXINFOS = appendix.texi basic.texi bgpd.texi isisd.texi filter.texi \ eigrpd.texi \ ospf6d.texi ospfd.texi \ overview.texi protocol.texi ripd.texi ripngd.texi routemap.texi \ - snmp.texi vtysh.texi routeserver.texi defines.texi $(figures_png) \ + snmp.texi vtysh.texi routeserver.texi $(figures_png) \ snmptrap.texi ospf_fundamentals.texi isisd.texi $(figures_txt) .png.eps: |