diff options
| author | Rob Austein <sra@hactrn.net> | 2007-08-01 14:31:29 +0000 |
|---|---|---|
| committer | Rob Austein <sra@hactrn.net> | 2007-08-01 14:31:29 +0000 |
| commit | 1833bd9e097a64d71cdcbba9f439762c0c83d6dc (patch) | |
| tree | d6d70a8cb0ec6fb2d50d05dc1e95f43d11583183 | |
| parent | f3a2d2f00d1a32316458125426071662b4156ed0 (diff) | |
Get Makefiles right
svn path=/scripts/Makefile; revision=805
| -rw-r--r-- | scripts/Makefile | 6 | ||||
| -rw-r--r-- | scripts/generate-testrepo.py | 11 |
2 files changed, 10 insertions, 7 deletions
diff --git a/scripts/Makefile b/scripts/Makefile index ab658040..19f2cf72 100644 --- a/scripts/Makefile +++ b/scripts/Makefile @@ -1,6 +1,6 @@ # $Id$ -all: left-right-protocol-samples/.stamp left-right-schema.rng up-down-medium-schema.rng up-down-schema.rng resource-cert-samples/.stamp +all: left-right-protocol-samples/.stamp left-right-schema.rng up-down-medium-schema.rng up-down-schema.rng resource-cert-samples-regen left-right-protocol-samples/.stamp: left-right-protocol-samples.xsl ../docs/left-right-xml xsltproc left-right-protocol-samples.xsl ../docs/left-right-xml @@ -25,7 +25,9 @@ relaxng: left-right-protocol-samples/.stamp xmllint --noout --relaxng left-right-schema.rng left-right-protocol-samples/*.xml xmllint --noout --relaxng up-down-schema.rng up-down-protocol-samples/*.xml +resource-cert-samples-regen: resource-cert-samples/.stamp + cd resource-cert-samples && make + resource-cert-samples/.stamp: generate-testrepo.py Makefile python generate-testrepo.py - cd resource-cert-samples && make touch $@ diff --git a/scripts/generate-testrepo.py b/scripts/generate-testrepo.py index ab5296d3..3ef19324 100644 --- a/scripts/generate-testrepo.py +++ b/scripts/generate-testrepo.py @@ -8,7 +8,8 @@ keybits = 2048 def main(): """ - Main program, up front to make it easier to find. + Main program, up front to make it easier to find with all the + OpenSSL config and Makefile template text. """ db = allocation_db() @@ -114,10 +115,10 @@ all:: %(self)s.cer %(openssl)s req -new -config %(self)s.cnf -key %(self)s.key -out $@ %(self)s.cer: %(self)s.req %(self)s.cnf %(signdeps)s Makefile - test -d %(self)s || mkdir %(self)s - test -f %(self)s/index || touch %(self)s/index - test -f %(self)s/serial || echo 01 >%(self)s/serial - %(openssl)s ca -batch -verbose -notext -out $@ -in %(self)s.req -extensions req_x509_ext -extfile %(self)s.cnf -config %(signconf)s + @test -d %(self)s || mkdir %(self)s + @test -f %(self)s/index || touch %(self)s/index + @test -f %(self)s/serial || echo 01 >%(self)s/serial + %(openssl)s ca -batch -out $@ -in %(self)s.req -extensions req_x509_ext -extfile %(self)s.cnf -config %(signconf)s ''' |