update in basic_2

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

diff --git a/matita/matita/contribs/lambdadelta/Makefile b/matita/matita/contribs/lambdadelta/Makefile
index 13465a4fc32d58f30241ecb54106a20e4ea3db27..59cf50f6ed6899fb0ffe73222eb60fd33dbfd071 100644 (file)
--- 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
@@ -33,8 +32,8 @@ WWW          := ../../../../helm/www/lambdadelta
 TAGS := all xoa xoa2 orig elim deps top leaf stats tbls trim contrib clean \
         www up-html
 
-PACKAGES  := ground_2 basic_2 apps_2 alpha_1
-XPACKAGES := ground_2 basic_2
+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")
@@ -74,11 +73,9 @@ $(XOA_TARGETS): $(XOA_CONF)
 
 # 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 #######################################################################
 
@@ -98,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 ########################################################################