Makefile improved

diff --git a/helm/matita/library/Makefile b/helm/matita/library/Makefile
index 4df43ba60c5a19e22bbeb8ca0ce2ef44c39748ec..24417790f316abc37e555606571555665c14b4bb 100644 (file)
--- a/helm/matita/library/Makefile
+++ b/helm/matita/library/Makefile
@@ -1,23 +1,30 @@
-TODO=\
-       bool.moo\
-       compare.moo\
-       equality.moo\
-       logic.moo\
-       nat.moo \
-        Z.moo
+SRC=\
+       bool.ma\
+       compare.ma\
+       equality.ma\
+       logic.ma\
+       nat.ma \
+        Z.ma
 
 DEPEND_NAME=.depend
+LINKS=.matita matita.lang matita.conf.xml
 
-all: links $(TODO)
+all: $(LINKS) $(SRC:%.ma=%.moo)
 
-clean:
-       rm -f $(DEPEND_NAME) $(TODO) 
+clean: $(LINKS)
+       rm -f $(SRC:%.ma=%.moo)
        ../matitaclean all
 
-# Let's prepare the environment
-links: .matita matita.lang matita.conf.xml
-.PHONY: links
+depend: $(DEPEND_NAME)
 
+%.moo:%.ma depend $(LINKS)
+       [ ! -e $@ ] || ../matitaclean $< 
+       ../matitac $< || ../matitaclean $<
+
+$(DEPEND_NAME): $(SRC) $(LINKS)
+       ../matitadep $(SRC) > $@
+
+# Let's prepare the environment
 .matita:
        ln -s ../.matita .
 
@@ -28,13 +35,4 @@ matita.conf.xml:
        ln -s ../matita.conf.xml .
 #done
 
-depend: $(DEPEND_NAME)
-
-%.moo:%.ma
-       [ ! -e $@ ] || ../matitaclean $< 
-       ../matitac $< || ../matitaclean $<
-
-$(DEPEND_NAME): $(TODO:%.moo=%.ma)
-       ../matitadep $^ > $@
-
 include $(DEPEND_NAME)