Update workstation handling in SimDag. Change the prefix of SimDag functions with...

[simgrid.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index f938928..fd58ba8 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,14 +1,14 @@
-SUBDIRS= include src tools examples testsuite doc
+SUBDIRS= include src tools testsuite examples 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 \
        acmacro/aci.m4 \
        tools/graspe-slave.in \
-       tools/MSG_visualization tools/platform_generation
+       tools/MSG_visualization \
+          tools/MSG_visualization/colorize.pl
 
 SOURCE_FILES = $(shell find . -name "*.[ch]")
 TAGS: $(SOURCE_FILES)
@@ -56,11 +56,13 @@ publish: dist
         make -C ~/public_html
 
 sync-gforge: 
-       rsync --copy-links --verbose --archive --cvs-exclude --compress --delete \
-       --delete-excluded --rsh=ssh -I \
-       doc/html/ scm.gforge.inria.fr:/var/lib/gforge/chroot/home/groups/simgrid/htdocs/
+       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_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/"
+       ssh scm.gforge.inria.fr "chmod g+rw -R /var/lib/gforge/chroot/home/groups/simgrid/htdocs/* || true"
 
 mail:
         @ver=`dpkg-parsechangelog -lChangeLog | egrep '^Version: ' | sed 's/Version: //'`;\
@@ -89,7 +91,7 @@ splint:
 ##
 
 remote: 
-       @tools/graspe-master
+       @$(top_srcdir)/tools/graspe-master
 
 endif