X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=Makefile;h=dfd4b58341d6fea4a9a0d99ce5463685f2fb2c5f;hb=30da02e8be0612dac41b435bc7e8a9bea41cc352;hp=c3ce697ffe8f55b1e9277dbb085d24e22f8c5fd3;hpb=bf5e6f18930534e2c951b083c5c2c361a30bcc34;p=helm.git

diff --git a/Makefile b/Makefile
index c3ce697ff..dfd4b5834 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)
@@ -52,17 +54,21 @@ CLEAN_ON_DIST = 		\
 EXTRA_DIST = 			\
 	matita/AUTHORS 		\
 	matita/LICENSE 		\
+	matita/dist/BUGS 	\
+	matita/dist/ChangeLog	\
 	matita/dist/COPYING 	\
 	matita/dist/INSTALL 	\
 	matita/dist/README	\
-	matita/dist/ChangeLog	\
 	Makefile 		\
 	Makefile.defs.in	\
 	$(NULL)
+EXTRA_DIST_matita =			\
+	matita/matitaGeneratedGui.ml	\
+	$(NULL)
 
 distcheck: dist dist_extract dist_test
 
-dist: dist_mktmpdir dist_export dist_mktarball dist_rmtmpdir
+dist: dist_mktmpdir dist_pre dist_export dist_mktarball dist_rmtmpdir
 dist/configure.ac: configure.ac matita/dist/configure.ac.sed
 	sed -f matita/dist/configure.ac.sed < $< > $@
 dist/configure: dist/configure.ac
@@ -71,6 +77,8 @@ dist_mktmpdir:
 	test -d dist || mkdir dist
 dist_rmtmpdir:
 	test -d dist && rm -rf dist/ || true
+dist_pre:
+	$(MAKE) -C matita dist_pre
 dist_export: dist/configure
 	rm -rf $(DISTDIR)
 	mkdir $(DISTDIR)
@@ -80,8 +88,13 @@ dist_export: dist/configure
 	(cd $(DISTDIR) && rm -f $(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: