X-Git-Url: http://lists.indexdata.com/cgi-bin?a=blobdiff_plain;f=etc%2FMakefile.am;h=fa62b18daaecd62acb22796729c8678d060519b0;hb=a8f363a4b0d94a46640144e2d521c070f61e5b6e;hp=ea834d2d6653b8b06fc735e231d2684e77e0a20a;hpb=97ff1dba50219020e4e75b0fd2a2adf57ffb4579;p=metaproxy-moved-to-github.git diff --git a/etc/Makefile.am b/etc/Makefile.am index ea834d2..fa62b18 100644 --- a/etc/Makefile.am +++ b/etc/Makefile.am @@ -1,4 +1,3 @@ -# $Id: Makefile.am,v 1.6 2006-10-11 13:21:51 marc Exp $ # This doesn't actually build anything, it just tests whether the # configuration files here correspond with the schema. @@ -7,19 +6,22 @@ etcdatadir = $(pkgdatadir)/etc xmlconfig = $(srcdir)/config-bytarget.xml \ $(srcdir)/config-local.xml \ + $(srcdir)/config-load-balance.xml \ $(srcdir)/config-record-transform.xml \ $(srcdir)/config-shared1.xml \ $(srcdir)/config-simple-multi.xml \ $(srcdir)/config-sru-to-z3950.xml \ + $(srcdir)/config-sru-holdings.xml \ $(srcdir)/config-zurg.xml \ $(srcdir)/config0.xml \ $(srcdir)/config1.xml \ $(srcdir)/config2.xml \ $(srcdir)/config3.xml \ $(srcdir)/config4.xml \ - $(srcdir)/config5.xml + $(srcdir)/config5.xml \ + $(srcdir)/retrieval-info.xml -config = example.simple-auth example.target-auth pqf2pqf.xsl +config = example.simple-auth example.target-auth pqf2pqf.xsl explain.xml rng = $(srcdir)/../xml/schema/metaproxy.rng @@ -31,15 +33,14 @@ EXTRA_DIST = $(etcdata_DATA) .PHONY: check_rng check_rng: - xmllint --noout --relaxng $(rng) $(xmlconfig) + xmllint --noout --xinclude --relaxng $(rng) $(xmlconfig) +## Only run XSD checks for a "new" Libxml2 .PHONY: check_xsd check_xsd: - xmllint --noout --schema $(xsd) $(xmlconfig) + if test `xmllint --version 2>&1 |head -1|awk '{print $$5}'` -gt 20622; then xmllint --noout --xinclude --schema $(xsd) $(xmlconfig); fi - -check-local: - $(MAKE) check_xsd - $(MAKE) check_rng +#check-local: check_rng check_xsd +check-local: check_rng