Some more debug output to understand the gras/empty_main bug

[simgrid.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 83b5546..8040512 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,19 +1,27 @@
+# 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= tools testsuite examples doc
+SG_SUBDIRS= testsuite teshsuite examples doc
 
 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 $(SG_SUBDIRS)
+SUBDIRS= include src tools $(SG_SUBDIRS)
 EXTRA_DIST=$(SG_EXTRA_DIST)
 
 DISTCLEANFILES= stamp.configure stamp.build stamp.check *~  
 
-ACLOCAL = aclocal-1.9 -I acmacro
+ACLOCAL = aclocal -I acmacro
 AUTOMAKE_OPTIONS = gnu
 
 check-local:
@@ -24,7 +32,7 @@ all-local:
 gramine:
        rm -rf gramine-@VERSION@ gramine-@VERSION@.tar*
        @echo "# Setup sources..."
-       for n in `find include src -name '*.[ch]'`; do \
+       for n in `find include src tools/gras -name '*.[ch]' | grep -v -e gras_config.h -e ucontext_stack.h`; do \
          mkdir -p gramine-@VERSION@/`dirname $$n`; \
           perl -e '$$/ = undef; $$l=<>; while ($$l=~ m,(/\*.*?\*/),s) { $$rep=$$1; $$rep=~s/\S//sg; $$l=~s,/\*.*?\*/,$$rep,s; } print $$l;' < $$n > gramine-@VERSION@/$$n; \
        done
@@ -34,7 +42,8 @@ gramine:
        rm gramine-@VERSION@/src/*_unit.c
        @echo "# Adapt the configury mechanism to the gramine context"
        mkdir gramine-@VERSION@/acmacro
-       for n in configure Makefile.in src/Makefile.in include/Makefile.in ; do \
+       for n in configure Makefile.in src/Makefile.in include/Makefile.in \
+                tools/Makefile.in tools/gras/Makefile.in; do \
          sed  -e '/^# GRAMINE_CUT_BEGIN/,/^# GRAMINE_CUT_END/d' \
               -e 's/gramine_mode=no/gramine_mode=yes/' $$n > gramine-@VERSION@/$$n; \
        done
@@ -52,22 +61,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/
@@ -78,16 +77,17 @@ 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
 
 sync-gforge: 
        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/
+       scp doc/index.php doc/webcruft/robots.txt scm.gforge.inria.fr:/var/lib/gforge/chroot/home/groups/simgrid/htdocs/
+       scp doc/webcruft/simgrid_modules2.png doc/webcruft/simgrid_modules.png doc/webcruft/simgrid_logo.png doc/webcruft/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"
+       ssh scm.gforge.inria.fr "chmod a+rX -R /var/lib/gforge/chroot/home/groups/simgrid/htdocs/* || true"
 
 mail:
         @ver=`dpkg-parsechangelog -lChangeLog | egrep '^Version: ' | sed 's/Version: //'`;\
@@ -105,8 +105,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