X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=matita%2FMakefile;h=00c32a7123215b665e4ad44333f1e70452d1ddd4;hb=894e5d5d77b474d98c3106533d62e4e5b15f3d93;hp=749ed0f71ecf3880a5cb9c11ec96512a650bcd0b;hpb=128416c93009ed6cb2475c54d2d70e4e97a6788b;p=helm.git

diff --git a/matita/Makefile b/matita/Makefile
index 749ed0f71..00c32a712 100644
--- a/matita/Makefile
+++ b/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
 
@@ -98,28 +102,28 @@ world: all
 endif
 
 matita: matita.ml $(LIB_DEPS) $(CMOS)
-	@echo "OCAMLC $<"
+	@echo "  OCAMLC $<"
 	$(H)$(OCAMLC) $(PKGS) -linkpkg -o $@ $(CMOS) matita.ml
 matita.opt: matita.ml $(LIBX_DEPS) $(CMXS)
-	@echo "OCAMLOPT $<"
+	@echo "  OCAMLOPT $<"
 	$(H)$(OCAMLOPT) $(PKGS) -linkpkg -o $@ $(CMXS) matita.ml
 
 dump_moo: dump_moo.ml buildTimeConf.cmo
-	@echo "OCAMLC $<"
+	@echo "  OCAMLC $<"
 	$(H)$(OCAMLC) $(PKGS) -linkpkg -o $@ buildTimeConf.cmo $<
 dump_moo.opt: dump_moo.ml buildTimeConf.cmx
 	@echo "OCAMLOPT $<"
 	$(H)$(OCAMLOPT) $(PKGS) -linkpkg -o $@ buildTimeConf.cmx $<
 
 matitac: matitac.ml $(CLIB_DEPS) $(CCMOS) $(MAINCMOS)
-	@echo "OCAMLC $<"
+	@echo "  OCAMLC $<"
 	$(H)$(OCAMLC) $(CPKGS) -linkpkg -o $@ $(CCMOS) $(MAINCMOS) matitac.ml
 matitac.opt: matitac.ml $(CLIBX_DEPS) $(CCMXS) $(MAINCMXS)
-	@echo "OCAMLOPT $<"
+	@echo "  OCAMLOPT $<"
 	$(H)$(OCAMLOPT) $(CPKGS) -linkpkg -o $@ $(CCMXS) $(MAINCMXS) matitac.ml
 
 matitatop: matitatop.ml $(CLIB_DEPS) $(CCMOS)
-	@echo "OCAMLC $<"
+	@echo "  OCAMLC $<"
 	$(H)$(OCAMLC) $(CPKGS) -linkpkg -o $@ toplevellib.cma $(CCMOS) $<
 
 matitadep: matitac
@@ -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
@@ -200,21 +209,22 @@ endif
 ifeq ($(DISTRIBUTED),yes)
 
 dist_library: dist_library@library
-dist_library_clean:
-	@echo "MATITACLEAN -system all"
-	$(H)./matitaclean$(BEST_EXT) \
-		-system -conffile `pwd`/matita.conf.xml.build all
 dist_library@%:
-	@echo "MATITAMAKE -system init"
+	@echo "MATITAMAKE init $*"
 	$(H)MATITA_RT_BASE_DIR=`pwd` \
-		MATITA_FLAGS="-system -conffile `pwd`/matita.conf.xml.build" \
-		./matitamake$(BEST_EXT) -conffile `pwd`/matita.conf.xml.build \
+		MATITA_FLAGS="-conffile `pwd`/matita.conf.xml" \
+		./matitamake$(BEST_EXT) -conffile `pwd`/matita.conf.xml \
 			init $* `pwd`/$*
-	@echo "MATITAMAKE -system build"
+	@echo "MATITAMAKE publish $*"
+	$(H)MATITA_RT_BASE_DIR=`pwd` \
+		MATITA_FLAGS="-conffile `pwd`/matita.conf.xml" \
+		./matitamake$(BEST_EXT) -conffile `pwd`/matita.conf.xml \
+			publish $*
+	@echo "MATITAMAKE destroy $*"
 	$(H)MATITA_RT_BASE_DIR=`pwd` \
-		MATITA_FLAGS="-system -conffile `pwd`/matita.conf.xml.build" \
-		./matitamake$(BEST_EXT) -conffile `pwd`/matita.conf.xml.build \
-			build $*
+		MATITA_FLAGS="-conffile `pwd`/matita.conf.xml" \
+		./matitamake$(BEST_EXT) -conffile `pwd`/matita.conf.xml \
+			destroy $*
 	touch $@
 
 endif
@@ -227,33 +237,33 @@ INSTALL_STUFF = 			\
 	matita.ma.templ 		\
 	core_notation.moo 		\
 	matita.conf.xml 		\
-	matita.conf.xml.user 		\
 	closed.xml 			\
 	gtkmathview.matita.conf.xml 	\
 	template_makefile.in 		\
 	AUTHORS 			\
 	LICENSE 			\
 	$(NULL)
+
+
 ifeq ($(HAVE_OCAMLOPT),yes)
-INSTALL_STUFF += $(PROGRAMS_OPT)
+INSTALL_STUFF_BIN = $(PROGRAMS_OPT)
 else
-INSTALL_STUFF += $(PROGRAMS_BYTE)
+INSTALL_STUFF_BIN = $(PROGRAMS_BYTE)
 endif
 
-install:
-	# install main dir and executables
-	install -d $(DESTDIR)
+install: install_preliminaries 
+	#dist_library 
+
+install_preliminaries:
+	install -d $(DESTDIR)/ma/
 	cp -a $(INSTALL_STUFF) $(DESTDIR)
-	# install the library and corresponding scripts
-	if [ -d $(DESTDIR)/library ]; then rm -rf $(DESTDIR)/library; fi
-	cp -a .matita/xml/matita/ $(DESTDIR)/library/
-	if [ -d $(DESTDIR)/ma ]; then rm -rf $(DESTDIR)/ma; fi
-	install -d $(DESTDIR)/ma
+	install -s $(INSTALL_STUFF_BIN) $(DESTDIR)
 ifeq ($(HAVE_OCAMLOPT),yes)
-	for p in $(PROGRAMS_BYTE); do ln -s $$p.opt $(DESTDIR)/$$p; done
+	for p in $(PROGRAMS_BYTE); do ln -fs $$p.opt $(DESTDIR)/$$p; done
 endif
-	cp -a library/ $(DESTDIR)/ma/stdlib/
-	cp -a contribs/ $(DESTDIR)/ma/contribs/
+	cp -a library/ $(DESTDIR)/ma/standard-library
+	cp -a contribs/ $(DESTDIR)/ma/
+
 uninstall:
 	rm -rf $(DESTDIR)
 
@@ -337,16 +347,16 @@ depend:
 include .depend
 
 %.cmi: %.mli
-	@echo "OCAMLC $<"
+	@echo "  OCAMLC $<"
 	$(H)$(OCAMLC) $(PKGS) -c $<
 %.cmo %.cmi: %.ml
-	@echo "OCAMLC $<"
+	@echo "  OCAMLC $<"
 	$(H)$(OCAMLC) $(PKGS) -c $<
 %.cmx: %.ml
-	@echo "OCAMLOPT $<"
+	@echo "  OCAMLOPT $<"
 	$(H)$(OCAMLOPT) $(PKGS) -c $<
 %.annot: %.ml
-	@echo "OCAMLC -dtypes $<"
+	@echo "  OCAMLC -dtypes $<"
 	$(H)$(OCAMLC) -dtypes $(PKGS) -c $<
 
 $(CMOS): $(LIB_DEPS)