lint target improved

diff --git a/helm/software/lambda-delta/.depend.opt b/helm/software/lambda-delta/.depend.opt
index ce9d23e2be970e710ae5f3a9e1387028f3086fb5..5c92d5ccdfca3a2e1fa5b7c97078d50c03fece6e 100644 (file)
--- a/helm/software/lambda-delta/.depend.opt
+++ b/helm/software/lambda-delta/.depend.opt
@@ -1,17 +1,9 @@
-lib/nUri.cmi: 
 lib/nUri.cmo: lib/nUri.cmi 
 lib/nUri.cmx: lib/nUri.cmi 
-lib/cps.cmo: 
-lib/cps.cmx: 
-lib/share.cmo: 
-lib/share.cmx: 
-lib/log.cmi: 
 lib/log.cmo: lib/cps.cmx lib/log.cmi 
 lib/log.cmx: lib/cps.cmx lib/log.cmi 
 lib/time.cmo: lib/log.cmi 
 lib/time.cmx: lib/log.cmx 
-automath/aut.cmo: 
-automath/aut.cmx: 
 automath/autProcess.cmi: automath/aut.cmx 
 automath/autProcess.cmo: automath/aut.cmx automath/autProcess.cmi 
 automath/autProcess.cmx: automath/aut.cmx automath/autProcess.cmi 
@@ -25,10 +17,8 @@ automath/autParser.cmo: automath/aut.cmx automath/autParser.cmi
 automath/autParser.cmx: automath/aut.cmx automath/autParser.cmi 
 automath/autLexer.cmo: lib/log.cmi automath/autParser.cmi 
 automath/autLexer.cmx: lib/log.cmx automath/autParser.cmx 
-common/hierarchy.cmi: 
 common/hierarchy.cmo: lib/cps.cmx common/hierarchy.cmi 
 common/hierarchy.cmx: lib/cps.cmx common/hierarchy.cmi 
-common/output.cmi: 
 common/output.cmo: lib/log.cmi common/output.cmi 
 common/output.cmx: lib/log.cmx common/output.cmi 
 common/item.cmo: lib/nUri.cmi automath/aut.cmx 

diff --git a/helm/software/lambda-delta/Makefile b/helm/software/lambda-delta/Makefile
index e33ec50e3881bfd8f75da916c0318949e37a9a27..31b7b13b34b5e5a0ee993a89747d8cd22e80e005 100644 (file)
--- a/helm/software/lambda-delta/Makefile
+++ b/helm/software/lambda-delta/Makefile
@@ -8,16 +8,14 @@ CLEAN = log.txt
 
 TAGS = test test-si test-si-fast hal xml-si
 
+XMLS = xml/grundlagen/l/not.ld.xml xml/grundlagen/l/con.ld.xml
+
 include Makefile.common
 
 INPUT = automath/grundlagen.aut
 
 INPUT-ORIG = automath/grundlagen-orig.aut
 
-XMLDIR = xml
-
-XMLLINT = xmllint --noout --stream --valid
-
 test: $(MAIN).opt
        @echo "  HELENA -a -c $(INPUT)"
        $(H)./$(MAIN).opt -a -c -S 3 $(O) $(INPUT) > log.txt
@@ -37,7 +35,3 @@ hal: $(MAIN).opt
 xml-si: $(MAIN).opt
        @echo "  HELENA -u -x $(INPUT)"
        $(H)./$(MAIN).opt -u -x -s 2 -S 1 $(INPUT) > log.txt
-
-lint: $(XMLS)
-       @echo XMLLINT --valid $(XMLDIR)/*.ld.xml
-       $(XMLLINT) --path $(XMLDIR) `find -name *.ld.xml`

diff --git a/helm/software/lambda-delta/Makefile.common b/helm/software/lambda-delta/Makefile.common
index 7b8d0c3c304301991a21cc20f9f52f6ec0f74d6f..1af0e3abbd6ca9232e385809898b6ecf026aa74d 100644 (file)
--- a/helm/software/lambda-delta/Makefile.common
+++ b/helm/software/lambda-delta/Makefile.common
@@ -8,6 +8,7 @@ OCAMLDEP  = ocamlfind ocamldep -native $(INCLUDES)
 OCAMLOPT  = ocamlfind opt -linkpkg -package "$(REQUIRES)" $(INCLUDES)
 OCAMLLEX  = ocamllex.opt
 OCAMLYACC = ocamlyacc -v
+XMLLINT   = xmllint --noout
 TAR       = tar -czf $(MAIN:%=%.tgz)
 
 define DIR_TEMPLATE
@@ -54,6 +55,10 @@ clean:
        @echo "  CLEAN . $(DIRECTORIES)"
        $(H)find -name "*~" | xargs $(RM) $(CLEAN)
 
+lint: $(XMLS)
+       @echo XMLLINT --valid
+       $(H)$(XMLLINT) --valid $^ 
+
 tgz: clean
        @echo "  TAR -czf $(MAIN:%=%.tgz) . $(DIRECTORIES)" 
        $(H)find -name "Make*" | xargs $(TAR) $(KEEP)