X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;ds=sidebyside;f=Makefile;h=6a16621dcd0c750e0c89c84510968c1cfe1192c4;hb=d3f5be46ea4f2cee636e2e64c36a82f0dd5f51a9;hp=5ffb3574affefb6ee61818c9e5b8211c342c64be;hpb=8030f2baedc490edbe3c26ac3b4b5ed88408ddee;p=helm.git

diff --git a/Makefile b/Makefile
index 5ffb3574a..6a16621dc 100644
--- a/Makefile
+++ b/Makefile
@@ -3,23 +3,26 @@ include Makefile.defs
 
 SUBDIRS = components matita
 
-all: $(foreach d,$(SUBDIRS),all.$(d))
-opt: $(foreach d,$(SUBDIRS),opt.$(d))
-clean: $(foreach d,$(SUBDIRS),clean.$(d))
-distclean: $(foreach d,$(SUBDIRS),distclean.$(d))
+all: $(foreach d,$(SUBDIRS),rec@all@$(d))
+opt: $(foreach d,$(SUBDIRS),rec@opt@$(d))
+world: $(foreach d,$(SUBDIRS),rec@world@$(d))
+clean: $(foreach d,$(SUBDIRS),rec@clean@$(d))
+distclean: $(foreach d,$(SUBDIRS),rec@distclean@$(d))
+	rm -rf .matita library-stamp
+install: $(foreach d,$(SUBDIRS),rec@install@$(d))
+uninstall: $(foreach d,$(SUBDIRS),rec@uninstall@$(d))
 
-all.%:
-	$(MAKE) -C $* all
-opt.%:
-	$(MAKE) -C $* opt
-clean.%:
-	$(MAKE) -C $* clean
-distclean.%:
-	$(MAKE) -C $* distclean
-install.%:
-	$(MAKE) -C $* install
-uninstall.%:
-	$(MAKE) -C $* uninstall
+rec@%:
+	$(MAKE) -C $(word 2, $(subst @, ,$*)) $(word 1, $(subst @, ,$*))
+
+# {{{ Distribution stuff
+
+ifeq ($(DISTRIBUTED),yes)
+library: library-stamp
+library-stamp:
+	$(MAKE) -C matita/ dist_library_clean dist_library
+	touch $@
+endif
 
 BASENAME = matita
 NULL =
@@ -28,7 +31,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	\
@@ -37,9 +41,9 @@ EXTRA_DIST = 			\
 	Makefile.defs.in	\
 	$(NULL)
 
-dist: dist_mktmpdir dist_export dist_mktarball dist_rmtmpdir
-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
 	sed -f matita/dist/configure.ac.sed < $< > $@
 dist/configure: dist/configure.ac
@@ -57,10 +61,23 @@ dist_export: dist/configure
 	ln -fs matita.conf.xml.user $(DISTDIR)/matita/matita.conf.xml
 	cp $< $(DISTDIR)/configure
 	cp -r $(EXTRA_DIST) $(DISTDIR)
-
 dist_mktarball:
 	tar czf $(DISTDIR).tar.gz $(DISTDIR)
+	rm -rf $(DISTDIR)
+
+dist_extract:
+	tar xzf $(DISTDIR).tar.gz
+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
+
+# }}} End of distribution stuff
 
-.PHONY: dist dist_export dist_mktarball distcheck dist_extract dist_build dist_autotools
 .PHONY: all opt clean distclean
 
+# vim: set foldmethod=marker: