diff --git a/doc/Makefile.am b/doc/Makefile.am index 19561c031d..79c0a493a5 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -140,7 +140,7 @@ EXTRA_DIST = frr-sphinx.mk \ manpages/index.rst \ manpages/isisd.rst \ manpages/ldpd.rst \ - manpages/Makefile \ + manpages/Makefile.am \ manpages/mtracebis.rst \ manpages/nhrpd.rst \ manpages/ospf6d.rst \ @@ -182,7 +182,7 @@ EXTRA_DIST = frr-sphinx.mk \ developer/index.rst \ developer/ldpd-basic-test-setup.md \ developer/library.rst \ - developer/Makefile \ + developer/Makefile.in \ developer/memtypes.rst \ developer/modules.rst \ developer/next-hop-tracking.rst \ @@ -205,7 +205,7 @@ EXTRA_DIST = frr-sphinx.mk \ user/ipv6.rst \ user/isisd.rst \ user/kernel.rst \ - user/Makefile \ + user/Makefile.am \ user/nhrpd.rst \ user/ospf6d.rst \ user/ospfd.rst \ diff --git a/doc/developer/.gitignore b/doc/developer/.gitignore index 2e7d8573f1..81c60dc0a3 100644 --- a/doc/developer/.gitignore +++ b/doc/developer/.gitignore @@ -1,3 +1,2 @@ /_templates /_build -!/Makefile.in diff --git a/doc/developer/Makefile.in b/doc/developer/Makefile.am similarity index 100% rename from doc/developer/Makefile.in rename to doc/developer/Makefile.am diff --git a/doc/manpages/.gitignore b/doc/manpages/.gitignore index 2e7d8573f1..81c60dc0a3 100644 --- a/doc/manpages/.gitignore +++ b/doc/manpages/.gitignore @@ -1,3 +1,2 @@ /_templates /_build -!/Makefile.in diff --git a/doc/manpages/Makefile.in b/doc/manpages/Makefile.am similarity index 78% rename from doc/manpages/Makefile.in rename to doc/manpages/Makefile.am index f28746cee6..009c723823 100644 --- a/doc/manpages/Makefile.in +++ b/doc/manpages/Makefile.am @@ -34,11 +34,6 @@ include @srcdir@/../frr-sphinx.mk # tags # ctags -# ignore these targets -EMPTY_AUTOMAKE_TARGETS = dvi pdf ps tags ctags distdir installdirs check installcheck install-dvi install-ps install-html install-pdf install-info install-exec -.PHONY: $(EMPTY_AUTOMAKE_TARGETS) -$(EMPTY_AUTOMAKE_TARGETS): - # These targets are automatically generated by Sphinx but conflict with # implicitly defined Automake rules, so we manually override them to nothing. # The other option is deleting the Sphinx-generated rules, which suppresses the @@ -51,5 +46,3 @@ all: man install-data: man install: install-data - -mostlyclean distclean maintainer-clean: clean diff --git a/doc/user/.gitignore b/doc/user/.gitignore index 2e7d8573f1..81c60dc0a3 100644 --- a/doc/user/.gitignore +++ b/doc/user/.gitignore @@ -1,3 +1,2 @@ /_templates /_build -!/Makefile.in diff --git a/doc/user/Makefile.in b/doc/user/Makefile.am similarity index 82% rename from doc/user/Makefile.in rename to doc/user/Makefile.am index 77c6abf917..64af2ff145 100644 --- a/doc/user/Makefile.in +++ b/doc/user/Makefile.am @@ -34,11 +34,6 @@ include @srcdir@/../frr-sphinx.mk # tags # ctags -# ignore these targets -EMPTY_AUTOMAKE_TARGETS = dvi ps tags ctags distdir install-exec install-dvi install-ps installdirs check installcheck install-html install-pdf install-data install -.PHONY: $(EMPTY_AUTOMAKE_TARGETS) -$(EMPTY_AUTOMAKE_TARGETS): - # When building 'all', the logic is that we want to make docs that are easily # readable by the person that just built them. Technically the reST source is # readable in its own right, but we'll also build info and html because those @@ -58,5 +53,3 @@ install-info: info install-data: install-info install: install-data - -mostlyclean distclean maintainer-clean: clean