partially fixed boxes in rewite

[helm.git] / helm / software / Makefile

diff --git a/helm/software/Makefile b/helm/software/Makefile
index 6a16621dcd0c750e0c89c84510968c1cfe1192c4..c3ce697ffe8f55b1e9277dbb085d24e22f8c5fd3 100644 (file)
--- a/helm/software/Makefile
+++ b/helm/software/Makefile
@@ -1,14 +1,33 @@
+H=@
 
 include Makefile.defs
 
 SUBDIRS = components matita
 
+ifeq ($(DISTRIBUTED),yes)
+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))
-world: $(foreach d,$(SUBDIRS),rec@world@$(d))
+endif
+world: depend $(foreach d,$(SUBDIRS),rec@world@$(d))
+depend: depend-stamp
+depend-stamp:
+ifeq ($(HAVE_OCAMLOPT),yes)
+ ifeq ($(DISTRIBUTED),yes)
+       $(MAKE) $(foreach d,$(SUBDIRS),rec@depend.opt@$(d))
+ else
+       $(MAKE) $(foreach d,$(SUBDIRS),rec@depend@$(d))
+ endif
+else
+       $(MAKE) $(foreach d,$(SUBDIRS),rec@depend@$(d))
+endif
+       $(H)touch depend-stamp
+
 clean: $(foreach d,$(SUBDIRS),rec@clean@$(d))
 distclean: $(foreach d,$(SUBDIRS),rec@distclean@$(d))
-       rm -rf .matita library-stamp
+       $(H)rm -rf .matita library-stamp depend-stamp
 install: $(foreach d,$(SUBDIRS),rec@install@$(d))
 uninstall: $(foreach d,$(SUBDIRS),rec@uninstall@$(d))
 
@@ -20,7 +39,7 @@ rec@%:
 ifeq ($(DISTRIBUTED),yes)
 library: library-stamp
 library-stamp:
-       $(MAKE) -C matita/ dist_library_clean dist_library
+       $(MAKE) -C matita/ dist_library
        touch $@
 endif
 
@@ -57,8 +76,8 @@ dist_export: dist/configure
        mkdir $(DISTDIR)
        svn export components $(DISTDIR)/components
        svn export matita $(DISTDIR)/matita
+       (cd $(DISTDIR) && find . -name .depend -exec rm \{\} \;)
        (cd $(DISTDIR) && rm -f $(CLEAN_ON_DIST))
-       ln -fs matita.conf.xml.user $(DISTDIR)/matita/matita.conf.xml
        cp $< $(DISTDIR)/configure
        cp -r $(EXTRA_DIST) $(DISTDIR)
 dist_mktarball:
@@ -71,7 +90,6 @@ dist_test:
        (cd $(DISTDIR)/ \
          && ./configure \
          && $(MAKE) world \
-         && $(MAKE) library \
          && $(MAKE) install DESTDIR=`pwd`/install)
 
 .PHONY: dist dist_export dist_mktarball distcheck dist_extract dist_test dist_autotools