Specify which version of aclocal we use (by default, it's the ooold 1.4)

[simgrid.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 1c0fac9..0c1e2cf 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,18 +1,19 @@
 SUBDIRS= include src examples testsuite doc
 DISTCLEANFILES =  *~  
 
-ACLOCAL = aclocal -I acmacro -I /usr/share/aclocal/gnome2-macros
+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\
+EXTRA_DIST = bootstrap COPYING INSTALL NEWS README README.IEEE TODO AUTHORS ChangeLog ChangeLog.debian\
        acmacro/aci.m4 \
        tools/gras-check-arch   tools/compile-remote-worker.in \
        tools/MSG_visualization tools/platform_generation \
         tools/doxygen/index_create.pl
 
-TAGS: 
-       etags `find . -name "*.[ch]"`
+SOURCE_FILES = $(shell find . -name "*.[ch]")
+TAGS: $(SOURCE_FILES)
+       @etags $(SOURCE_FILES)
 
 tags: TAGS
 
@@ -33,7 +34,7 @@ debian: dist
        make -C ~/CVSIMPORT/pkg-grid/gras deb check
        dput local *.changes
 
-publish: dist
+publish-old: dist
         @echo "----[ Put the documentation on the local filesystem ]----"
         rm -rf ~/public_html/gras/doc
         mkdir ~/public_html/gras/doc
@@ -43,13 +44,24 @@ publish: dist
         @echo "----[ Sync remote host ]----"
         make -C public_html publish
 
+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
+        @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/
+        make -C ~/public_html
+
 mail:
-        @ver=`dpkg-parsechangelog -lChangeLog| egrep '^Version: ' | sed 's/Version: //'`;\
+        @ver=`dpkg-parsechangelog -lChangeLog.debian| egrep '^Version: ' | sed 's/Version: //'`;\
          (echo "Hello," ; \
           echo; \
            echo "A new version of GRAS is available. Here is the changelog:";\
           echo;echo;\
-           dpkg-parsechangelog -lChangeLog ;\
+           dpkg-parsechangelog -lChangeLog.debian ;\
            echo;echo; \
           echo "It is available from the official website:";\
           echo "  http://grail.sdsc.edu/simgrid/";\