update in ground_2

[helm.git] / matita / matita / contribs / lambdadelta / Makefile

diff --git a/matita/matita/contribs/lambdadelta/Makefile b/matita/matita/contribs/lambdadelta/Makefile
index 3e0228cb086305ca98911fea26b7ec66d432698f..34dd97cd5d86a80ed0c893874ed90962c3603037 100644 (file)
--- a/matita/matita/contribs/lambdadelta/Makefile
+++ b/matita/matita/contribs/lambdadelta/Makefile
@@ -3,16 +3,11 @@ H    := @
 
 TRIM := sed "s/ \\+$$//"
 
-XOA_CONF     := ground_2/xoa.conf.xml
-XOA_TARGETS  := ground_2/notation/xoa/notation.ma ground_2/xoa/xoa.ma
-
 XOA_DIR      := ../../../components/binaries/xoa
 XOA          := xoa.native
+XOA_CONF     := ground_2/xoa.conf.xml
 XOA_OPTS     := ../../matita.conf.xml $(XOA_CONF)
 
-XOA2_CONF    := ground_2/xoa2.conf.xml
-XOA2_OPTS    := ../../matita.conf.xml $(XOA2_CONF)
-
 DEP_INPUT    := .depend
 DEP_DIR      := ../../../components/binaries/matitadep
 DEP          := matitadep.native
@@ -25,12 +20,12 @@ PRB_OPTS     := $(XOA_OPTS) -g -i
 ORIG         := . ./orig.sh 
 ORIGS        := basic_2/basic_1.orig
 
-CONTRIB      := lambdadelta_2
+CONTRIB      := lambdadelta_2B
 
 WWW          := ../../../../helm/www/lambdadelta
 
-TAGS := all xoa xoa2 orig elim deps top leaf stats tbls odeps trim contrib clean \
-        www up-html
+TAGS := all xoa orig elim deps top leaf stats tbls odeps trim contrib clean \
+        home up-home
 
 PACKAGES  := ground_2 static_2 basic_2 apps_2 alpha_1
 XPACKAGES := ground_2 static_2 basic_2
@@ -70,17 +65,9 @@ $(foreach PKG, $(XPACKAGES), $(eval $(call XMAS_TEMPLATE,$(PKG))))
 
 # xoa ########################################################################
 
-xoa: $(XOA_TARGETS)
-
-$(XOA_TARGETS): $(XOA_CONF)
+xoa: $(XOA_CONF)
        @echo "  EXEC $(XOA) $(XOA_CONF)"
-       $(H)$(XOA_DIR)/$(XOA) $(XOA_OPTS)
-
-# xoa2 #######################################################################
-
-xoa2: $(XOA2_CONF)
-       @echo "  EXEC $(XOA) $(XOA2_CONF)"
-       $(H)MATITA_RT_BASE_DIR=../.. $(XOA_DIR)/$(XOA) -s $(XOA2_OPTS)
+       $(H)MATITA_RT_BASE_DIR=../.. $(XOA_DIR)/$(XOA) -s $(XOA_OPTS)
 
 # elim #######################################################################
 
@@ -260,8 +247,8 @@ trim: $(TRIMS:%=%.trimmed)
 # contrib ####################################################################
 
 contrib:
-       @echo "  TAR -czf $(CONTRIB).tar.gz root $(XPACKAGES)"
-       $(H)tar -czf $(CONTRIB).tar.gz root $(XMAS)
+       @echo "  TAR -cjf $(CONTRIB).tar.bz2 root $(XPACKAGES)"
+       $(H)tar -cjf $(CONTRIB).tar.bz2 ../lambdadelta/root $(XMAS:%=../lambdadelta/%)
 
 # clean ######################################################################
 
@@ -270,13 +257,13 @@ clean:
 
 # www ######################################################################
 
-www:
-       $(H)$(MAKE) --no-print-directory -C $(WWW) www
+home:
+       $(H)$(MAKE) --no-print-directory -C $(WWW) home
 
 # www ######################################################################
 
-up-html:
-       $(H)$(MAKE) --no-print-directory -C $(WWW) up-html
+up-home:
+       $(H)$(MAKE) --no-print-directory -C $(WWW) up-home
 
 ##############################################################################