X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/e768b6f59f6c03b342ac1c2e9ef643b355af5c6f..998dfc15cf89b4e8ebba31507b4e9dbd86784e1c:/Makefile.am

diff --git a/Makefile.am b/Makefile.am
index dd63f42e17..30d13f43d7 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,11 +1,19 @@
+# Copyright (c) 2004-2007. The SimGrid team. All right reserved.
+
+# This file is part of the SimGrid project. This is free software:
+# You can redistribute and/or modify it under the terms of the
+# GNU LGPL (v2.1) licence.
+
+
 # GRAMINE_CUT_BEGIN
-SG_SUBDIRS= testsuite examples doc
+SG_SUBDIRS= testsuite teshsuite examples doc buildtools
 
 SG_EXTRA_DIST = bootstrap COPYING INSTALL NEWS README README.IEEE TODO AUTHORS ChangeLog \
 	acmacro/aci.m4 \
 	tools/graspe-slave.in \
 	tools/MSG_visualization \
-	   tools/MSG_visualization/colorize.pl
+	tools/MSG_visualization/colorize.pl \
+	checkall 
 # GRAMINE_CUT_END
 
 SUBDIRS= include src tools $(SG_SUBDIRS)
@@ -13,7 +21,8 @@ EXTRA_DIST=$(SG_EXTRA_DIST)
 
 DISTCLEANFILES= stamp.configure stamp.build stamp.check *~  
 
-ACLOCAL = aclocal-1.9 -I acmacro
+ACLOCAL = aclocal -I acmacro
+ACLOCAL_AMFLAGS=-I acmacro
 AUTOMAKE_OPTIONS = gnu
 
 check-local:
@@ -53,22 +62,12 @@ if MAINTAINER_MODE
 release: distcheck remote debian publish
 
 debian: dist
-	make -C ~/CVSIMPORT/pkg-grid/gras maintainerclean
+	$(MAKE) -C ~/CVSIMPORT/pkg-grid/gras maintainerclean
 	cp @PACKAGE@-@VERSION@.tar.gz ~/CVSIMPORT/pkg-grid/gras/
 	cp @PACKAGE@-@VERSION@.tar.gz ~/CVSIMPORT/pkg-grid/gras/@PACKAGE@_@VERSION@.orig.tar.gz
-	make -C ~/CVSIMPORT/pkg-grid/gras deb check
+	$(MAKE) -C ~/CVSIMPORT/pkg-grid/gras deb check
 	dput local *.changes
 
-publish-old: dist
-	 @echo "----[ Put the documentation on the local filesystem ]----"
-	 rm -rf ~/public_html/gras/doc
-	 mkdir ~/public_html/gras/doc
-	 cp -r doc/html ~/public_html/gras/doc
-	 @echo "----[ Put the tarball @VERSION@ on the local filesystem ]----"
-	 cp @PACKAGE@-@VERSION@.tar.gz ~/public_html/gras/dl
-	 @echo "----[ Sync remote host ]----"
-	 make -C public_html publish
-
 publish: dist
 	 @echo "----[ Put the tarball @VERSION@ on gforge ]----"
 #	 scp @PACKAGE@-@VERSION@.tar.gz gcl.ucsd.edu:/home/www/simgrid/dl/
@@ -79,16 +78,27 @@ publish: dist
 	 cp @PACKAGE@-@VERSION@.tar.gz ~/public_html/simgrid2
 	 cp -r doc/html ~/public_html/simgrid2/doc/
 	 cp ChangeLog ~/public_html/simgrid2/
-	 make -C ~/public_html
+	 $(MAKE) -C ~/public_html
+
+indent:
+	indent -br -brs -ce -bbo -bap --dont-break-procedure-type \
+	--no-tabs --cuddle-do-while --cuddle-else --indent-level2 \
+	--leave-preprocessor-space --no-space-after-function-call-names \
+	`$(MAKE) dist-files | grep '\.[ch]$$'|grep -v '/_' |grep -v '_unit.c'\
+                            | grep -v src/xbt/graphxml.c | grep -v datadesc_structs.c \
+                            | grep -v simgrid_dtd.[ch]`
 
 sync-gforge: 
+	chmod g+rw -R doc/
+	chmod a+rX -R doc/
 	rsync --verbose --cvs-exclude --compress --delete --delete-excluded --rsh=ssh --ignore-times \
 	    --recursive --links --perms --times --omit-dir-times  \
-	    doc/html/ scm.gforge.inria.fr:/var/lib/gforge/chroot/home/groups/simgrid/htdocs/doc/ || true
-	scp doc/index.php scm.gforge.inria.fr:/var/lib/gforge/chroot/home/groups/simgrid/htdocs/
-	scp doc/simgrid_modules2.png doc/simgrid_modules.png doc/simgrid_logo.png doc/simgrid_logo_small.png scm.gforge.inria.fr:/var/lib/gforge/chroot/home/groups/simgrid/htdocs/
-	ssh scm.gforge.inria.fr "chgrp -R simgrid /var/lib/gforge/chroot/home/groups/simgrid/htdocs/"
-	ssh scm.gforge.inria.fr "chmod g+rw -R /var/lib/gforge/chroot/home/groups/simgrid/htdocs/* || true"
+	    doc/html/ scm.gforge.inria.fr:/home/groups/simgrid/htdocs/doc/ || true
+	scp doc/index.php doc/webcruft/robots.txt scm.gforge.inria.fr:/home/groups/simgrid/htdocs/
+	scp doc/simgrid_modules2.png doc/simgrid_modules.png doc/webcruft/simgrid_logo.png doc/webcruft/simgrid_logo_small.png scm.gforge.inria.fr:/home/groups/simgrid/htdocs/
+#	ssh scm.gforge.inria.fr "chgrp -R simgrid /home/groups/simgrid/htdocs/"
+#	ssh scm.gforge.inria.fr "chmod g+rw -R /home/groups/simgrid/htdocs/* || true"
+#	ssh scm.gforge.inria.fr "chmod a+rX -R /home/groups/simgrid/htdocs/* || true"
 
 mail:
 	 @ver=`dpkg-parsechangelog -lChangeLog | egrep '^Version: ' | sed 's/Version: //'`;\
@@ -106,8 +116,11 @@ mail:
 	       -s "New version of SimGrid ($$ver)" \
 	       simgrid-user@lists.gforge.inria.fr
 
+TAGS:
+	etags -o ./TAGS `$(MAKE) dist-files | grep -v $(PWD) | egrep '\.[ch]$$' |sort -u` 
+
 splint:
-	splint `make dist-files | grep -v $(PWD) | egrep '\.[ch]$$' |sort -u` \
+	splint `$(MAKE) dist-files | grep -v $(PWD) | egrep '\.[ch]$$' |sort -u` \
 	       +matchanyintegral -warnposix +boolint \
 	       +show-summary +stats\
 	       -Iinclude -Isrc/include -Isrc/base -Isrc