X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=Makefile;h=2f19a75239a319b733934251d99ec792170a3831;hb=f39bfe067b475f99d3da6c1c62b101e17819c3a4;hp=83613765669d2421ff69b0586fb56293b2901b4f;hpb=6f769078a23e6c63706a86a35fdc4e8ba08a5414;p=helm.git

diff --git a/Makefile b/Makefile
index 836137656..2f19a7523 100644
--- a/Makefile
+++ b/Makefile
@@ -5,13 +5,15 @@ include Makefile.defs
 SUBDIRS = components matita
 
 ifeq ($(DISTRIBUTED),yes)
+# 'world' is the default target when distributed, otherwise 'all' is
+world: depend $(foreach d,$(SUBDIRS),rec@world@$(d))
 all: depend $(foreach d,$(SUBDIRS),rec@all@$(d))
 opt: depend $(foreach d,$(SUBDIRS),rec@opt@$(d))
 else
 all: $(foreach d,$(SUBDIRS),rec@all@$(d))
 opt: $(foreach d,$(SUBDIRS),rec@opt@$(d))
-endif
 world: depend $(foreach d,$(SUBDIRS),rec@world@$(d))
+endif
 depend: depend-stamp
 depend-stamp:
 ifeq ($(HAVE_OCAMLOPT),yes)
@@ -25,14 +27,18 @@ else
 endif
 	$(H)touch depend-stamp
 
-clean: $(foreach d,$(SUBDIRS),rec@clean@$(d))
-distclean: $(foreach d,$(SUBDIRS),rec@distclean@$(d))
+clean: 
+	$(H)make $(foreach d,$(SUBDIRS),rec@clean@$(d)) || true
+distclean: 
+	$(H)make $(foreach d,$(SUBDIRS),rec@distclean@$(d)) || true
 	$(H)rm -rf .matita library-stamp depend-stamp
-install: $(foreach d,$(SUBDIRS),rec@install@$(d))
+install-indep: $(foreach d,$(SUBDIRS),rec@install-indep@$(d))
+install-arch: $(foreach d,$(SUBDIRS),rec@install-arch@$(d))
+install: install-indep install-arch
 uninstall: $(foreach d,$(SUBDIRS),rec@uninstall@$(d))
 
 rec@%:
-	$(MAKE) -C $(word 2, $(subst @, ,$*)) $(word 1, $(subst @, ,$*))
+	$(MAKE) -C $(word 2, $(subst @, ,$*)) $(word 1, $(subst @, ,$*)) DESTDIR=$(shell pwd)/$(DESTDIR)
 
 # {{{ Distribution stuff
 
@@ -48,6 +54,10 @@ NULL =
 DISTDIR = $(BASENAME)-$(MATITA_VERSION)
 CLEAN_ON_DIST = 		\
 	components/license	\
+	matita/TPTP/	\
+	matita/dama/	\
+	matita/contribs/	\
+	matita/library_auto/	\
 	$(NULL)
 EXTRA_DIST = 			\
 	matita/AUTHORS 		\
@@ -60,6 +70,9 @@ EXTRA_DIST = 			\
 	Makefile 		\
 	Makefile.defs.in	\
 	$(NULL)
+EXTRA_DIST_matita =			\
+	matita/matitaGeneratedGui.ml	\
+	$(NULL)
 
 distcheck: dist dist_extract dist_test
 
@@ -80,14 +93,17 @@ dist_export: dist/configure
 	svn export components $(DISTDIR)/components
 	svn export matita $(DISTDIR)/matita
 	(cd $(DISTDIR) && find . -name .depend -exec rm \{\} \;)
-	(cd $(DISTDIR) && rm -f $(CLEAN_ON_DIST))
+	(cd $(DISTDIR) && find . -name .depend.opt -exec rm \{\} \;)
+	(cd $(DISTDIR) && rm -rf $(CLEAN_ON_DIST))
 	cp $< $(DISTDIR)/configure
 	cp -r $(EXTRA_DIST) $(DISTDIR)
+	cp -r $(EXTRA_DIST_matita) $(DISTDIR)/matita
 	# distribute HTML version of the manual
 	mkdir -p $(DISTDIR)/docs/manual/
 	$(MAKE) -C matita/help/C/ install DESTDIR=$(CURDIR)/$(DISTDIR)/docs/manual/
 dist_mktarball:
 	tar czf $(DISTDIR).tar.gz $(DISTDIR)
+	#tar cjf $(DISTDIR).tar.bz2 $(DISTDIR)
 	rm -rf $(DISTDIR)
 
 dist_extract: