X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=matita%2Fmatita%2Fcontribs%2Flambdadelta%2FMakefile;h=59cf50f6ed6899fb0ffe73222eb60fd33dbfd071;hb=6b4da5fa47d474dcf2f203ec7f5ed36938739c9b;hp=ff89218d28f0967256f588ef11c30af77296cb02;hpb=4738096e93f997fb36d35dd723b87682a2f6de90;p=helm.git

diff --git a/matita/matita/contribs/lambdadelta/Makefile b/matita/matita/contribs/lambdadelta/Makefile
index ff89218d2..59cf50f6e 100644
--- a/matita/matita/contribs/lambdadelta/Makefile
+++ b/matita/matita/contribs/lambdadelta/Makefile
@@ -11,7 +11,6 @@ XOA          := xoa.native
 XOA_OPTS     := ../../matita.conf.xml $(XOA_CONF)
 
 XOA2_CONF    := ground_2/xoa2.conf.xml
-XOA2_TARGETS := ground_2/notation/xoa/notation2.ma ground_2/xoa/xoa2.ma
 XOA2_OPTS    := ../../matita.conf.xml $(XOA2_CONF)
 
 DEP_INPUT    := .depend
@@ -28,10 +27,13 @@ ORIGS        := basic_2/basic_1.orig
 
 CONTRIB      := lambdadelta_2
 
-TAGS := all xoa xoa2 orig elim deps top leaf stats tbls trim contrib clean
+WWW          := ../../../../helm/www/lambdadelta
 
-PACKAGES  := ground_2 basic_2 apps_2 alpha_1
-XPACKAGES := ground_2 basic_2
+TAGS := all xoa xoa2 orig elim deps top leaf stats tbls trim contrib clean \
+        www up-html
+
+PACKAGES  := ground_2 static_2 basic_2 apps_2 alpha_1
+XPACKAGES := ground_2 static_2 basic_2
 
 LDWS := $(shell find -name "*.ldw.xml")
 TBLS := $(shell find -name "*.tbl")
@@ -67,15 +69,13 @@ xoa: $(XOA_TARGETS)
 
 $(XOA_TARGETS): $(XOA_CONF)
 	@echo "  EXEC $(XOA) $(XOA_CONF)"
-	$(H)MATITA_RT_BASE_DIR=../.. $(XOA_DIR)/$(XOA) $(XOA_OPTS)
+	$(H)$(XOA_DIR)/$(XOA) $(XOA_OPTS)
 
 # xoa2 #######################################################################
 
-xoa2: $(XOA2_TARGETS)
-
-$(XOA2_TARGETS): $(XOA2_CONF)
+xoa2: $(XOA2_CONF)
 	@echo "  EXEC $(XOA) $(XOA2_CONF)"
-	$(H)MATITA_RT_BASE_DIR=../.. $(XOA_DIR)/$(XOA) $(XOA2_OPTS)
+	$(H)MATITA_RT_BASE_DIR=../.. $(XOA_DIR)/$(XOA) -s $(XOA2_OPTS)
 
 # elim #######################################################################
 
@@ -95,7 +95,7 @@ $(DEP_INPUT): LINE = $(MAS:%=%:include \"\".)
 
 $(DEP_INPUT): $(MAS) Makefile
 	@echo "  GREP include"
-	$(H)grep "include \"" $^ > $(DEP_INPUT)
+	$(H)grep "include \"" $(MAS) > $(DEP_INPUT)
 	$(H)echo "$(LINE)" | sed -e 's/\"\. /\"\.\n/g' >> $(DEP_INPUT) 
 
 # dep ########################################################################
@@ -257,7 +257,17 @@ contrib:
 # clean ######################################################################
 
 clean:
-	@$(RM) `find -name "*~" -type f -print`
+	$(H)$(RM) `find -name "*~" -type f -print`
+
+# www ######################################################################
+
+www:
+	$(H)$(MAKE) --no-print-directory -C $(WWW) www
+
+# www ######################################################################
+
+up-html:
+	$(H)$(MAKE) --no-print-directory -C $(WWW) up-html
 
 ##############################################################################