[openssl-commits] [web] master update

[Rich Salz]

The branch master has been updated
       via  955458532940646f6f124f4e2c9f02fe818835c6 (commit)
      from  254c281f03f4a088a4831469ad9edc81a756440b (commit)


- Log -----------------------------------------------------------------
commit 955458532940646f6f124f4e2c9f02fe818835c6
Author: Rich Salz <rsalz at akamai.com>
Date:   Thu Feb 19 13:17:07 2015 -0500

    Separate simple and generated targets
    
    simple, generated, manpages no longer have any interdependencies.
    all does generated/simple/manpages.
    udpate relupd actions to explicitly do generated/simple

-----------------------------------------------------------------------

Summary of changes:
 Makefile |   18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/Makefile b/Makefile
index 404248c..b6cd0e1 100644
--- a/Makefile
+++ b/Makefile
@@ -13,13 +13,7 @@ QUIET=--quiet
 
 DIRS= about docs news source support
 
-all: simple manpages
-
-simple: generated
-	wmk $(FORCE) -I $(SNAP) -a $(DIRS) index.wml
-
-manpages:
-	sh ./run-pod2html.sh $(PODSHOME)
+all: generated simple manpages
 
 generated:
 	cp -f $(SNAP)/LICENSE source/license.inc
@@ -29,6 +23,12 @@ generated:
 	perl run-fundingfaq.pl < support/funding/support-faq.txt >support/funding/support-faq.inc
 	( cd news && xsltproc vulnerabilities.xsl vulnerabilities.xml > vulnerabilities.wml )
 
+simple:
+	wmk $(FORCE) -I $(SNAP) -a $(DIRS) index.wml
+
+manpages:
+	sh ./run-pod2html.sh $(PODSHOME)
+
 # Update release notes (and other items, but relnotes is the use-case)
 relupd:
 	id | grep -q root || { echo you must sudo ; exit 1; }
@@ -36,6 +36,4 @@ relupd:
 		echo Updating $$dir ; cd $$dir ; sudo -u openssl git pull $(QUIET) ; cd .. ; \
 		done )
 	sudo -u www-data git pull $(QUIET)
-	sudo -u www-data $(MAKE) simple
-
-
+	sudo -u www-data $(MAKE) generated simple