XOA_DIR := ../../../components/binaries/xoa
XOA := xoa.native
-XOA_CONF := ground_2/xoa.conf.xml
+XOA_CONF := ground/xoa.conf.xml
XOA_OPTS := ../../matita.conf.xml $(XOA_CONF)
DEP_INPUT := .depend
ORIG := . ./orig.sh
ORIGS := basic_2/basic_1.orig
-CONTRIB := lambdadelta_2B
-
WWW := ../../../../helm/www/lambdadelta
-TAGS := all names xoa orig elim deps top leaf stats tbls odeps trim contrib clean \
- home up-home
+TAGS := all names xoa orig elim deps top leaf stats tbls odeps trim clean \
+ pack-ground pack-2a pack-2b \
+ home up-home \
-PACKAGES := ground_2 static_2 basic_2 apps_2 alpha_1
-XPACKAGES := ground_2 static_2 basic_2
+PACKAGES := ground basic_2A static_2 basic_2 apps_2 alpha_1 delayed_updating
LDWS := $(shell find -name "*.ldw.xml")
TBLS := $(shell find -name "*.tbl")
$(foreach PKG, $(PACKAGES), $(eval $(call MAS_TEMPLATE,$(PKG))))
-# XMAS #######################################################################
-
-define XMAS_TEMPLATE
- XMAS += $$(MAS_$(1))
-endef
-
-$(foreach PKG, $(XPACKAGES), $(eval $(call XMAS_TEMPLATE,$(PKG))))
-
# names ######################################################################
NAMES = basic_1A basic_2A static_2 basic_2
$$(SUM_$(1)): S2 = $$(word 2, $$(C0))
$$(SUM_$(1)): S3 = $$(word 3, $$(C0))
$$(SUM_$(1)): S4 = $$(word 4, $$(C0))
- $$(SUM_$(1)): S5 = $$(shell printf "%.1f" `echo "scale=2;$$(S4)/$$(S2)"|bc`)
+ $$(SUM_$(1)): S5 = $$(shell printf "%.1f" `echo "scale=2;if($$(S2)!=0)$$(S4)/$$(S2) else 0"|bc`)
$$(SUM_$(1)): C1 = $$(word 5, $$(C0))
$$(SUM_$(1)): C2 = $$(word 7, $$(C0))
$$(SUM_$(1)): C3 = $$(shell echo "$$(C1)+$$(C2)"|bc)
trim: $(TRIMS:%=%.trimmed)
-# contrib ####################################################################
+# package ground #############################################################
+
+pack-ground: PKG = lambdadelta_ground
+
+pack-ground: DIRS = ground
+
+pack-ground: PMAS = $(shell find $(DIRS) -name *.ma)
+
+pack-ground:
+ @echo " TAR -cjf $(PKG).tar.bz2 root $(DIRS)"
+ $(H)tar -cjf $(PKG).tar.bz2 ../lambdadelta/root $(PMAS:%=../lambdadelta/%)
+
+# package 2A ###################################################################
+
+pack-2a: PKG = lambdadelta_2A
+
+pack-2a: DIRS = basic_2A
+
+pack-2a: PMAS = $(shell find $(DIRS) -name *.ma)
+
+pack-2a:
+ @echo " TAR -cjf $(PKG).tar.bz2 $(DIRS)"
+ $(H)tar -cjf $(PKG).tar.bz2 $(PMAS:%=../lambdadelta/%)
+
+# package 2B ###################################################################
+
+pack-2b: PKG = lambdadelta_2B
+
+pack-2b: DIRS = static_2 basic_2
+
+pack-2b: PMAS = $(shell find $(DIRS) -name *.ma)
-contrib:
- @echo " TAR -cjf $(CONTRIB).tar.bz2 root $(XPACKAGES)"
- $(H)tar -cjf $(CONTRIB).tar.bz2 ../lambdadelta/root $(XMAS:%=../lambdadelta/%)
+pack-2b:
+ @echo " TAR -cjf $(PKG).tar.bz2 $(DIRS)"
+ $(H)tar -cjf $(PKG).tar.bz2 $(PMAS:%=../lambdadelta/%)
# clean ######################################################################