X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Fsoftware%2Fmatita%2FMakefile;h=272711ad763b563605d418167e331d0dabbd083f;hb=1a56e06b4c137fa7f6f973f51ee639ab1462f525;hp=749ed0f71ecf3880a5cb9c11ec96512a650bcd0b;hpb=90903c3a5f562b908190d746b36a4417e1e984ba;p=helm.git

diff --git a/helm/software/matita/Makefile b/helm/software/matita/Makefile
index 749ed0f71..272711ad7 100644
--- a/helm/software/matita/Makefile
+++ b/helm/software/matita/Makefile
@@ -53,13 +53,17 @@ MAINCMOS =			\
 	matitadep.cmo		\
 	matitaclean.cmo		\
 	matitamake.cmo		\
+	gragrep.cmo 		\
 	$(NULL)
-PROGRAMS_BYTE = matita matitac cicbrowser matitadep matitaclean matitamake dump_moo
+PROGRAMS_BYTE = \
+	matita matitac cicbrowser matitadep matitaclean matitamake
 PROGRAMS = $(PROGRAMS_BYTE) matitatop
 PROGRAMS_OPT = $(patsubst %,%.opt,$(PROGRAMS_BYTE))
+NOINST_PROGRAMS = dump_moo gragrep
+NOINST_PROGRAMS_OPT = $(patsubst %,%.opt,$(EXTRA_PROGRAMS))
 
 .PHONY: all
-all: $(PROGRAMS)
+all: $(PROGRAMS) $(NOINST_PROGRAMS)
 #  all: matita.conf.xml $(PROGRAMS) coq.moo
 
 #  matita.conf.xml: matita.conf.xml.sample
@@ -87,7 +91,7 @@ LIB_DEPS := $(shell $(OCAMLFIND) query -recursive -predicates "byte" -format "%d
 LIBX_DEPS := $(shell $(OCAMLFIND) query -recursive -predicates "native" -format "%d/%a" $(MATITA_REQUIRES))
 CLIB_DEPS := $(shell $(OCAMLFIND) query -recursive -predicates "byte" -format "%d/%a" $(MATITA_CREQUIRES))
 CLIBX_DEPS := $(shell $(OCAMLFIND) query -recursive -predicates "native" -format "%d/%a" $(MATITA_CREQUIRES))
-opt: $(PROGRAMS_OPT)
+opt: $(PROGRAMS_OPT) $(NOINST_PROGRAMS_OPT)
 upx: $(PROGRAMS_UPX)
 .PHONY: opt upx
 
@@ -137,6 +141,11 @@ matitamake: matitac
 matitamake.opt: matitac.opt
 	@test -f $@ || ln -s $< $@
 	
+gragrep: matitac
+	@test -f $@ || ln -s $< $@
+gragrep.opt: matitac.opt
+	@test -f $@ || ln -s $< $@
+	
 cicbrowser: matita
 	@test -f $@ || ln -s $< $@
 cicbrowser.opt: matita.opt
@@ -149,8 +158,8 @@ matitaGeneratedGui.ml matitaGeneratedGui.mli: matita.glade
 .PHONY: clean
 clean:
 	rm -rf *.cma *.cmo *.cmi *.cmx *.cmxa *.a *.o \
-		$(PROGRAMS) \
-		$(PROGRAMS_OPT) \
+		$(PROGRAMS) $(PROGRAMS_OPT) \
+		$(NOINST_PROGRAMS) $(NOINST_PROGRAMS_OPT) \
 		$(PROGRAMS_STATIC) \
 		$(PROGRAMS_UPX) \
 		$(NULL)
@@ -178,9 +187,9 @@ tests.opt: $(foreach d,$(TEST_DIRS),$(d)-test-opt)
 cleantests: $(foreach d,$(TEST_DIRS),$(d)-cleantests)
 cleantests.opt: $(foreach d,$(TEST_DIRS),$(d)-cleantests-opt)
 
-%-test: matitac matitadep matitaclean coq.moo
+%-test: matitac matitadep matitaclean 
 	-cd $* && make -k clean all
-%-test-opt: matitac.opt matitadep.opt matitaclean.opt coq.moo.opt
+%-test-opt: matitac.opt matitadep.opt matitaclean.opt
 	-cd $* && make -k clean.opt opt
 %-cleantests: matitaclean
 	-cd $* && make clean