Make it possible to build the docs subdirectory entirely separately

This allows a web page builder to generate the quick stuff with very
little delay and build the documentation in a separate and obviously
slower process.

Reviewed-by: Tomas Mraz <tomas@openssl.org>
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/web/pull/315)

diff --git a/Makefile b/Makefile
index fba3f50a837669736d5b7d817893f3af352258e4..b3af49a324599675ab61d43022675a3f4ac1b11b 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -56,11 +56,6 @@ FUTURESERIES=
 SIMPLE = newsflash.inc \
         community/committers.inc community/otc.inc \
         community/omc.inc community/omc-alumni.inc \
-        docs/faq.inc docs/fips.inc \
-        docs/OpenSSLStrategicArchitecture.html \
-        docs/OpenSSL300Design.html \
-        docs/manpages.html \
-        docs/mansidebar.html \
         roadmap.html \
          news/changelog.html \
         $(foreach S,$(SERIES),news/openssl-$(S)-notes.inc) \
@@ -75,6 +70,11 @@ SIMPLE = newsflash.inc \
         source/old/index.html
 SRCLISTS = $(foreach S,$(FUTURESERIES) $(SERIES) $(OLDSERIES2) fips,source/old/$(S)/index.inc source/old/$(S)/index.html)
 
+SIMPLEDOCS = docs/faq.inc docs/fips.inc \
+            docs/OpenSSLStrategicArchitecture.html \
+            docs/OpenSSL300Design.html \
+            docs/manpages.html \
+            docs/mansidebar.html
 
 .SUFFIXES: .md .html
 
@@ -82,14 +82,18 @@ SRCLISTS = $(foreach S,$(FUTURESERIES) $(SERIES) $(OLDSERIES2) fips,source/old/$
        @rm -f $@
        ./bin/md-to-html5 $<
 
-all: suball manmaster mancross sitemap akamai-purge
+all: suball subdocs manmaster mancross sitemap akamai-purge
 
 suball: $(SIMPLE) $(SRCLISTS)
 
-relupd: suball manpages mancross sitemap akamai-purge
+relupd: suball docs sitemap akamai-purge
+
+docs: subdocs manpages mancross
+
+subdocs: $(SIMPLEDOCS)
 
 clean:
-       rm -f $(SIMPLE) $(SRCLISTS)
+       rm -f $(SIMPLE) $(SIMPLEDOCS) $(SRCLISTS)
 
 akamai-purge:
        ./bin/purge-one-hour
@@ -205,6 +209,13 @@ docs/mansidebar.html: docs/mansidebar.html.tt Makefile bin/from-tt
        @rm -f $@
        ./bin/from-tt releases='master $(MANSERIES)' $<
 
+docs/faq.inc: $(wildcard docs/faq-[0-9]-*.txt) bin/mk-faq
+       @rm -f $@
+       ./bin/mk-faq docs/faq-[0-9]-*txt >$@
+docs/fips.inc: $(wildcard docs/fips/*) bin/mk-filelist
+       @rm -f $@
+       ./bin/mk-filelist docs/fips fips/ '*' >$@
+
 ######################################################################
 ##
 ##  $(SIMPLE) -- SIMPLE GENERATED FILES
@@ -230,13 +241,6 @@ community/omc.inc: $(PERSONDB)
 community/omc-alumni.inc: $(PERSONDB)
        ./bin/mk-omc -n -l -t 'OMC Alumni' omc-alumni omc-emeritus > $@
 
-docs/faq.inc: $(wildcard docs/faq-[0-9]-*.txt) bin/mk-faq
-       @rm -f $@
-       ./bin/mk-faq docs/faq-[0-9]-*txt >$@
-docs/fips.inc: $(wildcard docs/fips/*) bin/mk-filelist
-       @rm -f $@
-       ./bin/mk-filelist docs/fips fips/ '*' >$@
-
 news/changelog.inc: news/changelog.md bin/mk-changelog
        @rm -f $@
        (echo 'Table of contents'; sed -e '1,/^OpenSSL Releases$$/d' < $<) \