tagging rc-1

[helm.git] / Makefile

diff --git a/Makefile b/Makefile
index c3ce697ffe8f55b1e9277dbb085d24e22f8c5fd3..94993fd977c71ea0154056c7c0ca11b7b9f04d5f 100644 (file)
--- 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
 
@@ -52,17 +58,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 +81,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 +92,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: