X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Fsoftware%2FMakefile;h=c3ce697ffe8f55b1e9277dbb085d24e22f8c5fd3;hb=780561e45e8de50dd0063a0e369458ba67479872;hp=9be238e0ca8ed15e339d36fb49f2547b1dd0af05;hpb=c3ab7e0c0f605738d56530182eb8725bd948de82;p=helm.git

diff --git a/helm/software/Makefile b/helm/software/Makefile
index 9be238e0c..c3ce697ff 100644
--- 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
 
@@ -31,7 +50,8 @@ CLEAN_ON_DIST = 		\
 	components/license	\
 	$(NULL)
 EXTRA_DIST = 			\
-	matita/dist/AUTHORS 	\
+	matita/AUTHORS 		\
+	matita/LICENSE 		\
 	matita/dist/COPYING 	\
 	matita/dist/INSTALL 	\
 	matita/dist/README	\
@@ -40,7 +60,7 @@ EXTRA_DIST = 			\
 	Makefile.defs.in	\
 	$(NULL)
 
-distcheck: dist dist_extract dist_build
+distcheck: dist dist_extract dist_test
 
 dist: dist_mktmpdir dist_export dist_mktarball dist_rmtmpdir
 dist/configure.ac: configure.ac matita/dist/configure.ac.sed
@@ -56,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:
@@ -66,13 +86,13 @@ dist_mktarball:
 
 dist_extract:
 	tar xzf $(DISTDIR).tar.gz
-dist_build:
+dist_test:
 	(cd $(DISTDIR)/ \
 	  && ./configure \
 	  && $(MAKE) world \
-	  && $(MAKE) library)
+	  && $(MAKE) install DESTDIR=`pwd`/install)
 
-.PHONY: dist dist_export dist_mktarball distcheck dist_extract dist_build dist_autotools
+.PHONY: dist dist_export dist_mktarball distcheck dist_extract dist_test dist_autotools
 
 # }}} End of distribution stuff