aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--rpkid/Makefile22
-rw-r--r--rpkid/tests/Makefile4
2 files changed, 7 insertions, 19 deletions
diff --git a/rpkid/Makefile b/rpkid/Makefile
index 177aae79..c6fe9e63 100644
--- a/rpkid/Makefile
+++ b/rpkid/Makefile
@@ -1,29 +1,23 @@
# $Id$
-all:: left-right-schema.rng
+all: rpki/relaxng.py
-rpki/relaxng.py: left-right-schema.rng
+rpki/relaxng.py: make-relaxng.py left-right-schema.rng up-down-schema.rng publication-schema.rng
+ python make-relaxng.py >$@.tmp
+ mv $@.tmp $@
left-right-schema.rng: left-right-schema.rnc
trang left-right-schema.rnc left-right-schema.rng
-all:: up-down-schema.rng
-
-rpki/relaxng.py: up-down-schema.rng
-
up-down-schema.rng: up-down-schema.rnc
trang up-down-schema.rnc up-down-schema.rng
-all:: publication-schema.rng
-
-rpki/relaxng.py: publication-schema.rng
-
publication-schema.rng: publication-schema.rnc
trang publication-schema.rnc publication-schema.rng
clean:
find . -type f -name '*.pyc' -delete
- rm -rf testbed.dir
+ cd tests; $(MAKE) $@
install:
@true
@@ -54,12 +48,6 @@ irbe_cli.usage: irbe_cli.py
tags:
find . -type f \( -name '*.py' -o -name '*.sql' -o -name '*.rnc' \) ! -name relaxng.py | etags -
-all:: rpki/relaxng.py
-
-rpki/relaxng.py: make-relaxng.py
- python make-relaxng.py >$@.tmp
- mv $@.tmp $@
-
# Documentation
doc/irdbd.dot: irdbd.sql
diff --git a/rpkid/tests/Makefile b/rpkid/tests/Makefile
index 1591e28e..bca78c3c 100644
--- a/rpkid/tests/Makefile
+++ b/rpkid/tests/Makefile
@@ -10,13 +10,13 @@ protocol-samples: left-right-protocol-samples/.stamp publication-protocol-sample
left-right-protocol-samples/.stamp: left-right-protocol-samples.xml split-protocol-samples.xsl
rm -rf left-right-protocol-samples
mkdir left-right-protocol-samples
- xsltproc --stringparam dir left-right-protocol-samples split-protocol-samples.xsl left-right-protocol-samples.xml
+ xsltproc --param verbose 0 --stringparam dir left-right-protocol-samples split-protocol-samples.xsl left-right-protocol-samples.xml
touch $@
publication-protocol-samples/.stamp: publication-protocol-samples.xml split-protocol-samples.xsl
rm -rf publication-protocol-samples
mkdir publication-protocol-samples
- xsltproc --stringparam dir publication-protocol-samples split-protocol-samples.xsl publication-protocol-samples.xml
+ xsltproc --param verbose 0 --stringparam dir publication-protocol-samples split-protocol-samples.xsl publication-protocol-samples.xml
touch $@
parse-test: protocol-samples