X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/9ae1c2c20f7730e31bb16472f2a9ae4c83b10b79..5c31366609199a57339e472af71dbdd30c4fd60e:/Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 89f0424aec..ee36e12c2b 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,13 +1,13 @@
-SUBDIRS= include src examples testsuite doc
+SUBDIRS= include src tools examples testsuite doc
 DISTCLEANFILES =  *~  
 
 ACLOCAL = aclocal-1.9 -I acmacro
 AUTOMAKE_OPTIONS = gnu
 DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc
 
-EXTRA_DIST = bootstrap COPYING INSTALL NEWS README README.IEEE TODO AUTHORS ChangeLog ChangeLog.debian\
+EXTRA_DIST = bootstrap COPYING INSTALL NEWS README README.IEEE TODO AUTHORS ChangeLog \
 	acmacro/aci.m4 \
-	tools/gras-check-arch	tools/compile-remote-worker.in \
+	tools/gras-check-arch	tools/graspe-slave.in \
 	tools/MSG_visualization tools/platform_generation \
         tools/doxygen/index_create.pl
 
@@ -48,86 +48,43 @@ publish: dist
 	 @echo "----[ Put the tarball @VERSION@ on gcl ]----"
 	 scp @PACKAGE@-@VERSION@.tar.gz gcl.ucsd.edu:/home/www/simgrid/dl/
 	 scp -r doc/html/* gcl.ucsd.edu:/home/www/simgrid/
-#	 scp ChangeLog gcl.ucsd.edu:/home/www/simgrid/dl/ChangeLog
+	 scp -r doc/html/* scm.gforge.inria.fr:/var/lib/gforge/chroot/home/groups/simgrid/htdocs/
+	 scp ChangeLog gcl.ucsd.edu:/home/www/simgrid/dl/ChangeLog
 	 @echo "----[ Put the tarball @VERSION@ on the local filesystem ]----"
 	 cp @PACKAGE@-@VERSION@.tar.gz ~/public_html/simgrid2
 	 cp -r doc/html ~/public_html/simgrid2/doc/
-#	 cp ChangeLog ~/public_html/simgrid2/
+	 cp ChangeLog ~/public_html/simgrid2/
 	 make -C ~/public_html
 
 mail:
-	 @ver=`dpkg-parsechangelog -lChangeLog.debian| egrep '^Version: ' | sed 's/Version: //'`;\
+	 @ver=`dpkg-parsechangelog -lChangeLog | egrep '^Version: ' | sed 's/Version: //'`;\
 	  (echo "Hello," ; \
 	   echo; \
-           echo "A new version of GRAS is available. Here is the changelog:";\
+           echo "A new version of SimGrid is available. Here is the changelog:";\
 	   echo;echo;\
-           dpkg-parsechangelog -lChangeLog.debian ;\
+           dpkg-parsechangelog -lChangeLog ;\
            echo;echo; \
 	   echo "It is available from the official website:";\
 	   echo "  http://grail.sdsc.edu/simgrid/";\
-	   echo;echo "Cheers, Mt.") | \
+	   echo;echo "Cheers, the SimGrid team.") | \
           mail -e \
-	       -a "From: Martin.Quinson@ens-lyon.fr" \
+	       -a "From: Arnaud.Legrand@imag.fr" \
 	       -s "New version of GRAS ($$ver)" \
-	       martin.quinson@ens-lyon.fr,arnaud.legrand@ens-lyon.fr
-
+	       simgrid2-users@listes.ens-lyon.fr
 
 splint:
-	splint `find src -name '*.c' | grep -v RL | grep -v SG` +matchanyintegral -warnposix +boolint -Inws_portability/Include/ -Isrc/include -Isrc/base -Isrc
-
+	splint `make dist-files | grep -v $(PWD) | egrep '\.[ch]$$' |sort -u` \
+	       +matchanyintegral -warnposix +boolint \
+	       +show-summary +stats\
+	       -Iinclude -Isrc/include -Isrc/base -Isrc
+.PHONY: splint
 ##
 ## Cruft for remote compilation
 ##
 
-MACHINES ?= valnure.cs.ucsb.edu sperm.cs.ucsb.edu     basalt.cs.ucsb.edu \
-	    graal.ens-lyon.fr   allo-psmn.ens-lyon.fr \
-	    nala.cs.utk.edu
-
-# ACTION: What to do there
-# possible values:
-#  - clean:   erase any previously existing source tree and 
-#             open the new open
-#  - touch:   touch every file of the source tree to deal with 
-#             clock brokenness. May help, may harm.
-#  - config:  launch configure
-#  - compile: run 'make'
-#  - install: run 'make install'
-#  - check:   run 'make check'
-#
-# default value:
-ACTION ?= clean untar config compile check
-
-REMOTE_PREFIX ?='${HOME}/simgrid'
-
-remote: @PACKAGE@-@VERSION@.tar.gz tools/compile-remote-worker
-	@echo;echo "----[ Recompile the package on remote hosts ]----"
-	@test -e @srcdir@/buildlogs/@PACKAGE@-@VERSION@ || mkdir -p @srcdir@/buildlogs/@PACKAGE@-@VERSION@
-	@failed=0;\
-	 for site in $(MACHINES) ; do \
-	   machine=`echo $$site |sed 's/^\([^%]*\)%.*$$/\1/'`;\
-	   machine2=`echo $$site |sed 's/^\([^%]*\)%\(.*\)$$/\2/'`;\
-	   cmd="\"sh -c 'env REMOTE_PREFIX=$(REMOTE_PREFIX) $(REMOTE_PREFIX)/src/compile-remote-worker $(ACTION) 2>&1'\"";\
-	   if echo $$site | grep  '%' >/dev/null ; then \
-	     echo "----[ Compile on $$machine2 (behind $$machine) ]----";\
-	   else \
-	     machine=$$site;\
-	     echo "----[ Compile on $$machine ]----";\
-	   fi;\
-	   \
-	   echo "-- Copy the data over"; \
-	   scp @srcdir@/@PACKAGE@-@VERSION@.tar.gz tools/compile-remote-worker \
-	       $$machine:$(REMOTE_PREFIX)/src;\
-	   \
-	   echo "-- Compiling... (the output gets into @srcdir@/buildlogs/@PACKAGE@-@VERSION@/$$site.log)"; \
-	   if echo $$site | grep  '%' >/dev/null ; then \
-	     if ssh $$machine "env REMOTE_PREFIX=$(REMOTE_PREFIX) ssh -A $$machine2 $$cmd" 2>&1 > @srcdir@/buildlogs/@PACKAGE@-@VERSION@/$$site.log;\
-	     then echo "Sucessful"; else failed=1;echo "Failed (check @srcdir@/buildlogs/@PACKAGE@-@VERSION@/$$site.log)"; fi;echo; \
-	   else \
-	     if ssh $$machine "eval $$cmd" 2>&1 > @srcdir@/buildlogs/@PACKAGE@-@VERSION@/$$site.log ;\
-	     then echo "Sucessful"; else failed=1;echo "Failed (check @srcdir@/buildlogs/@PACKAGE@-@VERSION@/$$site.log)"; fi;echo; \
-	   fi;\
-	done;\
-	@srcdir@/tools/compile-stats;\
-	exit $$failed
+remote: 
+	@tools/graspe-master
 
 endif
+
+include $(top_srcdir)/acmacro/dist-files.mk