1 files changed, 32 insertions, 10 deletions
diff --git a/ca/tests/Makefile.in b/ca/tests/Makefile.in
index 9796dd2b..eb4357b1 100644
--- a/ca/tests/Makefile.in
+++ b/ca/tests/Makefile.in
@@ -3,12 +3,11 @@
 PYTHON = @PYTHON@
 abs_top_builddir = @abs_top_builddir@
 
-all: protocol-samples
+all:
+	@true
 
 clean:
-	rm -rf smoketest.dir left-right-protocol-samples publication-protocol-samples yamltest.dir rcynic.xml rcynic-data
-
-protocol-samples: left-right-protocol-samples/.stamp publication-protocol-samples/.stamp
+	rm -rf smoketest.dir left-right-protocol-samples publication-protocol-samples publication-control-protocol-samples rrdp-samples yamltest.dir rcynic.xml rcynic-data
 
 left-right-protocol-samples/.stamp: left-right-protocol-samples.xml split-protocol-samples.xsl 
 	rm -rf left-right-protocol-samples
@@ -16,20 +15,44 @@ left-right-protocol-samples/.stamp: left-right-protocol-samples.xml split-protoc
 	xsltproc --param verbose 0 --stringparam dir left-right-protocol-samples split-protocol-samples.xsl left-right-protocol-samples.xml
 	touch $@
 
+left-right-relaxng: left-right-protocol-samples/.stamp
+	xmllint --noout --relaxng ../../schemas/relaxng/left-right.rng  left-right-protocol-samples/*.xml
+
 publication-protocol-samples/.stamp: publication-protocol-samples.xml split-protocol-samples.xsl 
 	rm -rf publication-protocol-samples
 	mkdir  publication-protocol-samples
 	xsltproc --param verbose 0 --stringparam dir publication-protocol-samples split-protocol-samples.xsl publication-protocol-samples.xml
 	touch $@
 
-relaxng: protocol-samples
-	xmllint --noout --relaxng ../../schemas/relaxng/left-right-schema.rng  left-right-protocol-samples/*.xml
-	xmllint --noout --relaxng ../../schemas/relaxng/up-down-schema.rng     up-down-protocol-samples/*.xml
-	xmllint --noout --relaxng ../../schemas/relaxng/publication-schema.rng publication-protocol-samples/*.xml
+publication-relaxng: publication-protocol-samples/.stamp
+	xmllint --noout --relaxng ../../schemas/relaxng/publication.rng publication-protocol-samples/*.xml
+
+publication-control-protocol-samples/.stamp: publication-control-protocol-samples.xml split-protocol-samples.xsl 
+	rm -rf publication-control-protocol-samples
+	mkdir  publication-control-protocol-samples
+	xsltproc --param verbose 0 --stringparam dir publication-control-protocol-samples split-protocol-samples.xsl publication-control-protocol-samples.xml
+	touch $@
+
+publication-control-relaxng: publication-control-protocol-samples/.stamp
+	xmllint --noout --relaxng ../../schemas/relaxng/publication-control.rng publication-control-protocol-samples/*.xml
+
+rrdp-samples/.stamp: rrdp-samples.xml split-protocol-samples.xsl 
+	rm -rf rrdp-samples
+	mkdir  rrdp-samples
+	xsltproc --param verbose 0 --stringparam dir rrdp-samples split-protocol-samples.xsl rrdp-samples.xml
+	touch $@
+
+rrdp-relaxng: rrdp-samples/.stamp
+	xmllint --noout --relaxng ../../schemas/relaxng/rrdp.rng rrdp-samples/*.xml
+
+up-down-relaxng:
+	xmllint --noout --relaxng ../../schemas/relaxng/up-down.rng up-down-protocol-samples/*.xml
+
+relaxng: up-down-relaxng left-right-relaxng publication-relaxng publication-control-relaxng rrdp-relaxng
 
 all-tests:: relaxng
 
-parse-test: protocol-samples
+parse-test: left-right-protocol-samples publication-protocol-samples publication-control-protocol-samples
 	${PYTHON} xml-parse-test.py
 
 all-tests:: parse-test
@@ -67,7 +90,6 @@ YAMLTEST_CONFIG = smoketest.1.yaml
 
 yamltest:
 	rm -rf yamltest.dir rcynic-data
-	${PYTHON} sql-cleaner.py
 	${PYTHON} yamltest.py ${YAMLTEST_CONFIG}
 
 YAMLCONF_CONFIG = ${YAMLTEST_CONFIG}